Gentoo Archives: gentoo-commits

From: "Robin H. Johnson" <robbat2@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/genkernel:master commit in: /, doc/
Date: Mon, 06 Feb 2012 09:42:41
Message-Id: 4ac027367e849702fc7632a3de5a8cd5d58754d4.robbat2@gentoo
1 commit: 4ac027367e849702fc7632a3de5a8cd5d58754d4
2 Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
3 AuthorDate: Mon Feb 6 09:42:21 2012 +0000
4 Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
5 CommitDate: Mon Feb 6 09:42:21 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=4ac02736
7
8 Update documentation for new initramfs compression.
9
10 ---
11 ChangeLog | 4 ++++
12 doc/genkernel.8.txt | 7 ++++++-
13 gen_cmdline.sh | 5 ++++-
14 3 files changed, 14 insertions(+), 2 deletions(-)
15
16 diff --git a/ChangeLog b/ChangeLog
17 index e2cc9ab..ddc3844 100644
18 --- a/ChangeLog
19 +++ b/ChangeLog
20 @@ -5,6 +5,10 @@
21 # Distributed under the GPL v2
22 # $Id$
23
24 + 06 Feb 2012; Robin H. Johnson <robbat2@g.o> doc/genkernel.8.txt,
25 + gen_cmdline.sh:
26 + Update documentation for new initramfs compression.
27 +
28 06 Feb 2012; Robin H. Johnson <robbat2@g.o> defaults/config.sh,
29 gen_cmdline.sh, gen_determineargs.sh, gen_initramfs.sh, genkernel.conf:
30 Import customizable compression for initramfs, based on Pentoo development.
31
32 diff --git a/doc/genkernel.8.txt b/doc/genkernel.8.txt
33 index 67edbd9..384d4f5 100644
34 --- a/doc/genkernel.8.txt
35 +++ b/doc/genkernel.8.txt
36 @@ -364,9 +364,14 @@ OUTPUT SETTINGS
37 Builds or does not build the generated initramfs into the kernel instead
38 of keeping it as a separate file.
39
40 -*--*[*no-*]*compress-initramfs*::
41 +*--*[*no-*]*compress-initramfs*, *--*[*no-*]*compress-initrd*::
42 Compresses or does not compress the generated initramfs.
43
44 +*--compress-initramfs-type*=<arg>::
45 + Compression type for initramfs (best, xz, lzma, bzip2, gzip, lzop).
46 + "Best" causes selection of the best available algorithm that is selected
47 + in your kernel configuration.
48 +
49
50 RAMDISK OPTIONS
51 ---------------
52
53 diff --git a/gen_cmdline.sh b/gen_cmdline.sh
54 index aabaa7e..2e68882 100755
55 --- a/gen_cmdline.sh
56 +++ b/gen_cmdline.sh
57 @@ -151,8 +151,11 @@ longusage() {
58 echo " --integrated-initramfs, --no-integrated-initramfs"
59 echo " Include/exclude the generated initramfs in the kernel"
60 echo " instead of keeping it as a separate file"
61 - echo " --compress-initramfs, --no-compress-initramfs"
62 + echo " --compress-initramfs, --no-compress-initramfs,"
63 + echo " --compress-initrd, --no-compress-initrd"
64 echo " Compress or do not compress the generated initramfs"
65 + echo " --compress-initramfs-type=<arg>"
66 + echo " Compression type for initramfs (best, xz, lzma, bzip2, gzip, lzop)"
67 }
68
69 usage() {