diff options
| author |   Sebastian Pipping <sebastian@pipping.org> | 2012-07-08 23:39:10 +0200 |
|---|---|---|
| committer | Sebastian Pipping <sebastian@pipping.org> | 2012-07-09 00:01:42 +0200 |
| commit | 88892f5df2453f959539c444a4d0ac161ec70d8f (patch) | |
| tree | 8eea61b39b34cda10a2ae3c64745c5d03bdab95b /gen_initramfs.sh | |
| parent | Add xts to MODULES_CRYPTO (bug #425028) (diff) | |
| download | genkernel-88892f5df2453f959539c444a4d0ac161ec70d8f.tar.gz genkernel-88892f5df2453f959539c444a4d0ac161ec70d8f.tar.bz2 genkernel-88892f5df2453f959539c444a4d0ac161ec70d8f.zip | |
Use proper ${KERNEL_CONFIG} rather than ${KERNEL_DIR}/.config as input
Diffstat (limited to 'gen_initramfs.sh')
| -rwxr-xr-x | gen_initramfs.sh | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/gen_initramfs.sh b/gen_initramfs.sh index f0b63d9f..9ccd5f30 100755 --- a/gen_initramfs.sh +++ b/gen_initramfs.sh @@ -754,6 +754,13 @@ create_initramfs() { else if isTrue "${COMPRESS_INITRD}" then + if [[ "$(file --brief --mime-type "${KERNEL_CONFIG}")" == application/x-gzip ]]; then + # Support --kernel-config=/proc/config.gz, mainly + local CONFGREP=zgrep + else + local CONFGREP=grep + fi + cmd_xz=$(type -p xz) cmd_lzma=$(type -p lzma) cmd_bzip2=$(type -p bzip2) @@ -778,7 +785,7 @@ create_initramfs() { set -- ${tuple} kernel_option=$1 cmd_variable_name=$2 - if grep -sq "^${kernel_option}=y" ${KERNEL_DIR}/.config && test -n "${!cmd_variable_name}" ; then + if ${CONFGREP} -q "^${kernel_option}=y" "${KERNEL_CONFIG}" && test -n "${!cmd_variable_name}" ; then compression=$3 [[ ${COMPRESS_INITRD_TYPE} == best ]] && break fi |