X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=grml-debootstrap;h=1ab3dd75165b8549b1b6daf7bea66878114b45d2;hp=8bbed71dfa303cee7815c03ac6577eb8d020fd52;hb=f720b57ef47eca8a5c6d5a98c763bd06d4f36c13;hpb=561fb863c769214865b8ba5f86e5e1c374bba609 diff --git a/grml-debootstrap b/grml-debootstrap index 8bbed71..1ab3dd7 100755 --- a/grml-debootstrap +++ b/grml-debootstrap @@ -14,8 +14,30 @@ VERSION="${VERSION:-unknown}" MNTPOINT="/mnt/debootstrap.$$" # defaults -VMSIZE="2G" +CHROOT_SCRIPTS='yes' +CONFFILES='/etc/debootstrap' +DEBCONF='yes' +DEBIAN_FRONTEND='noninteractive' +DEBOOTSTRAP='debootstrap' +EXTRAPACKAGES='yes' FORCE='' +HOSTNAME='grml' +INITRD='yes' +INSTALL_NOTES='/etc/debootstrap/install_notes' +LOCALES='yes' +MIRROR='http://cdn.debian.net/debian' +MKFS='mkfs.ext3' +PACKAGES='yes' +PRE_SCRIPTS='yes' +RECONFIGURE='console-data' +RELEASE='squeeze' +RM_APTCACHE='yes' +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: export LANG=C @@ -46,7 +68,7 @@ Bootstrap options: --interactive Use interactive mode (frontend). --nodebootstrap Skip debootstrap, only do configuration to the target. --grub Target for grub installation. Usage example: /dev/sda - --arch Architecture to use. Currently only i386 is supported. + --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. @@ -66,12 +88,15 @@ Configuration options: /etc/debootstrap/config -d, --confdir Place of config files for debootstrap, defaults to /etc/debootstrap - --packages Install packages defined in specified list file. + --packages Install packages defined in specified list file + instead of using /etc/debootstrap/packages. --nopackages Skip installation of packages defined in /etc/debootstrap/packages --debconf Pre-seed packages using specified pre-seed db file. + --grmlrepos Enable Grml's Debian repository (deb.grml.org). --keep_src_list Do not overwrite user provided apt sources.list. --hostname Hostname of Debian system. + --nopassword Do not prompt for the root password. --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. @@ -96,7 +121,7 @@ if [ "$1" = '-h' ] || [ "$1" = '-help' ] || [ "$1" = "--help" ] ; then fi # }}} -# {{{ +# early helper functions {{{ GOOD='' WARN='' BAD='' @@ -129,6 +154,7 @@ eend() { if [ $retval -gt 0 ]; then printf " ${BAD}-> Failed (rc=${retval})${NORMAL}\n" fi + return $retval } check4root(){ @@ -147,11 +173,98 @@ check4progs(){ return 1 fi } +# }}} + +# helper functions {{{ +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 + + [ -x "$MNTPOINT"/bin/umount ] && chroot "$MNTPOINT" umount -a >/dev/null 2>&1 + + # 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 + umount "$MNTPOINT"/$ARG >/dev/null 2>&1 + done + umount "$MNTPOINT"/dev >/dev/null 2>&1 + + 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 "$2" ] && einfo "Notice: remove $STAGES/$2 to reexecute the stage" + + exit "$EXIT" +} +trap bailout HUP INT QUIT TERM + +# we want to execute all the functions only once, simple check for it: +stage() { + if [ -n "$2" ] ; then + echo "$2" > "${STAGES}/${1}" + return 0 + elif grep -q done "${STAGES}/${1}" 2>/dev/null ; then + ewarn "Notice: stage $1 has been executed already, skipping execution therefore." ; eend 0 + ewarn " To reexecute it clean up the according directory inside $STAGES" ; eend 0 + return 1 + fi +} # }}} # make sure we have what we need {{{ -check4progs debootstrap dialog || exit 1 +check4progs debootstrap dialog || bailout 1 # }}} # source main configuration file {{{ @@ -169,7 +282,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 @@ -179,10 +292,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 @@ -207,8 +320,10 @@ fi [ "$_opt_pre_scripts_set" ] && PRE_SCRIPTS='yes' [ "$_opt_chroot_scripts_set" ] && CHROOT_SCRIPTS='yes' [ "$_opt_keep_src_list" ] && KEEP_SRC_LIST='yes' +[ "$_opt_grmlrepos" ] && GRMLREPOS='yes' [ "$_opt_hostname" ] && HOSTNAME=$_opt_hostname [ "$_opt_password" ] && ROOTPASSWORD=$_opt_password +[ "$_opt_nopassword" ] && NOPASSWORD='yes' [ "$_opt_bootappend" ] && BOOT_APPEND=$_opt_bootappend [ "$_opt_grub" ] && GRUB=$_opt_grub [ "$_opt_arch" ] && ARCH=$_opt_arch @@ -233,13 +348,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 qemu-img || bailout 1 fi # }}} @@ -247,7 +362,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 # }}} @@ -258,14 +373,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 # }}} @@ -273,7 +388,7 @@ fi welcome_dialog() { dialog --title "$PN" --yesno "Welcome to the interactive configuration of ${PN}. -Do you want to continue installing Debian using this frontend?" 0 0 +Do you want to continue installing Debian using this frontend?" 0 0 || bailout 0 } # }}} @@ -290,7 +405,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 @@ -300,6 +415,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 1 } # }}} @@ -386,6 +502,7 @@ prompt_for_release() squeeze Debian/stable \ wheezy Debian/testing \ sid Debian/unstable)" + [ $? -eq 0 ] || bailout } # }}} @@ -395,27 +512,35 @@ prompt_for_hostname() HOSTNAME="$(dialog --stdout --title "${PN}" --inputbox \ "Please enter the hostname you would like to use for installation:" \ 0 0 $HOSTNAME)" + [ $? -eq 0 ] || bailout } # }}} # ask for password {{{ prompt_for_password() { - ROOTPW1='PW1' - ROOTPW2='PW2' - while [ "$ROOTPW1" != "$ROOTPW2" ]; do - ROOTPW1=$(dialog --insecure --stdout --title "${PN}" --passwordbox \ - "Please enter the password for the root account:" 10 60) - ROOTPW2=$(dialog --insecure --stdout --title "${PN}" --passwordbox \ - "Please enter the password for the root account again for \ - confirmation:" 10 60) - - if [ "$ROOTPW1" != "$ROOTPW2" ]; then - $(dialog --stdout --title "${PN}" --ok-label \ - "Retry" --msgbox "Passwords do not match!" 10 60) - fi - done - ROOTPASSWORD="$ROOTPW1" + if [ "$_opt_nopassword" ] ; then + einfo "Skip asking for root password as requested." + return 0 + fi + + ROOTPW1='PW1' + ROOTPW2='PW2' + while [ "$ROOTPW1" != "$ROOTPW2" ]; do + ROOTPW1=$(dialog --insecure --stdout --title "${PN}" --passwordbox \ + "Please enter the password for the root account:" 10 60) + [ $? -eq 0 ] || bailout + ROOTPW2=$(dialog --insecure --stdout --title "${PN}" --passwordbox \ + "Please enter the password for the root account again for \ + confirmation:" 10 60) + [ $? -eq 0 ] || bailout + + if [ "$ROOTPW1" != "$ROOTPW2" ]; then + $(dialog --stdout --title "${PN}" --ok-label \ + "Retry" --msgbox "Passwords do not match!" 10 60) + fi + done + ROOTPASSWORD="$ROOTPW1" } # }}} @@ -429,17 +554,20 @@ prompt_for_mirror() net "install via network (downloading from mirror)" \ local "install from local directory/mirror" ) + [ $? -eq 0 ] || bailout if [ "$CHOOSE_MIRROR" = 'net' ] ; then [ -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)" + [ $? -eq 0 ] || bailout else # CHOOSE_MIRROR == local [ -n "$ISO" ] || ISO='/mnt/mirror' ISO="$(dialog --stdout --title "${PN}" --inputbox \ "Please enter directory name you would like to use for installing packages." \ 0 0 $ISO)" + [ $? -eq 0 ] || bailout fi } # }}} @@ -482,6 +610,7 @@ PARTITION_LIST=$(for i in $(echo $AVAILABLE_PARTITIONS) ; do dialog --title "$PN" --separate-output \ --checklist "Please select the partitions you would like to use for your $RAIDLEVEL on ${TARGET}:" 0 0 0 \ $PARTITION_LIST 2>$TMPFILE +[ $? -eq 0 ] || bailout RETVAL=$? SELECTED_PARTITIONS="$(cat $TMPFILE)" @@ -512,7 +641,7 @@ $(cat $ERRORFILE) Exiting." 0 0 rm -f "$TMPFILE" "$ERRORFILE" - exit 1 + bailout 1 fi } @@ -540,6 +669,7 @@ Last chance to quit. Timeout of 10 seconds running.... Do you want to stop now?" 0 0 2>/dev/null } +# }}} # make sure the user is aware of the used configuration {{{ checkconfiguration() @@ -547,7 +677,7 @@ checkconfiguration() if [ -n "$AUTOINSTALL" ] ; then if checkforrun ; then eerror "Exiting as requested" ; eend 0 - exit 1 + bailout 1 fi elif [ -n "$INTERACTIVE" ] ; then @@ -572,6 +702,7 @@ Is this ok for you? Notice: selecting 'No' will exit ${PN}." dialog --title "$PN" --no-collapse \ --yesno "$INFOTEXT" 0 0 + [ $? -eq 0 ] || bailout 0 else # if not running automatic installation display configuration and prompt for execution: einfo "$PN - Please recheck configuration before execution:" @@ -607,7 +738,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 @@ -650,7 +781,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 # }}} @@ -731,66 +862,6 @@ ISODIR=${ISO##file:} ISODIR=${ISODIR%%/} # }}} -# helper functions {{{ -# we want to exit smoothly and clean: -bailout(){ - # 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 - fi - - if [ -n "${ORIG_TARGET}" ] ; then - einfo "Removing loopback mount of file ${ORIG_TARGET}." - kpartx -d "${ORIG_TARGET}" ; eend $? - fi - - [ -n "$1" ] && EXIT="$1" || EXIT="1" - [ -n "$3" ] && einfo "Notice: just remove $STAGES/$3 to reexecute the stage" - - exit "$EXIT" -} -trap bailout HUP INT QUIT TERM - -# we want to execute all the functions only once, simple check for it: -stage() { - if [ -n "$2" ] ; then - echo "$2" > "${STAGES}/${1}" - return 0 - elif grep -q done "${STAGES}/${1}" 2>/dev/null ; then - ewarn "Notice: stage $1 has been executed already, skipping execution therefore." ; eend 0 - ewarn " To reexecute it clean up the according directory inside $STAGES" ; eend 0 - return 1 - fi -} -# }}} - # create filesystem {{{ mkfs() { if [ -n "$DIRECTORY" ] ; then @@ -798,7 +869,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 @@ -871,20 +942,20 @@ 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 qemu-img create -f raw "${TARGET}" "${VMSIZE}" - echo 4 66 | mksh /usr/share/grml-debootstrap/bootgrub.mksh -A | dd of="$TARGET" conv=notrunc + echo 4 66 | /usr/share/grml-debootstrap/bootgrub.mksh -A | dd of="$TARGET" conv=notrunc dd if=/dev/zero bs=1 conv=notrunc count=64 seek=446 of="$TARGET" parted -s "${TARGET}" 'mkpart primary ext3 2M -1' 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 @@ -897,7 +968,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 } # }}} @@ -910,7 +981,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." @@ -921,7 +992,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/" @@ -979,20 +1050,41 @@ 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 "$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 "$KEEP_SRC_LIST" ] && echo "KEEP_SRC_LIST=$KEEP_SRC_LIST" >> $CHROOT_VARIABLES - [ -n "$MIRROR" ] && echo "MIRROR=$MIRROR" >> $CHROOT_VARIABLES - [ -n "$PACKAGES" ] && echo "PACKAGES=$PACKAGES" >> $CHROOT_VARIABLES - [ -n "$RM_APTCACHE" ] && echo "RM_APTCACHE=$RM_APTCACHE" >> $CHROOT_VARIABLES - [ -n "$ROOTPASSWORD" ] && echo "ROOTPASSWORD=$ROOTPASSWORD" >> $CHROOT_VARIABLES - [ -n "$SELECTED_PARTITIONS" ] && echo "SELECTED_PARTITIONS=$SELECTED_PARTITIONS" >> $CHROOT_VARIABLES - [ -n "$TARGET" ] && echo "TARGET=$TARGET" >> $CHROOT_VARIABLES - [ -n "$TARGET_UUID" ] && echo "TARGET_UUID=$TARGET_UUID" >> $CHROOT_VARIABLES + [ -n "$ARCH" ] && echo "ARCH=\"$ARCH\"" >> $CHROOT_VARIABLES + [ -n "$CHROOT_SCRIPTS" ] && echo "CHROOT_SCRIPTS=\"$CHROOT_SCRIPTS\"" >> $CHROOT_VARIABLES + [ -n "$CONFFILES" ] && echo "CONFFILES=\"$CONFFILES\"" >> $CHROOT_VARIABLES + [ -n "$DEBCONF" ] && echo "DEBCONF=\"$DEBCONF\"" >> $CHROOT_VARIABLES + [ -n "$DEBIAN_FRONTEND" ] && echo "DEBIAN_FRONTEND=\"$DEBIAN_FRONTEND\"" >> $CHROOT_VARIABLES + [ -n "$DEBOOTSTRAP" ] && echo "DEBOOTSTRAP=\"$DEBOOTSTRAP\"" >> $CHROOT_VARIABLES + [ -n "$EXTRAPACKAGES" ] && echo "EXTRAPACKAGES=\"$EXTRAPACKAGES\"" >> $CHROOT_VARIABLES + [ -n "$FORCE" ] && echo "FORCE=\"$FORCE\"" >> $CHROOT_VARIABLES + [ -n "$GRMLREPOS" ] && echo "GRMLREPOS=\"$GRMLREPOS\"" >> $CHROOT_VARIABLES + [ -n "$GRUB" ] && echo "GRUB=\"$GRUB\"" >> $CHROOT_VARIABLES + [ -n "$HOSTNAME" ] && echo "HOSTNAME=\"$HOSTNAME\"" >> $CHROOT_VARIABLES + [ -n "$INITRD" ] && echo "INITRD=\"$INITRD\"" >> $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 "$KEEP_SRC_LIST" ] && echo "KEEP_SRC_LIST=\"$KEEP_SRC_LIST\"" >> $CHROOT_VARIABLES + [ -n "$LOCALES" ] && echo "LOCALES=\"$LOCALES\"" >> $CHROOT_VARIABLES + [ -n "$MIRROR" ] && echo "MIRROR=\"$MIRROR\"" >> $CHROOT_VARIABLES + [ -n "$MKFS" ] && echo "MKFS=\"$MKFS\"" >> $CHROOT_VARIABLES + [ -n "$NOPASSWORD" ] && echo "NOPASSWORD=\"true\"" >> $CHROOT_VARIABLES + [ -n "$PACKAGES" ] && echo "PACKAGES=\"$PACKAGES\"" >> $CHROOT_VARIABLES + [ -n "$PRE_SCRIPTS" ] && echo "PRE_SCRIPTS=\"$PRE_SCRIPTS\"" >> $CHROOT_VARIABLES + [ -n "$RECONFIGURE" ] && echo "RECONFIGURE=\"$RECONFIGURE\"" >> $CHROOT_VARIABLES + [ -n "$RELEASE" ] && echo "RELEASE=\"$RELEASE\"" >> $CHROOT_VARIABLES + [ -n "$RM_APTCACHE" ] && echo "RM_APTCACHE=\"$RM_APTCACHE\"" >> $CHROOT_VARIABLES + [ -n "$ROOTPASSWORD" ] && echo "ROOTPASSWORD=\"$ROOTPASSWORD\"" >> $CHROOT_VARIABLES + [ -n "$SCRIPTS" ] && echo "SCRIPTS=\"$SCRIPTS\"" >> $CHROOT_VARIABLES + [ -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 + [ -n "$VMSIZE" ] && echo "VMSIZE=\"$VMSIZE\"" >> $CHROOT_VARIABLES cp $VERBOSE $CONFFILES/chroot-script $MNTPOINT/bin/chroot-script chmod 755 $MNTPOINT/bin/chroot-script @@ -1148,12 +1240,17 @@ umount_chroot() { # execute filesystem check {{{ fscktool() { - if [ "$FSCK" = 'yes' ] ; then - [ -n "$FSCKTOOL" ] || FSCKTOOL="fsck.${MKFS#mkfs.}" - einfo "Checking filesystem on $TARGET using $FSCKTOOL" - $FSCKTOOL $TARGET - eend $? - fi + if [ -n "$VIRTUAL" ] ; then + einfo "Skipping filesystem check because we deploy a virtual machine." + return 0 + fi + + if [ "$FSCK" = 'yes' ] ; then + [ -n "$FSCKTOOL" ] || FSCKTOOL="fsck.${MKFS#mkfs.}" + einfo "Checking filesystem on $TARGET using $FSCKTOOL" + $FSCKTOOL $TARGET + eend $? + fi } # }}} @@ -1162,19 +1259,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 {{{ @@ -1191,4 +1280,4 @@ fi # }}} ## END OF FILE ################################################################# -# vim: ai tw=100 expandtab foldmethod=marker shiftwidth=3 +# vim: ai tw=100 expandtab foldmethod=marker shiftwidth=2