| 1 |
commit: 0994a48e690b48bd4f9da0e35c585dd2b78214be |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Mar 28 23:19:56 2019 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Mar 28 23:19:56 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=0994a48e |
| 7 |
|
| 8 |
documentation: mark --[no-]compress-initrd as deprecated |
| 9 |
|
| 10 |
Let's move user to --[no-]compress-initramfs for more consistency. |
| 11 |
|
| 12 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
| 13 |
|
| 14 |
doc/genkernel.8.txt | 5 ++++- |
| 15 |
gen_cmdline.sh | 12 +++++++++--- |
| 16 |
2 files changed, 13 insertions(+), 4 deletions(-) |
| 17 |
|
| 18 |
diff --git a/doc/genkernel.8.txt b/doc/genkernel.8.txt |
| 19 |
index 54ea00a..d77b6ef 100644 |
| 20 |
--- a/doc/genkernel.8.txt |
| 21 |
+++ b/doc/genkernel.8.txt |
| 22 |
@@ -425,9 +425,12 @@ OUTPUT SETTINGS |
| 23 |
Wrap initramfs using mkimage for u-boot boots. Please note that only |
| 24 |
certain compression types are supported by mkimage (see manpage). |
| 25 |
|
| 26 |
-*--*[*no-*]*compress-initramfs*, *--*[*no-*]*compress-initrd*:: |
| 27 |
+*--*[*no-*]*compress-initramfs*:: |
| 28 |
Compresses or does not compress the generated initramfs. |
| 29 |
|
| 30 |
+*--*[*no-*]*compress-initrd*:: |
| 31 |
+ Deprecated alias for *--*[*no-*]*compress-initramfs*. |
| 32 |
+ |
| 33 |
*--compress-initramfs-type*=<arg>:: |
| 34 |
Compression type for initramfs (best, xz, lzma, bzip2, gzip, lzop). |
| 35 |
"Best" causes selection of the best available algorithm that is selected |
| 36 |
|
| 37 |
diff --git a/gen_cmdline.sh b/gen_cmdline.sh |
| 38 |
index 86150fa..5b7aafa 100755 |
| 39 |
--- a/gen_cmdline.sh |
| 40 |
+++ b/gen_cmdline.sh |
| 41 |
@@ -196,8 +196,8 @@ longusage() { |
| 42 |
echo " Compress initramfs" |
| 43 |
echo " --no-compress-initramfs" |
| 44 |
echo " Do not compress initramfs" |
| 45 |
- echo " --compress-initrd Compress initrd" |
| 46 |
- echo " --no-compress-initrd Do not compress initrd" |
| 47 |
+ echo " --compress-initrd Deprecated alias for --compress-initramfs" |
| 48 |
+ echo " --no-compress-initrd Deprecated alias for --no-compress-initramfs" |
| 49 |
echo " --compress-initramfs-type=<arg>" |
| 50 |
echo " Compression type for initramfs (best, xz, lzma, bzip2, gzip, lzop)" |
| 51 |
echo " --strip=(all|kernel|modules|none)" |
| 52 |
@@ -717,10 +717,16 @@ parse_cmdline() { |
| 53 |
CMD_WRAP_INITRD=`parse_optbool "$*"` |
| 54 |
print_info 2 "CMD_WRAP_INITRD=${CMD_WRAP_INITRD}" |
| 55 |
;; |
| 56 |
- --compress-initramfs|--no-compress-initramfs|--compress-initrd|--no-compress-initrd) |
| 57 |
+ --compress-initramfs|--no-compress-initramfs) |
| 58 |
CMD_COMPRESS_INITRD=`parse_optbool "$*"` |
| 59 |
print_info 2 "CMD_COMPRESS_INITRD=${CMD_COMPRESS_INITRD}" |
| 60 |
;; |
| 61 |
+ --compress-initrd|--no-compress-initrd) |
| 62 |
+ CMD_COMPRESS_INITRD=`parse_optbool "$*"` |
| 63 |
+ print_info 2 "CMD_COMPRESS_INITRD=${CMD_COMPRESS_INITRD}" |
| 64 |
+ echo |
| 65 |
+ print_warning 1 "Please use --[no-]compress-initramfs, as --[no-]compress-initrd is deprecated." |
| 66 |
+ ;; |
| 67 |
--compress-initramfs-type=*|--compress-initrd-type=*) |
| 68 |
CMD_COMPRESS_INITRD_TYPE="${*#*=}" |
| 69 |
print_info 2 "CMD_COMPRESS_INITRD_TYPE: ${CMD_COMPRESS_INITRD_TYPE}" |
Archives