X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=grml-debootstrap;h=f6de36bbe881c812c4db402ce6b92089f8237874;hp=0d2efbb1f2f8f68aa469c679618ed73f48ea25e3;hb=0844fd956f409197b47b3d263ddc54c310cf892b;hpb=87394f3ff5c561c572d786c96c4231503ccfb2f2 diff --git a/grml-debootstrap b/grml-debootstrap index 0d2efbb..f6de36b 100755 --- a/grml-debootstrap +++ b/grml-debootstrap @@ -11,7 +11,7 @@ set -e # exit on any error # variables {{{ PN="$(basename $0)" -VERSION='0.28' +VERSION='0.34' MNTPOINT="/mnt/debootstrap.$$" # inside the chroot system locales might not be available, so use minimum: @@ -47,10 +47,9 @@ Bootstrap options: --debopt Extra parameters passed to the debootstrap command. --interactive Use interactive mode (frontend). --nodebootstrap Skip debootstrap, only do configuration to the target. - --groot Root device for usage in grub, corresponds with - \$TARGET in grub syntax, like hd0,0 for /dev/sda1. - --grub Target for grub installation. Use grub syntax for - specifying, like hd0 for /dev/sda. + --grub Target for grub installation. Usage example: /dev/sda + --arch Architecture to use. Currently only i386 is supported. + --insecure Do not download and check Release file signatures. Configuration options: @@ -59,13 +58,16 @@ Configuration options: -d, --confdir Place of config files for debootstrap, defaults to /etc/debootstrap --packages Install packages defined in specified list file. + --nopackages Skip installation of packages defined in + /etc/debootstrap/packages --debconf Pre-seed packages using specified pre-seed db file. --keep_src_list Do not overwrite user provided apt sources.list. --hostname Hostname of Debian system. --password Use specified password as password for user root. --bootappend Add specified appendline to kernel whilst booting. --chroot-scripts Execute chroot scripts from specified directory. - --scripts Execute scripts from specified directory. + --pre-scripts Execute scripts from specified directory (before chroot-scripts). + --scripts Execute scripts from specified directory (after chroot-scripts). Other options: @@ -105,10 +107,10 @@ fi # cmdline handling {{{ # source external command line parameter-processing script -if [ -r /usr/share/grml-debootstrap/functions/cmdlineopts.clp ] ; then - . /usr/share/grml-debootstrap/functions/cmdlineopts.clp -elif [ -r ./cmdlineopts.clp ] ; then +if [ -r ./cmdlineopts.clp ] ; then . ./cmdlineopts.clp +elif [ -r /usr/share/grml-debootstrap/functions/cmdlineopts.clp ] ; then + . /usr/share/grml-debootstrap/functions/cmdlineopts.clp else echo "Error: cmdline function file not found, exiting.">&2 exit 1 @@ -140,15 +142,18 @@ fi [ "$_opt_interactive" ] && INTERACTIVE=1 [ "$_opt_config" ] && CONFIGFILE=$_opt_config [ "$_opt_packages_set" ] && PACKAGES='yes' +[ "$_opt_nopackages" ] && PACKAGES='' [ "$_opt_debconf_set" ] && DEBCONF='yes' [ "$_opt_scripts_set" ] && SCRIPTS='yes' +[ "$_opt_pre_scripts_set" ] && PRE_SCRIPTS='yes' [ "$_opt_chroot_scripts_set" ] && CHROOT_SCRIPTS='yes' [ "$_opt_keep_src_list" ] && KEEP_SRC_LIST='yes' [ "$_opt_hostname" ] && HOSTNAME=$_opt_hostname [ "$_opt_password" ] && ROOTPASSWORD=$_opt_password [ "$_opt_bootappend" ] && BOOT_APPEND=$_opt_bootappend -[ "$_opt_groot" ] && GROOT=$_opt_groot [ "$_opt_grub" ] && GRUB=$_opt_grub +[ "$_opt_arch" ] && ARCH=$_opt_arch +[ "$_opt_insecure" ] && SECURE='false' [ "$_opt_verbose" ] && VERBOSE="-v" [ "$_opt_help" ] && { @@ -165,6 +170,21 @@ fi } # }}} +# backwards compability checks {{{ +if [ -n "$GROOT" ] ; then + echo "Error: you seem to have \$GROOT configured." >&2 + echo "This variable is no longer supported, please visit the" >&2 + echo "grml-debootstrap documentation for details." >&2 + exit 1 +fi + +if echo "$GRUB" | grep -q '^hd' ; then + echo "Error: this syntax for the grub configuration variable is no longer supported." >&2 + echo "Please do not use hd... any longer but /dev/sdX instead." >&2 + exit 1 +fi +# }}} + # welcome screen {{{ welcome_dialog() { @@ -179,7 +199,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}'; echo /dev/md*); + gawk -v num=0 -v ORS=' ' '/^\/dev\// {print $1}'; ls /dev/md* 2>/dev/null || true); if [ -z "$AVAILABLE_PARTITIONS" ] ; then dialog --title "$PN" --trim \ @@ -203,26 +223,42 @@ prompt_for_target() prompt_for_bootmanager() { ADDITIONAL_PARAMS="" - for device in sda hda; do - if [ /dev/$device != ${TARGET%[0-9]} ]; then + + if echo "$TARGET" | grep -q "/dev/md" ; then + MBRPART="all disks of Software RAID $TARGET" + else + # figure out whole disk device + found= + for device in /dev/disk/by-id/* + do + [ $(readlink -f $device) = ${TARGET} ] || continue + found=1 + break + done + [ -n "$found" ] && MBRDISK=$(echo ${device}|sed -e 's/-part[0-9][0-9]*$//') + if [ -e "$MBRDISK" ]; then + MBRDISK=$(readlink -f $MBRDISK) + else + # fall back to old behaviour + MBRDISK=$(echo ${TARGET} | sed -e 's/[0-9][0-9]*$//') + fi + + MBRPART="MBR of $MBRDISK" + fi + + for device in cciss/c0d0 sda hda; do + if [ /dev/$device != ${MBRDISK} ]; then grep -q $device /proc/partitions && \ - ADDITIONAL_PARAMS=:$device:"install bootmanager grub into MBR of /dev/${device}" + ADDITIONAL_PARAMS="$ADDITIONAL_PARAMS:$device:install bootmanager grub into MBR of /dev/$device" fi done ADDITIONAL_PARAMS=${ADDITIONAL_PARAMS#:} OIFS="$IFS"; IFS=: - if echo $TARGET | grep -q "/dev/md" ; then - MBRPART="all disks of Software RAID $TARGET" - else - MBRPART="MBR of ${TARGET%[0-9]}" - fi - GETMBR=$(dialog --stdout --title "$PN" --default-item mbr \ --menu "Where do you want to install the bootmanager grub?" 0 0 0 \ mbr "install bootmanager into $MBRPART" \ - partition "install bootmanager into partition $TARGET" \ nowhere "do not install bootmanager at all" \ ${ADDITIONAL_PARAMS}) [ $? -eq 0 ] || bailout 3 @@ -231,23 +267,25 @@ prompt_for_bootmanager() case "$GETMBR" in mbr) # /dev/md0: has to be installed in MBR of /dev/md0 and not in /dev/md: - if echo $TARGET | grep -q "*md*" ; then - BOOT_PARTITION="${TARGET}" + if echo "$TARGET" | grep -q "/dev/md" ; then + # using sw-raid: + if [ -n "$SELECTED_PARTITIONS" ] ; then + GRUB=$(echo ${SELECTED_PARTITIONS} | awk '{print $1}') # use first disk only + else + GRUB="$TARGET" + fi else - BOOT_PARTITION="${TARGET%[0-9]}" + GRUB="$MBRDISK" fi ;; - partition) - BOOT_PARTITION="$TARGET" - ;; hda) - BOOT_PARTITION="/dev/hda" + GRUB="/dev/hda" ;; sda) - BOOT_PARTITION="/dev/sda" + GRUB="/dev/sda" ;; nowhere) - BOOT_PARTITION='' + GRUB='' ;; esac } @@ -259,8 +297,7 @@ prompt_for_release() [ -n "$RELEASE" ] && DEFAULT_RELEASE="$RELEASE" || DEFAULT_RELEASE='lenny' RELEASE="$(dialog --stdout --title "${PN}" --default-item $DEFAULT_RELEASE --menu \ "Please enter the Debian release you would like to use for installation:" \ - 0 50 4 \ - etch Debian/old-stable \ + 0 50 3 \ lenny Debian/stable \ squeeze Debian/testing \ sid Debian/unstable)" @@ -309,7 +346,7 @@ prompt_for_mirror() ) if [ "$CHOOSE_MIRROR" = 'net' ] ; then - [ -n "$MIRROR" ] || MIRROR='ftp://ftp.de.debian.org/debian' + [ -n "$MIRROR" ] || MIRROR='http://cdn.debian.net/debian' MIRROR="$(dialog --stdout --title "${PN}" --inputbox \ "Please enter Debian mirror you would like to use for installing packages." \ 0 0 $MIRROR)" @@ -322,45 +359,6 @@ prompt_for_mirror() } # }}} -# get grub's syntax for /dev/ice {{{ -# usage example: 'grubdevice /dev/sda2' returns 'hd0,1' -grubdevice() { - if [ -z "$1" ] ; then - echo "Usage: grubdevice ">&2 - return 1 - fi - - device="$1" - device_map=/boot/grub/device.map - - # create device.map - if ! [ -f "$device_map" ] ; then - echo 'quit' | grub --device-map="$device_map" 1>/dev/null 2>&1 - fi - - # based on code from d-i's trunk/packages/arch/i386/grub-installer/grub-installer: - tmp_disk=`echo "$device" | sed -e 's%\([sh]d[a-z]\)[0-9]*$%\1%' \ - -e 's%\(fd[0-9]*\)$%\1%' \ - -e 's%/part[0-9]*$%/disc%' \ - -e 's%\(c[0-7]d[0-9]*\).*$%\1%'` - tmp_part=`echo "$device" | sed -e 's%.*/[sh]d[a-z]\([0-9]*\)$%\1%' \ - -e 's%.*/fd[0-9]*$%%' \ - -e 's%.*/floppy/[0-9]*$%%' \ - -e 's%.*/\(disc\|part\([0-9]*\)\)$%\2%' \ - -e 's%.*c[0-7]d[0-9]*p*%%'` - tmp_drive=$(grep -v '^#' $device_map | grep "$tmp_disk *$" | sed 's%.*\([hf]d[0-9][a-g0-9,]*\).*%\1%') - - case $1 in - /dev/[sh]d[a-z]) # we expect something like 'hd0' - echo "$tmp_drive" - ;; - *) # we expect something like 'hd0,0' - echo "$tmp_drive" | sed "s%$%,`expr $tmp_part - 1`%" # FIXME => md0 - ;; - esac -} -# }}} - # software raid setup {{{ config_swraid_setup() { @@ -492,13 +490,19 @@ else # if not running automatic installation display configuration and prompt fo einfo "$PN - Please recheck configuration before execution:" echo echo " Target: $TARGET" - case "$MNTPOINT" in "$TARGET") ;; *) echo " Mount point: $MNTPOINT" ;; esac - [ -n "$GRUB" ] && echo " Install grub: $GRUB" || echo " Install grub: no" - [ -n "$RELEASE" ] && echo " Using release: $RELEASE" - [ -n "$MIRROR" ] && echo " Using mirror: $MIRROR" - [ -n "$ISO" ] && echo " Using ISO: $ISO" - case "$MNTPOINT" in "$TARGET") ;; *) echo " Important! Continuing will delete all data from ${TARGET}!" ;; esac - echo + + # do not display if MNTPOINT is the default one + case "$MNTPOINT" in /mnt/debootstrap*) ;; *) echo " Mount point: $MNTPOINT" ;; esac + + [ -n "$GRUB" ] && echo " Install grub: $GRUB" || echo " Install grub: no" + [ -n "$RELEASE" ] && echo " Using release: $RELEASE" + [ -n "$MIRROR" ] && echo " Using mirror: $MIRROR" + [ -n "$HOSTNAME" ] && echo " Using hostname: $HOSTNAME" + [ -n "$ISO" ] && echo " Using ISO: $ISO" + + echo " Important! Continuing will delete all data from ${TARGET}!" + + echo einfon "Is this ok for you? [y/N] " read a if ! [ "$a" = 'y' -o "$a" = 'Y' ] ; then @@ -526,21 +530,6 @@ interactive_mode() prompt_for_password - # use first disk of sw-raid for grub by default, install grub on - # all involved disks later on - if echo "$TARGET" | grep -q '/dev/md' ; then - if [ -n "$SELECTED_PARTITIONS" ] ; then # using sw-raid - # use hdX and not hdX,Y for $GRUB - TMPDEVICE=$(echo ${SELECTED_PARTITIONS} | awk '{print $1}') # use first disk only - GRUB="$(grubdevice ${TMPDEVICE%%[0-9]})" # like: hd0 - GROOT="$(grubdevice ${TMPDEVICE})" # like: hd0,0 - echo "debug: GRUB = $GRUB - GROOT = $GROOT" >/tmp/debug # FIXME - fi - else - [ -n "$BOOT_PARTITION" ] && GRUB="$(grubdevice $BOOT_PARTITION)" - [ -n "$TARGET" ] && GROOT="$(grubdevice $TARGET)" - fi - prompt_for_mirror } @@ -582,11 +571,7 @@ fi PARTITION='' DIRECTORY='' -case $TARGET in - /dev/*) - PARTITION=1 - ;; - *) +set_target_directory(){ # assume we are installing into a directory, don't run mkfs and grub related stuff therefore DIRECTORY=1 MNTPOINT="$TARGET" @@ -594,9 +579,17 @@ case $TARGET in TUNE2FS='' FSCK='' GRUB='' - GROOT='' - ;; -esac + # make sure we normalise the path to an absolute directory name so something like: + # mkdir -p foo/a bar/a; (cd foo; grml-debootstrap -t a)&; (cd bar; grml-debootstrap -t a)&; wait + # works + TARGET="$(readlink -f $TARGET)" +} + +if [ -b "$TARGET" ] ; then + PARTITION=1 +else + set_target_directory +fi # }}} # architecture setup {{{ @@ -610,6 +603,19 @@ else fi # }}} +# keyring setupt {{{ +KEYRING="" +if [ "$SECURE" = 'yes' ] ; then + if [ -e '/etc/apt/trusted.gpg' ] ; then + KEYRING="--keyring /etc/apt/trusted.gpg" + else + eerror "Could not find /etc/apt/trusted.gpg." + fi +else + ewarn "Not checking Release signatures!" +fi +# }}} + # make sure we have the right syntax when using an iso image {{{ if [ -n "$ISO" ] ; then case $ISO in @@ -633,12 +639,13 @@ bailout(){ # make sure nothing is left inside chroot so we can unmount it [ -x "$MNTPOINT"/etc/init.d/ssh ] && "$MNTPOINT"/etc/init.d/ssh stop [ -x "$MNTPOINT"/etc/init.d/mdadm ] && "$MNTPOINT"/etc/init.d/mdadm stop - # ugly, but make sure we really don't leav anything - [ -x "$MNTPOINT"/bin/umount ] && chroot "$MNTPOINT" umount /sys 1>/dev/null 2>&1 - [ -x "$MNTPOINT"/bin/umount ] && chroot "$MNTPOINT" umount -a 1>/dev/null 2>&1 - [ -x "$MNTPOINT"/bin/umount ] && chroot "$MNTPOINT" umount /proc 1>/dev/null 2>&1 - [ -x "$MNTPOINT"/bin/umount ] && chroot "$MNTPOINT" umount /proc 1>/dev/null 2>&1 - [ -d "$MNTPOINT/$ISODIR" ] && umount "$MNTPOINT/$ISODIR" 1>/dev/null 2>&1 + # ugly, but make sure we really don't leav anything (/proc /proc is intended) + for ARG in /sys -a /proc /proc ; do + [ -x "$MNTPOINT"/bin/umount ] && chroot "$MNTPOINT" umount $ARG 1>/dev/null 2>&1 || true + done + umount "$MNTPOINT"/dev 1>/dev/null 2>&1 || true + + [ -d "$MNTPOINT/$ISODIR" ] && umount "$MNTPOINT/$ISODIR" 1>/dev/null 2>&1 || true if [ -n "$DIRECTORY" ] ; then einfo "Not unmounting $MNTPOINT as you requested me to install into a directory of your own choice." ; eend 0 @@ -692,9 +699,19 @@ mkfs() { if [ -n "$MKFS" ] ; then einfo "Running $MKFS on $TARGET" - $MKFS $TARGET - TARGET_UUID="$(vol_id -u $TARGET 2>/dev/null || echo '')" - eend $? + $MKFS $TARGET ; RC=$? + + # make sure /dev/disk/by-uuid/... is up2date, otherwise grub + # will fail to detect the uuid in the chroot + blockdev --rereadpt "${TARGET%%[0-9]*}" + # give the system 2 seconds, otherwise we might run into + # race conditions :-/ + sleep 2 + + eval $(blkid -o udev $TARGET 2>/dev/null) + [ -n "$ID_FS_UUID" ] && TARGET_UUID="$ID_FS_UUID" || TARGET_UUID="" + + eend $RC fi fi @@ -736,17 +753,20 @@ mount_target() { # install main chroot {{{ debootstrap_system() { - if ! grep -q "$MNTPOINT" /proc/mounts ; then - mount_target - fi if [ "$_opt_nodebootstrap" ]; then einfo "Skipping debootstrap as requested." return fi + if grep -q "$MNTPOINT" /proc/mounts || [ -n "$DIRECTORY" ] ; then einfo "Running $DEBOOTSTRAP $DEBOOTSTRAP_OPT for release ${RELEASE}${ARCHINFO} using ${MIRROR}${ISO}" - [ -n "$MIRROR" ] && $DEBOOTSTRAP $ARCHCMD $DEBOOTSTRAP_OPT $RELEASE $MNTPOINT $MIRROR || \ - $DEBOOTSTRAP $ARCHCMD $DEBOOTSTRAP_OPT $RELEASE $MNTPOINT $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 $? else eerror "Error: $MNTPOINT not mounted, can not continue." @@ -764,18 +784,19 @@ preparechroot() { touch $CHROOT_VARIABLES chmod 600 $CHROOT_VARIABLES # make sure nobody except root can read it echo "# Configuration of ${PN}" > $CHROOT_VARIABLES - [ -n "$ARCH" ] && echo "ARCH=$ARCH" >> $CHROOT_VARIABLES - [ -n "$GROOT" ] && echo "GROOT=$GROOT" >> $CHROOT_VARIABLES - [ -n "$GRUB" ] && echo "GRUB=$GRUB" >> $CHROOT_VARIABLES - [ -n "$HOSTNAME" ] && echo "HOSTNAME=$HOSTNAME" >> $CHROOT_VARIABLES - [ -n "$ISODIR" ] && echo "ISODIR=$ISO" >> $CHROOT_VARIABLES - [ -n "$ISO" ] && echo "ISO=$ISO" >> $CHROOT_VARIABLES - [ -n "$MIRROR" ] && echo "MIRROR=$MIRROR" >> $CHROOT_VARIABLES + [ -n "$ARCH" ] && echo "ARCH=$ARCH" >> $CHROOT_VARIABLES + [ -n "$GRUB" ] && echo "GRUB=$GRUB" >> $CHROOT_VARIABLES + [ -n "$HOSTNAME" ] && echo "HOSTNAME=$HOSTNAME" >> $CHROOT_VARIABLES + [ -n "$INSTALL_NOTES" ] && echo "INSTALL_NOTES=$INSTALL_NOTES" >> $CHROOT_VARIABLES + [ -n "$ISODIR" ] && echo "ISODIR=$ISO" >> $CHROOT_VARIABLES + [ -n "$ISO" ] && echo "ISO=$ISO" >> $CHROOT_VARIABLES + [ -n "$MIRROR" ] && echo "MIRROR=$MIRROR" >> $CHROOT_VARIABLES [ -n "$KEEP_SRC_LIST" ] && echo "KEEP_SRC_LIST=$KEEP_SRC_LIST" >> $CHROOT_VARIABLES - [ -n "$PACKAGES" ] && echo "PACKAGES=$PACKAGES" >> $CHROOT_VARIABLES - [ -n "$ROOTPASSWORD" ] && echo "ROOTPASSWORD=$ROOTPASSWORD" >> $CHROOT_VARIABLES - [ -n "$TARGET" ] && echo "TARGET=$TARGET" >> $CHROOT_VARIABLES - [ -n "$TARGET_UUID" ] && echo "TARGET_UUID=$TARGET_UUID" >> $CHROOT_VARIABLES + [ -n "$PACKAGES" ] && echo "PACKAGES=$PACKAGES" >> $CHROOT_VARIABLES + [ -n "$ROOTPASSWORD" ] && echo "ROOTPASSWORD=$ROOTPASSWORD" >> $CHROOT_VARIABLES + [ -n "$TARGET" ] && echo "TARGET=$TARGET" >> $CHROOT_VARIABLES + [ -n "$TARGET_UUID" ] && echo "TARGET_UUID=$TARGET_UUID" >> $CHROOT_VARIABLES + [ -n "$RM_APTCACHE" ] && echo "RM_APTCACHE=$RM_APTCACHE" >> $CHROOT_VARIABLES cp $VERBOSE $CONFFILES/chroot-script $MNTPOINT/bin/chroot-script chmod 755 $MNTPOINT/bin/chroot-script @@ -787,7 +808,11 @@ preparechroot() { sed -i "s#RELEASE=.*#RELEASE=\"$RELEASE\"#" $MNTPOINT/etc/debootstrap/config sed -i "s#TARGET=.*#TARGET=\"$TARGET\"#" $MNTPOINT/etc/debootstrap/config sed -i "s#GRUB=.*#GRUB=\"$GRUB\"#" $MNTPOINT/etc/debootstrap/config - sed -i "s#GROOT=.*#GROOT=\"$GROOT\"#" $MNTPOINT/etc/debootstrap/config + + # install notes: + if [ -n "$INSTALL_NOTES" ] ; then + [ -r "$INSTALL_NOTES" ] && cp "$INSTALL_NOTES" $MNTPOINT/etc/debootstrap/ + fi # package selection: cp $VERBOSE ${_opt_packages:-$CONFFILES/packages} \ @@ -843,6 +868,22 @@ preparechroot() { } # }}} +# execute all scripts in /etc/debootstrap/pre-scripts/ {{{ +execute_pre_scripts() { + # make sure we have $MNTPOINT available for our scripts + export MNTPOINT + if [ -d "$_opt_pre_scripts" ] || [ "$PRE_SCRIPTS" = 'yes' ] ; then + [ -d "$_opt_pre_scripts" ] && pre_scripts="$_opt_pre_scripts" || pre_scripts="$CONFFILES/pre-scripts/" + for script in ${pre_scripts}/* ; do + if [ -x "$script" ] ; then + einfo "Executing pre-script $script" + $script ; eend $? + fi + done + fi +} +# }}} + # execute all scripts in /etc/debootstrap/scripts/ {{{ execute_scripts() { # make sure we have $MNTPOINT available for our scripts @@ -864,10 +905,13 @@ chrootscript() { if ! [ -r "$MNTPOINT/bin/chroot-script" ] ; then mount_target fi + if [ -x "$MNTPOINT/bin/chroot-script" ] ; then einfo "Executing chroot-script now" - chroot "$MNTPOINT" /bin/chroot-script - eend $? + mount --bind /dev "$MNTPOINT"/dev + chroot "$MNTPOINT" /bin/chroot-script ; RC=$? + umount "$MNTPOINT"/dev + eend $RC else eerror "Fatal: $MNTPOINT/bin/chroot-script could not be found." eend 1 @@ -877,31 +921,39 @@ chrootscript() { # install booloader grub {{{ grub_install() { - if [ -z "$GRUB" -o -z "$GROOT" ] ; then - echo "Notice: \$GRUB or \$GROOT not defined, will not install grub therefor." - elif [ -n "$SELECTED_PARTITIONS" ] ; then # using sw-raid + if [ -z "$GRUB" ] ; then + echo "Notice: \$GRUB not defined, will not install grub therefore." + 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 - # TMPDEVICE=$(echo ${SELECTED_PARTITIONS} | awk '{print $1}') - # GRUB="$(grubdevice ${TMPDEVICE})" - # GRUB="$(grubdevice ${TMPDEVICE%%[0-9]})" - # GRUB=$(grubdevice $device) - GRUB="$(grubdevice ${device%%[0-9]})" + 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 } # }}} -# unmount $MNTPOINRT {{{ +# unmount $MNTPOINT {{{ umount_chroot() { + + # display installation notes: + if [ -n "$INSTALL_NOTES" ] ; then + [ -r "${MNTPOINT}/${INSTALL_NOTES}" ] && cat "${MNTPOINT}/${INSTALL_NOTES}" + fi + if [ -n "$ISODIR" ] ; then if grep -q "$ISODIR" /proc/mounts ; then einfo "Unmount $MNTPOINT/$ISODIR" @@ -933,7 +985,7 @@ fscktool() { # now execute all the functions {{{ for i in mkfs tunefs mount_target debootstrap_system preparechroot \ - chrootscript execute_scripts grub_install umount_chroot \ + execute_pre_scripts chrootscript execute_scripts grub_install umount_chroot \ fscktool ; do if stage "${i}" ; then $i && ( stage "${i}" done && rm -f "${STAGES}/${i}" ) || bailout 2 "i" @@ -942,6 +994,12 @@ done # }}} # finalize {{{ +if [ -n "$ISODIR" ] ; then + einfo "Unmounting Debian image loopback from $MNTPOINT/$ISODIR." + umount "$MNTPOINT/$ISODIR" + eend $? +fi + einfo "Removing ${CHROOT_VARIABLES}" ; rm "$CHROOT_VARIABLES" ; eend $? einfo "Removing ${STAGES}" ; rmdir "$STAGES" ; eend $?