# variables {{{
PN="$(basename $0)"
-VERSION='0.33-pre1'
+VERSION='0.34'
MNTPOINT="/mnt/debootstrap.$$"
# inside the chroot system locales might not be available, so use minimum:
/etc/debootstrap/config
-d, --confdir <path> Place of config files for debootstrap, defaults
to /etc/debootstrap
- --packages <file> Install packages defined in specified list file.
- --debconf <file> Pre-seed packages using specified pre-seed db file.
+ --packages[=<file>] Install packages defined in specified list file.
+ --debconf[=<file>] Pre-seed packages using specified pre-seed db file.
--keep_src_list Do not overwrite user provided apt sources.list.
--hostname <name> Hostname of Debian system.
--password <pwd> Use specified password as password for user root.
--bootappend <line> Add specified appendline to kernel whilst booting.
--chroot-scripts <d> Execute chroot scripts from specified directory.
- --pre-scripts <dir> Execute scripts from specified directory (before chroot-scripts).
- --scripts <dir> Execute scripts from specified directory (after chroot-scripts).
+ --pre-scripts[=<d>] Execute scripts from specified directory (before chroot-scripts).
+ --scripts[=<dir>] Execute scripts from specified directory (after chroot-scripts).
Other options:
MBRDISK=$(readlink -f $MBRDISK)
else
# fall back to old behaviour
- MBRDISK=$(echo ${TARGET} | sed -e 's/[0-9][0-9]*$/')
+ MBRDISK=$(echo ${TARGET} | sed -e 's/[0-9][0-9]*$//')
fi
MBRPART="MBR of $MBRDISK"
if grep -q "$MNTPOINT" /proc/mounts || [ -n "$DIRECTORY" ] ; then
einfo "Running $DEBOOTSTRAP $DEBOOTSTRAP_OPT for release ${RELEASE}${ARCHINFO} using ${MIRROR}${ISO}"
if [ -n "$MIRROR" ] ; then
+ einfo "Executing: $DEBOOTSTRAP $ARCHCMD $KEYRING $DEBOOTSTRAP_OPT $RELEASE $MNTPOINT $MIRROR"
$DEBOOTSTRAP $ARCHCMD $KEYRING $DEBOOTSTRAP_OPT $RELEASE $MNTPOINT $MIRROR
else
+ einfo "Executing: $DEBOOTSTRAP $ARCHCMD $KEYRING $DEBOOTSTRAP_OPT $RELEASE $MNTPOINT $ISO"
$DEBOOTSTRAP $ARCHCMD $KEYRING $DEBOOTSTRAP_OPT $RELEASE $MNTPOINT $ISO
fi
eend $?
return 0
fi
+ if ! [ -x "$(which grub-install)" ] ; then
+ echo "Error: grub-install not available. (Error while installing grub package?)"
+ return 1
+ fi
+
if [ -n "$SELECTED_PARTITIONS" ] ; then # using sw-raid
for device in $SELECTED_PARTITIONS ; do
GRUB="${device%%[0-9]}"
einfo "Installing grub on ${GRUB}:"
- [ -x /usr/sbin/grub-install ] && GRUBINSTALL="/usr/sbin/grub-install --no-floppy" || GRUBINSTALL="/sbin/grub-install --no-floppy"
- $GRUBINSTALL --root-directory="$MNTPOINT" "$GRUB"
+ grub-install --no-floppy --root-directory="$MNTPOINT" "$GRUB"
eend $?
done
else
einfo "Installing grub on ${GRUB}:"
- [ -x /usr/sbin/grub-install ] && GRUBINSTALL="/usr/sbin/grub-install --no-floppy" || GRUBINSTALL="/sbin/grub-install --no-floppy"
- $GRUBINSTALL --root-directory="$MNTPOINT" "$GRUB"
+ grub-install --no-floppy --root-directory="$MNTPOINT" "$GRUB"
eend $?
fi
}