X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=grml-debootstrap;h=4b46eaa8f94d37c4f4059e9b19a4511dd43ed3b9;hp=3d60bbd4ccf7a8186579a8330aa5705e6e9a0992;hb=06fc8bd266ad5f2ca4f28af7ae636f5db3c3bc57;hpb=3adae46fa166f99f130b9b7180b0f638d7314746 diff --git a/grml-debootstrap b/grml-debootstrap index 3d60bbd..4b46eaa 100755 --- a/grml-debootstrap +++ b/grml-debootstrap @@ -36,6 +36,7 @@ SCRIPTS='yes' SECURE='yes' TIMEZONE='Europe/Vienna' TUNE2FS='tune2fs -c0 -i0' +UPGRADE_SYSTEM='yes' VMSIZE="2G" # inside the chroot system locales might not be available, so use minimum: @@ -70,7 +71,6 @@ Bootstrap options: --arch Set target architecture, use for installing i386 on amd64. --filesystem Filesystem that should be used when target is a partition or Virtual Machine (see --vmfile). - --insecure Do not download and check Release file signatures. --force Do not prompt for user acknowledgement. Options for Virtual Machine deployment: @@ -175,47 +175,75 @@ check4progs(){ # }}} # helper functions {{{ -# we want to exit smoothly and clean: -bailout(){ +cleanup() { + if [ -n "$CHROOT_VARIABLES" ] ; then + einfo "Removing ${CHROOT_VARIABLES}" ; rm "$CHROOT_VARIABLES" ; eend $? + fi + + if [ -n "$STAGES" ] ; then + einfo "Removing ${STAGES}" ; rmdir "$STAGES" ; eend $? + fi + + # Remove temporary mountpoint again + if echo "$MNTPOINT" | grep -q '/mnt/debootstrap\.' ; then + rmdir "$MNTPOINT" 2>/dev/null + fi + # make sure $TARGET is not mounted when exiting grml-debootstrap if [ -n "$MNTPOINT" ] ; then - if grep -q $MNTPOINT /proc/mounts ; then - # 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 leave anything (/proc /proc is intended) - for ARG in /sys /proc /proc ; do - [ -x "$MNTPOINT"/bin/umount ] && chroot "$MNTPOINT" umount $ARG >/dev/null 2>&1 || true - done - umount "$MNTPOINT"/dev >/dev/null 2>&1 || true - - [ -d "$MNTPOINT/$ISODIR" ] && umount "$MNTPOINT/$ISODIR" >/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 - else - einfo "Unmounting $MNTPOINT" ; umount "$MNTPOINT" ; eend $? - fi - - if [ -n "$STAGES" ] ; then - echo -n "Removing stages directory ${STAGES}: " - rm -rf "$STAGES" && echo done - fi - - # remove directory only if we used the default with process id inside the name - if echo "$MNTPOINT" | grep -q '/mnt/debootstrap\.' ; then - einfo "Removing directory ${MNTPOINT}" ; rmdir $MNTPOINT ; eend $? - fi - fi + if grep -q "$MNTPOINT" /proc/mounts ; then + # 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 + + [ -x "$MNTPOINT"/bin/umount ] && chroot "$MNTPOINT" umount -a >/dev/null 2>&1 + + # ugly, but make sure we really don't leave anything (/proc /proc and + # /dev /dev are intended, trying to work around timing issues, see #657023) + for ARG in /sys /proc /proc /dev /dev ; do + [ -x "$MNTPOINT"/bin/umount ] && chroot "$MNTPOINT" umount $ARG >/dev/null 2>&1 + umount "$MNTPOINT"/$ARG >/dev/null 2>&1 + done + + if [ -n "$ISODIR" ] ; then + [ -d "$MNTPOINT/$ISODIR" ] && umount "$MNTPOINT/$ISODIR" >/dev/null 2>&1 + fi + + if [ -n "$DIRECTORY" ] ; then + einfo "Not unmounting $MNTPOINT as you requested me to install into a directory of your own choice." ; eend 0 + else + einfo "Unmounting $MNTPOINT" + umount "$MNTPOINT" + eend $? + fi + + if [ -n "$STAGES" ] ; then + echo -n "Removing stages directory ${STAGES}: " + rm -rf "$STAGES" && echo done + fi + + # remove directory only if we used the default with process id inside the name + if echo "$MNTPOINT" | grep -q '/mnt/debootstrap\.' ; then + einfo "Removing directory ${MNTPOINT}" + rmdir "$MNTPOINT" + eend $? + fi + fi fi if [ -n "${ORIG_TARGET}" ] ; then einfo "Removing loopback mount of file ${ORIG_TARGET}." kpartx -d "${ORIG_TARGET}" ; eend $? fi +} + +# we want to exit smoothly and clean: +bailout(){ + + cleanup [ -n "$1" ] && EXIT="$1" || EXIT="1" - [ -n "$3" ] && einfo "Notice: just remove $STAGES/$3 to reexecute the stage" + [ -n "$2" ] && einfo "Notice: remove $STAGES/$2 to reexecute the stage" exit "$EXIT" } @@ -235,7 +263,7 @@ stage() { # }}} # make sure we have what we need {{{ -check4progs debootstrap dialog || exit 1 +check4progs debootstrap || bailout 1 # }}} # source main configuration file {{{ @@ -253,7 +281,7 @@ elif [ -r /usr/share/grml-debootstrap/functions/cmdlineopts.clp ] ; then else eerror "Error: cmdline function file not found, exiting." eend 1 - exit 1 + bailout 1 fi # == business-logic of command line parameter-processing @@ -263,10 +291,10 @@ fi CONFFILES=$_opt_confdir einfo "Using config files under $CONFFILES/." if ! [ -r "$CONFFILES/config" ] ; then - eerror "Error: config file $CONFFILES/config not found."; eend 1; exit 1 + eerror "Error: config file $CONFFILES/config not found."; eend 1; bailout 1 fi if ! . "$CONFFILES/config" ; then - eerror "Error reading config file $CONFFILES/config" ; eend 1 ; exit 1 + eerror "Error reading config file $CONFFILES/config" ; eend 1 ; bailout 1 fi # restore the command line parameter value CONFFILES=$_opt_confdir @@ -298,7 +326,7 @@ fi [ "$_opt_bootappend" ] && BOOT_APPEND=$_opt_bootappend [ "$_opt_grub" ] && GRUB=$_opt_grub [ "$_opt_arch" ] && ARCH=$_opt_arch -[ "$_opt_insecure" ] && SECURE='false' +[ "$_opt_insecure" ] && echo "Warning: --insecure is deprecated, continuing anyway." [ "$_opt_force" ] && FORCE=$_opt_force [ "$_opt_verbose" ] && VERBOSE="-v" @@ -319,13 +347,13 @@ fi # check for root permissions {{{ if ! check4root ; then echo "For usage instructions please execute '$PN --help'." - exit 1 + bailout 1 fi # }}} # make sure we have what we need {{{ if [ -n "$VIRTUAL" ] ; then - check4progs kpartx mksh qemu-img || exit 1 + check4progs kpartx mksh parted qemu-img || bailout 1 fi # }}} @@ -333,7 +361,7 @@ fi if [ -n "$CONFIGFILE" ] ; then einfo "Reading specified config file $CONFIGFILE." if ! . "$CONFIGFILE" ; then - eerror "Error reading config file $CONFIGFILE" ; eend 1 ; exit 1 + eerror "Error reading config file $CONFIGFILE" ; eend 1 ; bailout 1 fi fi # }}} @@ -344,14 +372,14 @@ if [ -n "$GROOT" ] ; then eerror "This variable is no longer supported, please visit the" eerror "grml-debootstrap documentation for details." eend 1 - exit 1 + bailout 1 fi if echo "$GRUB" | grep -q '^hd' ; then eerror "Error: this syntax for the grub configuration variable is no longer supported." eerror "Please do not use hd... any longer but /dev/sdX instead." eend 1 - exit 1 + bailout 1 fi # }}} @@ -376,7 +404,7 @@ prompt_for_target() --msgbox "Sorry, no partitions found. Please configure your harddisks (see /proc/partitions) using a tool like fdisk, cfdisk, gpart, gparted,..." 0 0 - exit 0 + bailout 1 fi PARTITION_LIST=$(for i in $(echo $AVAILABLE_PARTITIONS) ; do @@ -386,7 +414,7 @@ prompt_for_target() TARGET=$(dialog --title "$PN" --single-quoted --stdout \ --menu "Please select the target partition:" 0 0 0 \ $PARTITION_LIST) - [ $? -eq 0 ] || bailout + [ $? -eq 0 ] || bailout 1 } # }}} @@ -612,7 +640,7 @@ $(cat $ERRORFILE) Exiting." 0 0 rm -f "$TMPFILE" "$ERRORFILE" - exit 1 + bailout 1 fi } @@ -648,7 +676,7 @@ checkconfiguration() if [ -n "$AUTOINSTALL" ] ; then if checkforrun ; then eerror "Exiting as requested" ; eend 0 - exit 1 + bailout 1 fi elif [ -n "$INTERACTIVE" ] ; then @@ -709,7 +737,7 @@ else # if not running automatic installation display configuration and prompt fo read a if ! [ "$a" = 'y' -o "$a" = 'Y' ] ; then eerror "Exiting as requested." ; eend 1 - exit 1 + bailout 1 fi fi fi @@ -719,6 +747,8 @@ fi # interactive mode {{{ interactive_mode() { + check4progs dialog || bailout 1 + welcome_dialog prompt_for_release @@ -752,7 +782,7 @@ if [ -n "$TARGET" ] ; then else eerror "Please adjust $CONFFILES/config or..." eerror "... use the interactive version for configuration before running ${0}" ; eend 1 - exit 1 + bailout 1 fi # }}} @@ -806,19 +836,6 @@ 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 @@ -840,7 +857,7 @@ mkfs() { else if grep -q "$TARGET" /proc/mounts ; then eerror "$TARGET already mounted, exiting to avoid possible damage. (Manually unmount $TARGET)" ; eend 1 - exit 1 + bailout 1 fi if [ -n "$MKFS" ] ; then @@ -913,7 +930,7 @@ prepare_vm() { if [ -b "$TARGET" ] ; then eerror "Error: specified virtual disk target ($TARGET) is an existing block device." eend 1 - exit 1 + bailout 1 fi ORIG_TARGET="$TARGET" # store for later reuse @@ -923,10 +940,29 @@ prepare_vm() { dd if=/dev/zero bs=1 conv=notrunc count=64 seek=446 of="$TARGET" parted -s "${TARGET}" 'mkpart primary ext3 2M -1' + # if dm-mod isn't available then kpartx will fail with + # "Is device-mapper driver missing from kernel? [...]" + if ! kpartx -av $TARGET >/dev/null 2>&1 ; then + einfo "Device-mapper not ready yet, trying to load dm-mod module." + modprobe dm-mod ; eend $? + fi + + # make sure loop module is present + if ! losetup -f >/dev/null 2>&1; then + einfo "Can not find a usable loop device, retrying after loading loop module." + modprobe loop + if losetup -f >/dev/null 2>&1; then + einfo "Found a usable loop device now, continuing." + else + eerror "Error finding usable loop device" ; eend 1 + bailout 1 + fi + fi + DEVINFO=$(kpartx -av $TARGET) # 'add map loop1p1 (253:0): 0 6289408 linear /dev/loop1 2048' if [ -z "${DEVINFO}" ] ; then eerror "Error setting up loopback device." ; eend 1 - exit 1 + bailout 1 fi # hopefully this always works as expected @@ -939,7 +975,7 @@ prepare_vm() { if [ -z "$TARGET" ] ; then eerror "Error: target could not be set to according /dev/mapper/* device." ; eend 1 - exit 1 + bailout 1 fi } # }}} @@ -952,7 +988,7 @@ finalize_vm() { if ! mount "${TARGET}" "${MNTPOINT}" ; then eerror "Error: Mounting ${TARGET} failed, can not continue." ; eend 1 - exit 1 + bailout 1 fi einfo "Installing Grub as bootloader." @@ -963,7 +999,7 @@ finalize_vm() { mkdir -p "${MNTPOINT}/boot/grub" if ! [ -d "${MNTPOINT}"/usr/lib/grub/i386-pc/ ] ; then eerror "Error: grub not installed inside Virtual Machine. Can not install bootloader." ; eend 1 - exit 1 + bailout 1 fi cp "${MNTPOINT}"/usr/lib/grub/i386-pc/* "${MNTPOINT}/boot/grub/" @@ -981,7 +1017,7 @@ finalize_vm() { einfo "Adjusting grub.cfg for successful boot sequence." # ugly but needed to boot grub acordingly sed -i "s;set root=.*;set root='(hd0,msdos1)';" "${MNTPOINT}"/boot/grub/grub.cfg - sed -i "s; root=/dev/.*; root=/dev/sda1;" "${MNTPOINT}"/boot/grub/grub.cfg + sed -i "s;root=[^ ]\+;root=/dev/sda1;" "${MNTPOINT}"/boot/grub/grub.cfg umount "${MNTPOINT}" kpartx -d "${ORIG_TARGET}" >/dev/null @@ -1051,6 +1087,7 @@ preparechroot() { [ -n "$SECURE" ] && echo "SECURE=\"$SECURE\"" >> $CHROOT_VARIABLES [ -n "$SELECTED_PARTITIONS" ] && echo "SELECTED_PARTITIONS=\"$SELECTED_PARTITIONS\"" >> $CHROOT_VARIABLES [ -n "$TARGET" ] && echo "TARGET=\"$TARGET\"" >> $CHROOT_VARIABLES + [ -n "$UPGRADE_SYSTEM" ] && echo "UPGRADE_SYSTEM=\"$UPGRADE_SYSTEM\"" >> $CHROOT_VARIABLES [ -n "$TARGET_UUID" ] && echo "TARGET_UUID=\"$TARGET_UUID\"" >> $CHROOT_VARIABLES [ -n "$TIMEZONE" ] && echo "TIMEZONE=\"$TIMEZONE\"" >> $CHROOT_VARIABLES [ -n "$TUNE2FS" ] && echo "TUNE2FS=\"$TUNE2FS\"" >> $CHROOT_VARIABLES @@ -1211,7 +1248,7 @@ umount_chroot() { # execute filesystem check {{{ fscktool() { if [ -n "$VIRTUAL" ] ; then - einfo "Skipping filesystem check since we deploy a virtual machine." + einfo "Skipping filesystem check because we deploy a virtual machine." return 0 fi @@ -1229,19 +1266,11 @@ for i in prepare_vm mkfs tunefs mount_target debootstrap_system \ preparechroot execute_pre_scripts chrootscript execute_scripts \ umount_chroot finalize_vm fscktool ; do if stage "${i}" ; then - $i && ( stage "${i}" done && rm -f "${STAGES}/${i}" ) || bailout 2 "i" + $i && ( stage "${i}" done && rm -f "${STAGES}/${i}" ) || bailout 2 "$i" fi done -# }}} -# finalize {{{ -einfo "Removing ${CHROOT_VARIABLES}" ; rm "$CHROOT_VARIABLES" ; eend $? -einfo "Removing ${STAGES}" ; rmdir "$STAGES" ; eend $? - -# Remove temporary mountpoint again -if echo "$MNTPOINT" | grep -q '/mnt/debootstrap\.' ; then - einfo "Removing directory ${MNTPOINT}" ; rmdir "$MNTPOINT" ; eend $? -fi +cleanup # }}} # end dialog of autoinstallation {{{