[debian-edu-commits] debian-edu/ 01/01: Correct grub workaround to reallyi work with /dev/hdX, /dev/sdX, /dev/vdX and /dev/xvdX.

[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 31a23ccc6644c605846099760dcf3248e5f69708
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Sun Nov 9 07:48:24 2014 +0100

    Correct grub workaround to reallyi work with /dev/hdX, /dev/sdX, /dev/vdX and /dev/xvdX.
---
 share/debian-edu-config/d-i/pre-pkgsel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/debian-edu-config/d-i/pre-pkgsel b/share/debian-edu-config/d-i/pre-pkgsel
index 16e5f49..1a810c4 100644
--- a/share/debian-edu-config/d-i/pre-pkgsel
+++ b/share/debian-edu-config/d-i/pre-pkgsel
@@ -314,7 +314,7 @@ create_initial_localadmin_user() {
 workaround_grub_issue() {
     log "checking if grub workaround for bug #712907 should be activated."
     bootdev=$(grep /target/boot /proc/mounts | cut -d" " -f1)
-    grubdev=$(echo $bootdev | sed -rn 's/(\/sd.).*$/\1/p')
+    grubdev=$(echo $bootdev | sed -rn 's/^(\/dev\/.*d.)[0-9].*$/\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

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