grub: fix selection by default install2, if GRUB_DEFAULT is not set

Top item is no need to set a default. Also, this is no longer possible, as some items are not available for all grub variants.

grub: fix selection by default install2, if GRUB_DEFAULT is not set
cd7bf027 · Anton Midyukov · 137428c5 · cd7bf027
Commit cd7bf027 authored Aug 10, 2021 by Anton Midyukov
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 7 deletions

01-grub features.in/grub/stage1/scripts.d/01-grub +1 -7

No files found.
--- a/features.in/grub/stage1/scripts.d/01-grub
+++ b/features.in/grub/stage1/scripts.d/01-grub
@@ -33,14 +33,8 @@ if [ -n "$GLOBAL_GRUB_DEFAULT" ]; then
 		echo "error: $GLOBAL_GRUB_DEFAULT missing in $CFG" >&2
 		exit 1
 	fi
-elif [ -n "$(grep -i "--id 'linux'" "$CFG")" ]; then
-	DEFAULT=linux
 else
-	DEFAULT="$(grep -i '\-\-id ' "$CFG" | head -1 | rev| cut -f2 -d' ' |rev)"
+	grep -i '\-\-id ' "$CFG" | grep 'linux' && DEFAULT=linux
-	if [ -z "$DEFAULT" ]; then
-		echo "error: no DEFAULT or UI directive and cannot guess for $CFG" >&2
-		exit 1
-	fi
 fi
 sed -i "s/@default_id@/$DEFAULT/" "$CFG"
 }