X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=grml-debootstrap;h=c029246720d699059329b443bd5a9091c9de1ea3;hb=6dde1bdbf1ffab952beded7a4900b1264429ac47;hp=5313e25aa5bff829eae9eb745015a450b6be700c;hpb=092274d8d241e9ed0b5f468decd541a1eb9f17b3;p=grml-debootstrap.git diff --git a/grml-debootstrap b/grml-debootstrap index 5313e25..c029246 100755 --- a/grml-debootstrap +++ b/grml-debootstrap @@ -419,7 +419,7 @@ prompt_for_target() AVAILABLE_PARTITIONS=$(LANG=C fdisk -l 2>/dev/null | \ sed 's/*//' | \ grep -v 'Extended$' | \ - gawk -v num=0 -v ORS=' ' '/^\/dev\// {print $1}'; ls /dev/md* 2>/dev/null || true); + gawk -v num=0 -v ORS=' ' '/^\/dev\// {print $1}'; ls /dev/md[0-9]* 2>/dev/null || true); if [ -z "$AVAILABLE_PARTITIONS" ] ; then dialog --title "$PN" --trim \ @@ -1078,7 +1078,14 @@ finalize_vm() { bailout 1 fi - cp "${MNTPOINT}"/usr/lib/grub/i386-pc/* "${MNTPOINT}/boot/grub/" + case "$RELEASE" in + lenny|squeeze|wheezy) + cp "${MNTPOINT}"/usr/lib/grub/i386-pc/* "${MNTPOINT}/boot/grub/" + ;; + *) + cp -a "${MNTPOINT}"/usr/lib/grub/i386-pc "${MNTPOINT}/boot/grub/" + ;; + esac chroot "${MNTPOINT}" grub-mkimage -O i386-pc -p "(hd0,msdos1)/boot/grub" -o /tmp/core.img biosdisk part_msdos ext2 dd if="${MNTPOINT}/tmp/core.img" of="${ORIG_TARGET}" conv=notrunc seek=4 rm -f "${MNTPOINT}/tmp/core.img"