kernel
/
dracut
mirror of https://git.kernel.org/pub/scm/boot/dracut/dracut.git/
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Make compression do The Right Thing based on what is in the config files.

master
Victor Lowther 2011-03-19 10:48:19 -05:00 committed by Harald Hoyer
parent 5e6c3b035d
commit 3a71443953
1 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
dracut
View File

@ -204,7 +204,7 @@ while (($# > 0)); do
-L|--stdlog) read_arg stdloglvl_l "$@" || shift;; -L|--stdlog) read_arg stdloglvl_l "$@" || shift;;
-I|--install) read_arg install_items "$@" || shift;; -I|--install) read_arg install_items "$@" || shift;;
--fwdir) read_arg fw_dir_l "$@" || shift;; --fwdir) read_arg fw_dir_l "$@" || shift;;
--compress) read_arg compress "$@" || shift;; --compress) read_arg compress_l "$@" || shift;;
-f|--force) force=yes;; -f|--force) force=yes;;
--kernel-only) kernel_only="yes"; no_kernel="no";; --kernel-only) kernel_only="yes"; no_kernel="no";;
--no-kernel) kernel_only="no"; no_kernel="yes";; --no-kernel) kernel_only="no"; no_kernel="yes";;
@ -222,11 +222,11 @@ while (($# > 0)); do
--fstab) use_fstab_l="yes" ;; --fstab) use_fstab_l="yes" ;;
-h|--help) usage; exit 1 ;; -h|--help) usage; exit 1 ;;
-i|--include) push include_src "$2"; push include_target "$3"; shift 2;; -i|--include) push include_src "$2"; push include_target "$3"; shift 2;;
--bzip2) compress="bzip2";; --bzip2) compress_l="bzip2";;
--lzma) compress="lzma";; --lzma) compress_l="lzma";;
--xz) compress="xz";; --xz) compress_l="xz";;
--no-compress) _no_compress="cat";; --no-compress) _no_compress_l="cat";;
--gzip) compress="gzip";; --gzip) compress_l="gzip";;
--list-modules) --list-modules)
do_list="yes"; do_list="yes";
;; ;;
@ -248,17 +248,6 @@ if ! [[ $kernel ]] || [[ $kernel = "unset" ]]; then
fi fi
[[ $outfile ]] || outfile="/boot/initramfs-$kernel.img" [[ $outfile ]] || outfile="/boot/initramfs-$kernel.img"


case $compress in
bzip2) compress="bzip -9";;
lzma) compress="lzma -9";;
xz) compress="xz --check=crc32 --lzma2=dict=1MiB";;
gzip) type pigz > /dev/null 2>&1 && compress="pigz -9" || \
compress="gzip -9";;
esac
if [[ $_no_compress = "cat" ]]; then
compress="cat"
fi

PATH=/sbin:/bin:/usr/sbin:/usr/bin PATH=/sbin:/bin:/usr/sbin:/usr/bin
export PATH export PATH


@ -356,9 +345,22 @@ stdloglvl=$((stdloglvl + verbosity_mod_l))
[[ $dracutbasedir ]] || dracutbasedir=/usr/share/dracut [[ $dracutbasedir ]] || dracutbasedir=/usr/share/dracut
[[ $fw_dir ]] || fw_dir=/lib/firmware [[ $fw_dir ]] || fw_dir=/lib/firmware
[[ $do_strip ]] || do_strip=no [[ $do_strip ]] || do_strip=no
[[ $compress_l ]] && compress=$compress_l
# eliminate IFS hackery when messing with fw_dir # eliminate IFS hackery when messing with fw_dir
fw_dir=${fw_dir//:/ } fw_dir=${fw_dir//:/ }


# handle compression options.
case $compress in
bzip2) compress="bzip -9";;
lzma) compress="lzma -9";;
xz) compress="xz --check=crc32 --lzma2=dict=1MiB";;
gzip) type pigz > /dev/null 2>&1 && compress="pigz -9" || \
compress="gzip -9";;
esac
if [[ $_no_compress_l = "cat" ]]; then
compress="cat"
fi

[[ $hostonly = yes ]] && hostonly="-h" [[ $hostonly = yes ]] && hostonly="-h"
[[ $hostonly != "-h" ]] && unset hostonly [[ $hostonly != "-h" ]] && unset hostonly
[[ $compress ]] || compress="gzip -9" [[ $compress ]] || compress="gzip -9"