projects
/
grml-debootstrap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use parted to create partition table (issue #90)
[grml-debootstrap.git]
/
chroot-script
diff --git
a/chroot-script
b/chroot-script
index
e1c183a
..
e14ca21
100755
(executable)
--- a/
chroot-script
+++ b/
chroot-script
@@
-36,9
+36,9
@@
if [ -x /usr/bin/aptitude ] ; then
APTUPGRADE="aptitude -y safe-upgrade $DPKG_OPTIONS"
fi
else
APTUPGRADE="aptitude -y safe-upgrade $DPKG_OPTIONS"
fi
else
- APTINSTALL="apt-get -
-force-yes -
y --no-install-recommends install $DPKG_OPTIONS"
+ APTINSTALL="apt-get -y --no-install-recommends install $DPKG_OPTIONS"
APTUPDATE="apt-get update $DPKG_OPTIONS"
APTUPDATE="apt-get update $DPKG_OPTIONS"
- APTUPGRADE="apt-get -
-force-yes -
y upgrade $DPKG_OPTIONS"
+ APTUPGRADE="apt-get -y upgrade $DPKG_OPTIONS"
fi
if [ -z "$STAGES" ] ; then
fi
if [ -z "$STAGES" ] ; then
@@
-585,11
+585,13
@@
grub_install() {
echo "Installing grub on ${GRUB}:"
grub-install --no-floppy "$GRUB"
done
echo "Installing grub on ${GRUB}:"
grub-install --no-floppy "$GRUB"
done
+ rm -f /boot/grub/device.map
else
echo "Installing grub on ${GRUB}:"
case "$RELEASE" in
lenny|squeeze|wheezy)
grub-install --no-floppy "$(readlink -f "${GRUB}")"
else
echo "Installing grub on ${GRUB}:"
case "$RELEASE" in
lenny|squeeze|wheezy)
grub-install --no-floppy "$(readlink -f "${GRUB}")"
+ rm -f /boot/grub/device.map
;;
*)
echo "(hd0) ${GRUB}" > /boot/grub/device.map
;;
*)
echo "(hd0) ${GRUB}" > /boot/grub/device.map