Fix the default entry name

The default entry on loader.conf should _not_ contain the ".conf" suffix, so
let's remove it. Amend the 'setup-gummiboot-conf' file accordingly.

Change-Id: I25717a17e65e1c7c854a32651c344987f23a76dd
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>

diff --git a/setup-efi-ivi b/setup-efi-ivi
index 00f6786..cc66d09 100755 (executable)
--- a/setup-efi-ivi
+++ b/setup-efi-ivi
@@ -78,7 +78,7 @@ mkdir -p "$esp/loader"
 
 cat > "$esp/loader/loader.conf" <<-EOF
 timeout 0
-default $newest_kernel.conf
+default $newest_kernel
 EOF
 
 # Create a gummiboot entry for each kernel

diff --git a/setup-gummiboot-conf b/setup-gummiboot-conf
index 20b414f..8767f2f 100755 (executable)
--- a/setup-gummiboot-conf
+++ b/setup-gummiboot-conf
@@ -62,7 +62,7 @@ entries="$(ls -1 "$entries_dir" | sed -e 's/\.conf$//g' | sort -r)"
        fatal "no gummiboot entries found in \"$entries_dir\""
 
 # Get the default entry name
-default_entry="$(cat "$conf_file" | sed -n -e 's/[ \t]*default[ \t]\+\(.\+\)[ \t]*/\1/p')"
+default_entry="$(cat "$conf_file" | sed -n -e 's/[ \t]*default[ \t]\+\(.\+\)[ \t]*/\1.conf/p')"
 [ -n "$default_entry" ] || \
        fatal "cannot find the default entry in \"$conf_file\""
 [ "$(printf "%s\n" "$default_entry" | wc -l)" -eq "1" ] || \