grub 2.00

4 files changed, 24 insertions, 1 deletions

diff --git a/auto/config b/auto/config
index fc9de9c..a778546 100755
--- a/auto/config
+++ b/auto/config
@@ -66,6 +66,7 @@ wheezy)
 esac
 
 [ "$LB_BOOTLOADER" = "burg" ] && LB_REPOSITORIES+=" burg"
+[ "$LB_BOOTLOADER" = "grub2" ] && LB_REPOSITORIES+=" grub2"
 # kde4.8 is in wheezy now, no need for backport repository anymore
 # grep -wq kde48 <<<"$LB_PACKAGES_LISTS" && LB_REPOSITORIES+=" acritox-kde48"
 grep -wq trinity <<<"$LB_PACKAGES_LISTS" && LB_REPOSITORIES+=" trinity"
diff --git a/config/binary_local-hooks/grub2-efi b/config/binary_local-hooks/grub2-efi
index 12af93b..6043206 100755
--- a/config/binary_local-hooks/grub2-efi
+++ b/config/binary_local-hooks/grub2-efi
@@ -36,7 +36,7 @@ workdir="$(mktemp -d efi-image.XXXXXX)"
 mkdir -p "$workdir/boot/grub"
 cat >"$workdir/boot/grub/grub.cfg" <<EOF
 search --file --set=root /.disk/info
-set prefix=(\$root)/boot/grub/$platform
+set prefix=(\$root)/boot/grub
 source \$prefix/grub.cfg
 EOF
 
diff --git a/config/binary_local-hooks/grub2-hotfixes b/config/binary_local-hooks/grub2-hotfixes
new file mode 100755
index 0000000..0be01b8
--- /dev/null
+++ b/config/binary_local-hooks/grub2-hotfixes
@@ -0,0 +1,19 @@
+#!/bin/sh
+# hotfixes for grub2.00:
+# * move modules to binary/boot/grub/i386-pc
+
+case "$LB_BOOTLOADER" in
+grub2|burg)
+	;;
+*)
+	exit 0
+	;;
+esac
+
+if [ -d binary/boot/grub ]
+then
+	mkdir -p binary/boot/grub/i386-pc
+    mv binary/boot/grub/*.mod binary/boot/grub/*.lst binary/boot/grub/efiemu??.o binary/boot/grub/*.pf2 binary/boot/grub/i386-pc/
+fi
+
+exit 0
diff --git a/config/repositories/grub2 b/config/repositories/grub2
new file mode 100644
index 0000000..8b30ad6
--- /dev/null
+++ b/config/repositories/grub2
@@ -0,0 +1,3 @@
+# Grub 2.00
+deb http://kanotix.com/files/fix/grub2.wheezy ./
+deb-src http://kanotix.com/files/fix/grub2.wheezy ./