| 1 |
commit: 1240654461ea74087a5953da48443f977aa59da6 |
| 2 |
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Feb 6 09:52:55 2012 +0000 |
| 4 |
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Feb 6 09:52:55 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=12406544 |
| 7 |
|
| 8 |
Bugfixes in new code branches that I didn't test fully. |
| 9 |
|
| 10 |
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org> |
| 11 |
|
| 12 |
--- |
| 13 |
ChangeLog | 3 +++ |
| 14 |
gen_initramfs.sh | 12 ++++++------ |
| 15 |
2 files changed, 9 insertions(+), 6 deletions(-) |
| 16 |
|
| 17 |
diff --git a/ChangeLog b/ChangeLog |
| 18 |
index ddc3844..c0a09cb 100644 |
| 19 |
--- a/ChangeLog |
| 20 |
+++ b/ChangeLog |
| 21 |
@@ -5,6 +5,9 @@ |
| 22 |
# Distributed under the GPL v2 |
| 23 |
# $Id$ |
| 24 |
|
| 25 |
+ 06 Feb 2012; Robin H. Johnson <robbat2@g.o> gen_initramfs.sh: |
| 26 |
+ Bugfixes in new code branches that I didn't test fully. |
| 27 |
+ |
| 28 |
06 Feb 2012; Robin H. Johnson <robbat2@g.o> doc/genkernel.8.txt, |
| 29 |
gen_cmdline.sh: |
| 30 |
Update documentation for new initramfs compression. |
| 31 |
|
| 32 |
diff --git a/gen_initramfs.sh b/gen_initramfs.sh |
| 33 |
index 3aab15d..5704173 100755 |
| 34 |
--- a/gen_initramfs.sh |
| 35 |
+++ b/gen_initramfs.sh |
| 36 |
@@ -709,22 +709,22 @@ create_initramfs() { |
| 37 |
case ${COMPRESS_INITRD_TYPE} in |
| 38 |
xz|lzma|bzip2|gzip2|lzo) compression=${COMPRESS_INITRD_TYPE} ;; |
| 39 |
best) |
| 40 |
- if grep -sq '^CONFIG_RD_XZ=y' ${KERNEL_DIR}/.config && test -n "${cmd_xz}" ; |
| 41 |
+ if grep -sq '^CONFIG_RD_XZ=y' ${KERNEL_DIR}/.config && test -n "${cmd_xz}" ; then |
| 42 |
compression=xz |
| 43 |
- elif grep -sq '^CONFIG_RD_LZMA=y' ${KERNEL_DIR}/.config && test -n "${cmd_lzma}" ; |
| 44 |
+ elif grep -sq '^CONFIG_RD_LZMA=y' ${KERNEL_DIR}/.config && test -n "${cmd_lzma}" ; then |
| 45 |
compression=lzma |
| 46 |
- elif grep -sq '^CONFIG_RD_BZIP2=y' ${KERNEL_DIR}/.config && test -n "${cmd_bzip2}" ; |
| 47 |
+ elif grep -sq '^CONFIG_RD_BZIP2=y' ${KERNEL_DIR}/.config && test -n "${cmd_bzip2}" ; then |
| 48 |
compression=bzip2 |
| 49 |
- elif grep -sq '^CONFIG_RD_GZIP=y' ${KERNEL_DIR}/.config && test -n "${cmd_gzip}" ; |
| 50 |
+ elif grep -sq '^CONFIG_RD_GZIP=y' ${KERNEL_DIR}/.config && test -n "${cmd_gzip}" ; then |
| 51 |
compression=gzip |
| 52 |
- elif grep -sq '^CONFIG_RD_LZO=y' ${KERNEL_DIR}/.config && test -n "${cmd_lzop}" ; |
| 53 |
+ elif grep -sq '^CONFIG_RD_LZO=y' ${KERNEL_DIR}/.config && test -n "${cmd_lzop}" ; then |
| 54 |
compression=lzo |
| 55 |
fi ;; |
| 56 |
esac |
| 57 |
case $compression in |
| 58 |
xz) compress_ext='.xz' compress_cmd="${cmd_xz} -e --check=none -z -f -9" ;; |
| 59 |
lzma) compress_ext='.lzma' compress_cmd="${cmd_lzma} -z -f -9" ;; |
| 60 |
- bzip2) compress_ext='.bz2' compress_cmd="${cmd_bzip2} -z -f -9" |
| 61 |
+ bzip2) compress_ext='.bz2' compress_cmd="${cmd_bzip2} -z -f -9" ;; |
| 62 |
gzip) compress_ext='.gz' compress_cmd="${cmd_gzip} -f -9" ;; |
| 63 |
lzo) compress_ext='.lzo' compress_cmd="${cmd_lzop} -f -9" ;; |
| 64 |
esac |
Archives