[debian-edu-commits] debian-edu/ 01/01: Extend grub workaround to automatically handle /dev/vd*, /dev/hd* and /dev/xvd* in addition to /dev/sd*, allowing virtual machines using virtio, Xen and the old device names to install

[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 2f38dfe931c2cf82140a70fe3ad2aec3b9286647
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Sat Nov 1 11:32:47 2014 +0100

    Extend grub workaround to automatically handle /dev/vd*, /dev/hd* and /dev/xvd* in addition to /dev/sd*, allowing virtual machines using virtio, Xen and the old device names to install
---
 debian/changelog                       | 5 +++--
 share/debian-edu-config/d-i/pre-pkgsel | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6ff7cd4..15e5e05 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,8 @@
 debian-edu-config (1.814) UNRELEASED; urgency=low
 
-  * Extend grub workaround to automatically handle /dev/vd* in addition
-    to /dev/sd*, allowing virtio virtual machines to install
+  * Extend grub workaround to automatically handle /dev/vd*, /dev/hd*
+    and /dev/xvd* in addition to /dev/sd*, allowing virtual machines
+    using virtio, Xen and the old device names to install
     automatically too.
 
  -- Petter Reinholdtsen <pere at debian.org>  Sat, 01 Nov 2014 07:25:41 +0100
diff --git a/share/debian-edu-config/d-i/pre-pkgsel b/share/debian-edu-config/d-i/pre-pkgsel
index db23b3b..16e5f49 100644
--- a/share/debian-edu-config/d-i/pre-pkgsel
+++ b/share/debian-edu-config/d-i/pre-pkgsel
@@ -326,7 +326,7 @@ workaround_grub_issue() {
     fi
 
     case "$bootdev" in
-	/dev/sd*|/dev/vd*)
+	/dev/sd*|/dev/vd*|/dev/hd*|/dev/xvd*)
 	    log "overriding grub-installer/choose_bootdev, setting it to $grubdev"
 	    db_set grub-installer/choose_bootdev "$grubdev" || true
 	    ;;

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