[debian-edu-commits] debian-edu/ 02/02: Also handle blank grub-installer/choose_bootdev value, and override in this case.

[Petter Reinholdtsen]

This is an automated email from the git hooks/post-receive script.

pere pushed a commit to branch master
in repository debian-edu-config.

commit 44fccd4c544f56f29c8dba9ecdfa59b1b4c11b5c
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Fri Oct 24 13:49:15 2014 +0200

    Also handle blank grub-installer/choose_bootdev value, and override in this case.
---
 share/debian-edu-config/d-i/pre-pkgsel | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/share/debian-edu-config/d-i/pre-pkgsel b/share/debian-edu-config/d-i/pre-pkgsel
index cbbf17e..a397993 100644
--- a/share/debian-edu-config/d-i/pre-pkgsel
+++ b/share/debian-edu-config/d-i/pre-pkgsel
@@ -314,11 +314,12 @@ workaround_grub_issue() {
     bootdev=$(grep /target/boot /proc/mounts | cut -d" " -f1)
     grubdev=$(echo $bootdev | sed -rn 's/(\/sd.).*$/\1/p')
 
+    # Only override if it is set to manual or do not have a value,
+    # otherwise we assume someone is preseeding it to the value they
+    # want.
     db_get grub-installer/choose_bootdev || true
-    # Only override if it is set to manual, otherwise we assume
-    # someone is preseeding it to the value they want.
-    if [ "manual" != "$RET" ] ; then
-	log "not overriding grub-installer/choose_bootdev to $grubdev"
+    if [ "$RET" ] && [ "manual" != "$RET" ]; then
+	log "not overriding grub-installer/choose_bootdev to $grubdev, its value was '$RET'"
 	return
     fi
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-config.git