[PATCH 2/2] allow spaces before 'default' in grub.cfg

[tzafrir@debian.org]

From: Tzafrir Cohen <tzafrir@debian.org>

---
 cronscript   | 2 +-
 preseed_late | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/cronscript b/cronscript
index e7a4aae..89a8da5 100755
--- a/cronscript
+++ b/cronscript
@@ -39,7 +39,7 @@ GRUBLINE=$(echo "$LANG" | cut -d: -f4)
 sed -i "s/LANGNAME \".*\"/LANGNAME \"$LANGNAME\"/" preseed_early
 
 sed -i "s/locale=.*$/locale=$LOCALE $GRUBLINE/
-        s/^set default=.*$/set default=\"2\"/" $ROOT/boot/grub/grub.cfg
+        s/^\( *set default=\)\"[0-9].*$/\1\"2\"/" $ROOT/boot/grub/grub.cfg
 
 # Comment out the next three lines if you don't want the language to change
 N_LOCALE=$(echo "$NEXTLANG" | cut -d: -f1)
diff --git a/preseed_late b/preseed_late
index 326e4ac..fce801b 100755
--- a/preseed_late
+++ b/preseed_late
@@ -6,12 +6,13 @@
 set -e
 
 : >/target/BABELBOX
+2>&1
 cp /hd-media/srv/babelbox/cronscript /target/root
 echo "@reboot	root	/root/cronscript; reboot" >>/target/etc/crontab
 
-mount /dev/discs/disc0/part1 /hd-media -o remount,rw
+mount /hd-media -o remount,rw
 
-sed -i "s/^set default=.*$/set default=\"3\"/" /hd-media/boot/grub/grub.cfg
+sed -i "s/^\( *set default=\)\"[0-9].*$/\1\"3\"/" /hd-media/boot/grub/grub.cfg
 
 if [ -d /target/etc/gdm3 ] ; then
 	# Enable automatic login (chroot because of bug in busybox sed)
-- 
2.1.4