diff options
| author |   Thomas Deutschmann <whissi@gentoo.org> | 2020-08-01 15:48:43 +0200 |
|---|---|---|
| committer | Thomas Deutschmann <whissi@gentoo.org> | 2020-08-01 22:35:00 +0200 |
| commit | c8624437130d318d93596453d0057f8fdfbe1ed2 (patch) | |
| tree | 0cebf1236b99fe28daf6c4693b3af9349ccbe881 /genkernel | |
| parent | genkernel: Move grep/zgrep check to determine_real_args() (diff) | |
| download | genkernel-c8624437130d318d93596453d0057f8fdfbe1ed2.tar.gz genkernel-c8624437130d318d93596453d0057f8fdfbe1ed2.tar.bz2 genkernel-c8624437130d318d93596453d0057f8fdfbe1ed2.zip | |
Unify 'confgrep' handling via new get_grep_cmd_for_file() function
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
Diffstat (limited to 'genkernel')
| -rwxr-xr-x | genkernel | 14 |
1 files changed, 3 insertions, 11 deletions
@@ -530,22 +530,14 @@ then print_warning 1 '"man genkernel" explains "dozfs" in detail.' fi - if isTrue "$(is_gzipped "${KERNEL_CONFIG}")" - then - # Support --kernel-config=/proc/config.gz, mainly - CONFGREP=zgrep - else - CONFGREP=grep - fi - - if [ $(${CONFGREP} 'CONFIG_EXT[0-9]_FS=' "${KERNEL_CONFIG}" | wc -l) -ge 2 ] + CONFGREP_CMD=$(get_grep_cmd_for_file "${KERNEL_CONFIG}") + if [ $("${CONFGREP_CMD}" 'CONFIG_EXT[0-9]_FS=' "${KERNEL_CONFIG}" | wc -l) -ge 2 ] then print_warning 1 '' print_warning 1 'With support for several ext* filesystems available, it may be needed to' print_warning 1 'add "rootfstype=ext3" or "rootfstype=ext4" to the list of boot parameters.' fi - - unset CONFGREP + unset CONFGREP_CMD fi isTrue "${CMD_INSTALL}" && restore_boot_mount_state |