Bugfixes in new code branches that I didn't test fully.

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>

diff --git a/ChangeLog b/ChangeLog
index ddc3844ddea54a761c167dc79bc331c42cc9ab9a..c0a09cb5f25b356e6ad61de1edcc126b6ce6ffbe 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
 # Distributed under the GPL v2
 # $Id$
 
+  06 Feb 2012; Robin H. Johnson <robbat2@gentoo.org> gen_initramfs.sh:
+  Bugfixes in new code branches that I didn't test fully.
+
   06 Feb 2012; Robin H. Johnson <robbat2@gentoo.org> doc/genkernel.8.txt,
   gen_cmdline.sh:
   Update documentation for new initramfs compression.

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 3aab15dbba9b9514686fbfde1f146d476c19ee4f..57041731185b19bcb3010819cd3fc03dfa6823ee 100755 (executable)
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -709,22 +709,22 @@ create_initramfs() {
                        case ${COMPRESS_INITRD_TYPE} in
                                xz|lzma|bzip2|gzip2|lzo) compression=${COMPRESS_INITRD_TYPE} ;;
                                best)
-                                       if grep -sq '^CONFIG_RD_XZ=y' ${KERNEL_DIR}/.config && test -n "${cmd_xz}" ;
+                                       if grep -sq '^CONFIG_RD_XZ=y' ${KERNEL_DIR}/.config && test -n "${cmd_xz}" ; then
                                                compression=xz
-                                       elif grep -sq '^CONFIG_RD_LZMA=y' ${KERNEL_DIR}/.config && test -n "${cmd_lzma}" ;
+                                       elif grep -sq '^CONFIG_RD_LZMA=y' ${KERNEL_DIR}/.config && test -n "${cmd_lzma}" ; then
                                                compression=lzma
-                                       elif grep -sq '^CONFIG_RD_BZIP2=y' ${KERNEL_DIR}/.config  && test -n "${cmd_bzip2}" ;
+                                       elif grep -sq '^CONFIG_RD_BZIP2=y' ${KERNEL_DIR}/.config  && test -n "${cmd_bzip2}" ; then
                                                compression=bzip2
-                                       elif grep -sq '^CONFIG_RD_GZIP=y' ${KERNEL_DIR}/.config && test -n "${cmd_gzip}" ;
+                                       elif grep -sq '^CONFIG_RD_GZIP=y' ${KERNEL_DIR}/.config && test -n "${cmd_gzip}" ; then
                                                compression=gzip
-                                       elif grep -sq '^CONFIG_RD_LZO=y' ${KERNEL_DIR}/.config && test -n "${cmd_lzop}" ;
+                                       elif grep -sq '^CONFIG_RD_LZO=y' ${KERNEL_DIR}/.config && test -n "${cmd_lzop}" ; then
                                                compression=lzo
                                        fi ;;
                        esac
                        case $compression in
                                xz) compress_ext='.xz' compress_cmd="${cmd_xz} -e --check=none -z -f -9" ;;
                                lzma) compress_ext='.lzma' compress_cmd="${cmd_lzma} -z -f -9" ;;
-                               bzip2) compress_ext='.bz2' compress_cmd="${cmd_bzip2} -z -f -9"
+                               bzip2) compress_ext='.bz2' compress_cmd="${cmd_bzip2} -z -f -9" ;;
                                gzip) compress_ext='.gz' compress_cmd="${cmd_gzip} -f -9" ;;
                                lzo) compress_ext='.lzo' compress_cmd="${cmd_lzop} -f -9" ;;
                        esac