Merge script should create boot directory stuff.

icculus · Oct 16, 2009 · 717e1ee · 717e1ee
1 parent 7f4b329
commit 717e1ee
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/misc/grubmenu.txt b/misc/grubmenu.txt
@@ -0,0 +1,15 @@
+default		0
+color cyan/blue white/blue
+
+title		Ubuntu 9.04 FatELF 32-bit, kernel 2.6.28-15-generic
+root		(hd0,0)
+kernel		/boot/x86/vmlinuz-2.6.28-15-generic root=/dev/sda1 ro quiet splash
+initrd		/boot/x86/initrd.img-2.6.28-15-generic
+quiet
+
+title		Ubuntu 9.04 FatELF 64-bit, kernel 2.6.28-15-generic
+root		(hd0,0)
+kernel		/boot/x86_64/vmlinuz-2.6.28-15-generic root=/dev/sda1 ro quiet splash
+initrd		/boot/x86_64/initrd.img-2.6.28-15-generic
+quiet
+
diff --git a/misc/merge.sh b/misc/merge.sh
@@ -69,11 +69,18 @@ for feh in `cat binaries-32` ; do
     fi
 done
 
+# We don't need /lib32 and /lib64, but symlink them to /lib just in case.
 rm -rf /x86_64/lib32
 rm -rf /x86_64/lib64
 ln -s /lib /x86_64/lib32
 ln -s /lib /x86_64/lib64
 
+mkdir -p /x86_64/boot/x86_64
+mkdir -p /x86_64/boot/x86
+mv /x86_64/boot/*-generic /x86_64/boot/x86_64/
+mv /x86/boot/*-generic /x86_64/boot/x86/
+cp ../grubmenu.txt /x86_64/boot/grub/menu.lst
+
 umount /x86
 umount /x86_64