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

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
cleanup-cruft
Robin H. Johnson 13 years ago
parent 4ac027367e
commit 1240654461

@ -5,6 +5,9 @@
# Distributed under the GPL v2 # Distributed under the GPL v2
# $Id$ # $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, 06 Feb 2012; Robin H. Johnson <robbat2@gentoo.org> doc/genkernel.8.txt,
gen_cmdline.sh: gen_cmdline.sh:
Update documentation for new initramfs compression. Update documentation for new initramfs compression.

@ -709,22 +709,22 @@ create_initramfs() {
case ${COMPRESS_INITRD_TYPE} in case ${COMPRESS_INITRD_TYPE} in
xz|lzma|bzip2|gzip2|lzo) compression=${COMPRESS_INITRD_TYPE} ;; xz|lzma|bzip2|gzip2|lzo) compression=${COMPRESS_INITRD_TYPE} ;;
best) 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 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 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 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 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 compression=lzo
fi ;; fi ;;
esac esac
case $compression in case $compression in
xz) compress_ext='.xz' compress_cmd="${cmd_xz} -e --check=none -z -f -9" ;; 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" ;; 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" ;; gzip) compress_ext='.gz' compress_cmd="${cmd_gzip} -f -9" ;;
lzo) compress_ext='.lzo' compress_cmd="${cmd_lzop} -f -9" ;; lzo) compress_ext='.lzo' compress_cmd="${cmd_lzop} -f -9" ;;
esac esac

Loading…
Cancel
Save