Default to '0' if 'default' line not found at all in existing grub.conf

diff --git a/ChangeLog b/ChangeLog
index c580344d84bbf83980a58ae17b6912e320eab661..ddb6839435d8e997abb290f28c7fe6dc1fd8715b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2008 Gentoo Foundation; 2008 Chris Gianelloni, Andrew Gaffney
 # Distributed under the GPL v2
 
+  15 Dec 2008; Andrew Gaffney <agaffney@gentoo.org> gen_bootloader.sh:
+  Default to '0' if 'default' line not found at all in existing grub.conf
+
   15 Dec 2008; Andrew Gaffney <agaffney@gentoo.org> gen_bootloader.sh:
   Adding code that duplicates default grub.conf entry to replace old awk
   script. Based on code written by Mike Auty <ikelos@gentoo.org>

diff --git a/gen_bootloader.sh b/gen_bootloader.sh
index 5f0bb51c4efb54e96bffa14bca529c5a9543d34f..4976e04d19b46e785c7f2a6a60c44d6d4d46da3d 100644 (file)
--- a/gen_bootloader.sh
+++ b/gen_bootloader.sh
@@ -103,6 +103,10 @@ set_bootloader_grub_duplicate_default() {
 
        # Find default entry
        default=$(sed -rn '/^[[:space:]]*default[[:space:]=]/s/^.*default[[:space:]=]+([[:alnum:]]+).*$/\1/p' "${GRUB_CONF}")
+    if [ -z "${default}" ]; then
+               print_warning 1 "No default entry found...assuming 0"
+               default=0
+       fi
        if ! echo ${default} | grep -q '^[0-9]\+$'; then
                print_error 1 "We don't support non-numeric (such as 'saved') default values...skipping update"
                return 0