aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Gaffney <agaffney@gentoo.org>2008-12-26 15:26:58 -0600
committerAndrew Gaffney <agaffney@gentoo.org>2008-12-26 15:26:58 -0600
commitb61ee1c07ffa7e4a45ea957640f4313e3038ab28 (patch)
tree212826fc1cf4233f8186efcca51293afd9219e6f /gen_bootloader.sh
parentAdd --busybox-config= commandline option (diff)
downloadgenkernel-b61ee1c07ffa7e4a45ea957640f4313e3038ab28.tar.gz
genkernel-b61ee1c07ffa7e4a45ea957640f4313e3038ab28.tar.bz2
genkernel-b61ee1c07ffa7e4a45ea957640f4313e3038ab28.zip
Modify grep regex to account for additional suffixes on old kernel names
Diffstat (limited to 'gen_bootloader.sh')
-rwxr-xr-xgen_bootloader.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/gen_bootloader.sh b/gen_bootloader.sh
index ee13ae6e..2eb628bb 100755
--- a/gen_bootloader.sh
+++ b/gen_bootloader.sh
@@ -96,8 +96,8 @@ set_bootloader_grub_duplicate_default_replace_kernel_initrd() {
set_bootloader_grub_check_for_existing_entry() {
local GRUB_CONF=$1
- if grep -q "^[[:space:]]*kernel[[:space:]=]*.*/kernel-${KNAME}-${ARCH}-${KV}\>" "${GRUB_CONF}" &&
- grep -q "^[[:space:]]*initrd[[:space:]=]*.*/initramfs-${KNAME}-${ARCH}-${KV}\>" "${GRUB_CONF}"
+ if grep -q "^[[:space:]]*kernel[[:space:]=]*.*/kernel-${KNAME}-${ARCH}-${KV}\([[:space:]]\|$\)" "${GRUB_CONF}" &&
+ grep -q "^[[:space:]]*initrd[[:space:]=]*.*/initramfs-${KNAME}-${ARCH}-${KV}\([[:space:]]\|$\)" "${GRUB_CONF}"
then
return 0
fi