e2k: add label check to write.sh

...so that it's more applicable to a wider set of images (those lacking e2k-alt-linux' specific labels just won't get broken default boot target label name for no reason).

e2k: add label check to write.sh
153b19dc · Michael Shigorin · Anton Midyukov · c6889332 · 153b19dc
Commit 153b19dc authored Oct 08, 2021 by Michael Shigorin Committed by Anton Midyukov Oct 28, 2021
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

50-e2k-write.sh features.in/e2k/lib/50-e2k-write.sh +4 -1

No files found.
--- a/features.in/e2k/lib/50-e2k-write.sh
+++ b/features.in/e2k/lib/50-e2k-write.sh
@@ -42,9 +42,12 @@ case "$2" in
 	rsync -Pavc --inplace --delete --numeric-ids "$src/" "$dst/" ||
 		cp -avt "$dst" -- "$src"/{.disk,*}
 	grep -q "^default=.*_flash$" "$dst/boot.conf" || {
+		cur="$(sed -rn 's/^default=(.*)$/\1/p' "$dst/boot.conf")"
+		grep -q "^label=${cur}_flash$" "$dst/boot.conf" && {
 			echo -n "updating default boot target... "
-		sed -i 's,default=.*$,&_flash,' "$dst/boot.conf"
+			sed -i 's,^default=.*$,&_flash,' "$dst/boot.conf"
 			echo "done"
+		} ||:
 	}
 	echo -n "unmounting media... "