Modify grep regex to account for additional suffixes on old kernel names

cleanup-cruft
Andrew Gaffney 16 years ago
parent bee96914eb
commit b61ee1c07f

@ -2,6 +2,9 @@
# Copyright 1999-2008 Gentoo Foundation; 2008 Chris Gianelloni, Andrew Gaffney # Copyright 1999-2008 Gentoo Foundation; 2008 Chris Gianelloni, Andrew Gaffney
# Distributed under the GPL v2 # Distributed under the GPL v2
26 Dec 2008; Andrew Gaffney <agaffney@gentoo.org> gen_bootloader.sh:
Modify grep regex to account for additional suffixes on old kernel names
24 Dec 2008; Andrew Gaffney <agaffney@gentoo.org> gen_cmdline.sh, 24 Dec 2008; Andrew Gaffney <agaffney@gentoo.org> gen_cmdline.sh,
gen_determineargs.sh: gen_determineargs.sh:
Add --busybox-config= commandline option Add --busybox-config= commandline option

@ -96,8 +96,8 @@ set_bootloader_grub_duplicate_default_replace_kernel_initrd() {
set_bootloader_grub_check_for_existing_entry() { set_bootloader_grub_check_for_existing_entry() {
local GRUB_CONF=$1 local GRUB_CONF=$1
if grep -q "^[[:space:]]*kernel[[:space:]=]*.*/kernel-${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}\>" "${GRUB_CONF}" grep -q "^[[:space:]]*initrd[[:space:]=]*.*/initramfs-${KNAME}-${ARCH}-${KV}\([[:space:]]\|$\)" "${GRUB_CONF}"
then then
return 0 return 0
fi fi

Loading…
Cancel
Save