projects
/
grml-debootstrap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Release new version 0.74
[grml-debootstrap.git]
/
grml-debootstrap
diff --git
a/grml-debootstrap
b/grml-debootstrap
index
732dfc1
..
d3932f0
100755
(executable)
--- a/
grml-debootstrap
+++ b/
grml-debootstrap
@@
-448,7
+448,7
@@
fi
# make sure we have what we need {{{
if [ -n "$VIRTUAL" ] ; then
# make sure we have what we need {{{
if [ -n "$VIRTUAL" ] ; then
- check4progs kpartx
mksh
parted qemu-img || bailout 1
+ check4progs kpartx parted qemu-img || bailout 1
fi
# }}}
fi
# }}}
@@
-1112,6
+1112,7
@@
prepare_vm() {
eend $?
fi
parted -s "${TARGET}" 'mkpart primary ext4 2M -1'
eend $?
fi
parted -s "${TARGET}" 'mkpart primary ext4 2M -1'
+ parted -s "${TARGET}" 'set 1 boot on'
# if dm-mod isn't available then kpartx will fail with
# "Is device-mapper driver missing from kernel? [...]"
# if dm-mod isn't available then kpartx will fail with
# "Is device-mapper driver missing from kernel? [...]"
@@
-1190,8
+1191,9
@@
if [[ -z "${GRUB}" ]] || ! dd if="${GRUB}" bs=512 count=1 2>/dev/null | cat -v |
cp -a "${MNTPOINT}"/usr/lib/grub/i386-pc "${MNTPOINT}/boot/grub/"
;;
esac
cp -a "${MNTPOINT}"/usr/lib/grub/i386-pc "${MNTPOINT}/boot/grub/"
;;
esac
+ dd if="${MNTPOINT}/usr/lib/grub/i386-pc/boot.img" of="${ORIG_TARGET}" conv=notrunc bs=440 count=1
chroot "${MNTPOINT}" grub-mkimage -O i386-pc -p "(hd0,msdos1)/boot/grub" -o /tmp/core.img biosdisk part_msdos ext2
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
+ dd if="${MNTPOINT}/tmp/core.img" of="${ORIG_TARGET}" conv=notrunc seek=
1
rm -f "${MNTPOINT}/tmp/core.img"
fi
rm -f "${MNTPOINT}/tmp/core.img"
fi