[gentoo-commits] proj/genkernel:master commit in: doc/, /

[Thomas Deutschmann]

commit:     0994a48e690b48bd4f9da0e35c585dd2b78214be
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 28 23:19:56 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Mar 28 23:19:56 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=0994a48e

documentation: mark --[no-]compress-initrd as deprecated

Let's move user to --[no-]compress-initramfs for more consistency.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 doc/genkernel.8.txt |  5 ++++-
 gen_cmdline.sh      | 12 +++++++++---
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/doc/genkernel.8.txt b/doc/genkernel.8.txt
index 54ea00a..d77b6ef 100644
--- a/doc/genkernel.8.txt
+++ b/doc/genkernel.8.txt
@@ -425,9 +425,12 @@ OUTPUT SETTINGS
     Wrap initramfs using mkimage for u-boot boots. Please note that only
     certain compression types are supported by mkimage (see manpage).
 
-*--*[*no-*]*compress-initramfs*, *--*[*no-*]*compress-initrd*::
+*--*[*no-*]*compress-initramfs*::
     Compresses or does not compress the generated initramfs.
 
+*--*[*no-*]*compress-initrd*::
+    Deprecated alias for *--*[*no-*]*compress-initramfs*.
+
 *--compress-initramfs-type*=<arg>::
     Compression type for initramfs (best, xz, lzma, bzip2, gzip, lzop).
     "Best" causes selection of the best available algorithm that is selected

diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index 86150fa..5b7aafa 100755
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -196,8 +196,8 @@ longusage() {
   echo "                               Compress initramfs"
   echo "       --no-compress-initramfs"
   echo "                               Do not compress initramfs"
-  echo "       --compress-initrd       Compress initrd"
-  echo "       --no-compress-initrd    Do not compress initrd"
+  echo "       --compress-initrd       Deprecated alias for 
--compress-initramfs"
+  echo "       --no-compress-initrd    Deprecated alias for 
--no-compress-initramfs"
   echo "       --compress-initramfs-type=<arg>"
   echo "                               Compression type for initramfs (best, 
xz, lzma, bzip2, gzip, lzop)"
   echo "       --strip=(all|kernel|modules|none)"
@@ -717,10 +717,16 @@ parse_cmdline() {
                        CMD_WRAP_INITRD=`parse_optbool "$*"`
                        print_info 2 "CMD_WRAP_INITRD=${CMD_WRAP_INITRD}"
                        ;;
-               
--compress-initramfs|--no-compress-initramfs|--compress-initrd|--no-compress-initrd)
+               --compress-initramfs|--no-compress-initramfs)
                        CMD_COMPRESS_INITRD=`parse_optbool "$*"`
                        print_info 2 
"CMD_COMPRESS_INITRD=${CMD_COMPRESS_INITRD}"
                        ;;
+               --compress-initrd|--no-compress-initrd)
+                       CMD_COMPRESS_INITRD=`parse_optbool "$*"`
+                       print_info 2 
"CMD_COMPRESS_INITRD=${CMD_COMPRESS_INITRD}"
+                       echo
+                       print_warning 1 "Please use --[no-]compress-initramfs, 
as --[no-]compress-initrd is deprecated."
+                       ;;
                --compress-initramfs-type=*|--compress-initrd-type=*)
                        CMD_COMPRESS_INITRD_TYPE="${*#*=}"
                        print_info 2 "CMD_COMPRESS_INITRD_TYPE: 
${CMD_COMPRESS_INITRD_TYPE}"