fix partition scan in grub-pc.postinst

diff --git a/Makefile b/Makefile
index db744f1dc17d4941e6b8df39bb23bb596e3df5b5..63f5ae0b5e1b9ddbe9473b11cc1f0991e16aa6bf 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ GRUB_SRC=grub2_2.02~beta2.orig.tar.xz
 GRUB_DEB_SRC=grub2_2.02~beta2-19.debian.tar.xz
 
 # update/sync changelog.pve
-DEBVER=2.02~bpo70+1
+DEBVER=2.02~bpo70+2
 
 DEBS=                                          \
 grub2-common_${DEBVER}_amd64.deb               \

diff --git a/changelog.pve b/changelog.pve
index 888f484060ce943830c5be0f81c1ce43a8dacef6..0aa0df0a029223c9cad76e2c1f08dd584e05eb19 100644 (file)
--- a/changelog.pve
+++ b/changelog.pve
@@ -1,3 +1,9 @@
+grub2 (2.02~bpo70+2) unstable; urgency=low
+
+  * fix partition scan in grub-pc.postinst
+
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 19 Jan 2015 12:22:27 +0100
+
 grub2 (2.02~bpo70+1) unstable; urgency=medium
 
   * recompile for debian wheezy 

diff --git a/pvepatches/fix-grub-pc-postinst.patch b/pvepatches/fix-grub-pc-postinst.patch
new file mode 100644 (file)
index 0000000..0342beb
--- /dev/null
+++ b/pvepatches/fix-grub-pc-postinst.patch
@@ -0,0 +1,20 @@
+Index: new/debian/postinst.in
+===================================================================
+--- new.orig/debian/postinst.in        2014-12-22 12:55:53.000000000 +0100
++++ new/debian/postinst.in     2015-01-19 12:20:20.000000000 +0100
+@@ -265,8 +265,13 @@
+     if [ -z "$partition" ] || [ "$partition" = "$last_partition" ]; then
+       continue
+     fi
+-    partition_id="$(device_to_id "$partition" || true)"
+-    echo "$path:$partition_id"
++    for dev in $partition; do
++      partition_id="$(device_to_id "$dev" || true)"
++      if [ -z "$partition_id" ]; then
++          continue;
++      fi
++      echo "$dev:$partition_id"
++    done
+     last_partition="$partition"
+   done | sort -t: -k2
+ }

diff --git a/pvepatches/series b/pvepatches/series
index 23c9f3fd64e1f7273277a01f0fe11ebbc65ad774..ab73c1964abc8f83b4a0e04778181084ebd34bd6 100644 (file)
--- a/pvepatches/series
+++ b/pvepatches/series
@@ -1,2 +1,3 @@
 fix-control.patch
 fix-zfs-ldadd.patch
+fix-grub-pc-postinst.patch