X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=grml-debootstrap;h=b65b26abe72d403030474e68b7d78e2e34c712b5;hp=feb7aa1e78293fef1b0cbad43c7fd98a5208686c;hb=6e7a2c86d3a42f6477756a59f1a3de744cc091a3;hpb=ad7c3cfdaa7c6354c951a9dbbad6ada40a1dc082 diff --git a/grml-debootstrap b/grml-debootstrap index feb7aa1..b65b26a 100755 --- a/grml-debootstrap +++ b/grml-debootstrap @@ -5,7 +5,6 @@ # Bug-Reports: see http://grml.org/bugs/ # License: This file is licensed under the GPL v2+ ################################################################################ -# http://www.debian.org/releases/stable/i386/index.html.en # variables {{{ PN="$(basename $0)" @@ -14,8 +13,32 @@ VERSION="${VERSION:-unknown}" MNTPOINT="/mnt/debootstrap.$$" # defaults -VMSIZE="2G" -FORCE='' +[ -n "$CHROOT_SCRIPTS" ] || CHROOT_SCRIPTS='yes' +[ -n "$CONFFILES" ] || CONFFILES='/etc/debootstrap' +[ -n "$DEBCONF" ] || DEBCONF='yes' +[ -n "$DEBIAN_FRONTEND" ] || DEBIAN_FRONTEND='noninteractive' +[ -n "$DEBOOTSTRAP" ] || DEBOOTSTRAP='debootstrap' +[ -n "$DEFAULT_LOCALES" ] || DEFAULT_LOCALES='en_US.UTF-8' +[ -n "$EXTRAPACKAGES" ] || EXTRAPACKAGES='yes' +[ -n "$FALLBACK_MIRROR" ] || FALLBACK_MIRROR='http://http.debian.net/debian' +[ -n "$FORCE" ] || FORCE='' +[ -n "$HOSTNAME" ] || HOSTNAME='grml' +[ -n "$INITRD" ] || INITRD='yes' +[ -n "$INSTALL_NOTES" ] || INSTALL_NOTES='/etc/debootstrap/install_notes' +[ -n "$LOCALES" ] || LOCALES='yes' +[ -n "$MIRROR" ] || MIRROR="$FALLBACK_MIRROR" +[ -n "$MKFS" ] || MKFS='mkfs.ext3' +[ -n "$PACKAGES" ] || PACKAGES='yes' +[ -n "$PRE_SCRIPTS" ] || PRE_SCRIPTS='yes' +[ -n "$RECONFIGURE" ] || RECONFIGURE='console-data' +[ -n "$RELEASE" ] || RELEASE='wheezy' +[ -n "$RM_APTCACHE" ] || RM_APTCACHE='yes' +[ -n "$SCRIPTS" ] || SCRIPTS='yes' +[ -n "$SECURE" ] || SECURE='yes' +[ -n "$TIMEZONE" ] || TIMEZONE='Europe/Vienna' +[ -n "$TUNE2FS" ] || TUNE2FS='tune2fs -c0 -i0' +[ -n "$UPGRADE_SYSTEM" ] || UPGRADE_SYSTEM='yes' +[ -n "$VMSIZE" ] || VMSIZE="2G" # inside the chroot system locales might not be available, so use minimum: export LANG=C @@ -37,7 +60,7 @@ Bootstrap options: -m, --mirror Mirror which should be used for apt-get/aptitude. -i, --iso Mountpoint where a Debian ISO is mounted to, for use instead of fetching packages from a mirror. - -r, --release Release of new Debian system (default: squeeze). + -r, --release Release of new Debian system (default: wheezy). -t, --target Target partition (/dev/...) or directory where the system should be installed to. -p, --mntpoint Mountpoint used for mounting the target system, @@ -46,16 +69,15 @@ 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. --force Do not prompt for user acknowledgement. Options for Virtual Machine deployment: - --vmfile Set up a Virtual Machine instead of installing to - a partition or directory, to be combined with --target, + --vmfile Set up a Virtual Machine (raw format) instead of installing + to a partition or directory, to be combined with --target, like: --vmfile --target /mnt/sda1/qemu.img --vmsize Use specified size for size of VM file (default: 2G). Syntax as supported by qemu-img, like: --vmsize 3G @@ -71,6 +93,8 @@ Configuration options: --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). + --backportrepos Enable Debian's backports repository (backports.debian.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. @@ -120,7 +144,7 @@ einfon() { eerror() { [ "${RC_ENDCOL}" != "yes" ] && [ "${LAST_E_CMD}" = "ebegin" ] && echo - printf " ${BAD}*${NORMAL} $*\n" + printf " ${BAD}*${NORMAL} $*\n" >&2 LAST_E_CMD=eerror return 0 } @@ -153,47 +177,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" } @@ -213,7 +265,7 @@ stage() { # }}} # make sure we have what we need {{{ -check4progs debootstrap dialog || exit 1 +check4progs debootstrap || bailout 1 # }}} # source main configuration file {{{ @@ -231,7 +283,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 @@ -241,10 +293,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 @@ -269,13 +321,15 @@ 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_backportrepos" ] && BACKPORTREPOS='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 -[ "$_opt_insecure" ] && SECURE='false' +[ "$_opt_insecure" ] && echo "Warning: --insecure is deprecated, continuing anyway." [ "$_opt_force" ] && FORCE=$_opt_force [ "$_opt_verbose" ] && VERBOSE="-v" @@ -296,13 +350,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 # }}} @@ -310,7 +364,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 # }}} @@ -321,14 +375,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 # }}} @@ -353,7 +407,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 @@ -363,7 +417,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 } # }}} @@ -395,7 +449,7 @@ prompt_for_bootmanager() fi for device in cciss/c0d0 sda hda; do - if [ /dev/$device != ${MBRDISK} ]; then + if [ "/dev/$device" != "${MBRDISK}" ]; then grep -q $device /proc/partitions && \ ADDITIONAL_PARAMS="$ADDITIONAL_PARAMS:$device:install bootmanager grub into MBR of /dev/$device" fi @@ -416,12 +470,7 @@ prompt_for_bootmanager() mbr) # /dev/md0: has to be installed in MBR of /dev/md0 and not in /dev/md: 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 + GRUB="$TARGET" else GRUB="$MBRDISK" fi @@ -442,13 +491,13 @@ prompt_for_bootmanager() # ask for Debian release {{{ prompt_for_release() { - [ -n "$RELEASE" ] && DEFAULT_RELEASE="$RELEASE" || DEFAULT_RELEASE='squeeze' + [ -n "$RELEASE" ] && DEFAULT_RELEASE="$RELEASE" || DEFAULT_RELEASE='wheezy' 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 \ - lenny Debian/old-stable \ - squeeze Debian/stable \ - wheezy Debian/testing \ + lenny Debian/5.0 \ + squeeze Debian/6.0 \ + wheezy Debian/7.0 \ sid Debian/unstable)" [ $? -eq 0 ] || bailout } @@ -505,7 +554,7 @@ prompt_for_mirror() [ $? -eq 0 ] || bailout if [ "$CHOOSE_MIRROR" = 'net' ] ; then - [ -n "$MIRROR" ] || MIRROR='http://cdn.debian.net/debian' + [ -n "$MIRROR" ] || MIRROR='http://http.debian.net/debian' MIRROR="$(dialog --stdout --title "${PN}" --inputbox \ "Please enter Debian mirror you would like to use for installing packages." \ 0 0 $MIRROR)" @@ -589,7 +638,7 @@ $(cat $ERRORFILE) Exiting." 0 0 rm -f "$TMPFILE" "$ERRORFILE" - exit 1 + bailout 1 fi } @@ -625,7 +674,7 @@ checkconfiguration() if [ -n "$AUTOINSTALL" ] ; then if checkforrun ; then eerror "Exiting as requested" ; eend 0 - exit 1 + bailout 1 fi elif [ -n "$INTERACTIVE" ] ; then @@ -638,11 +687,13 @@ elif [ -n "$INTERACTIVE" ] ; then [ -n "$RELEASE" ] && INFOTEXT="$INFOTEXT Using release: $RELEASE" [ -n "$HOSTNAME" ] && INFOTEXT="$INFOTEXT - Using hostname $HOSTNAME" + Using hostname: $HOSTNAME" [ -n "$MIRROR" ] && INFOTEXT="$INFOTEXT Using mirror: $MIRROR" [ -n "$ISO" ] && INFOTEXT="$INFOTEXT Using ISO: $ISO" + [ -n "$ARCH" ] && INFOTEXT="$INFOTEXT + Using arch: $ARCH" INFOTEXT="$INFOTEXT @@ -653,7 +704,7 @@ Is this ok for you? Notice: selecting 'No' will exit ${PN}." [ $? -eq 0 ] || bailout 0 else # if not running automatic installation display configuration and prompt for execution: - einfo "$PN - Please recheck configuration before execution:" + einfo "$PN [${VERSION}] - Please recheck configuration before execution:" echo echo " Target: $TARGET" @@ -667,14 +718,21 @@ else # if not running automatic installation display configuration and prompt fo fi [ -n "$RELEASE" ] && echo " Using release: $RELEASE" - [ -n "$MIRROR" ] && echo " Using mirror: $MIRROR" [ -n "$HOSTNAME" ] && echo " Using hostname: $HOSTNAME" + [ -n "$MIRROR" ] && echo " Using mirror: $MIRROR" [ -n "$ISO" ] && echo " Using ISO: $ISO" + [ -n "$ARCH" ] && echo " Using arch: $ARCH" if [ -n "$VIRTUAL" ] ; then echo " Deploying as Virtual Machine." [ -n "$VMSIZE" ] && echo " Using Virtual Disk file with size of ${VMSIZE}." fi + if [ ! -t 0 -a -z "$ROOTPASSWORD" -a -z "$NOPASSWORD" ] ; then + echo + echo " You do not have a TTY allocated, your password will be shown in" + echo " plaintext on the terminal! If you are using SSH, try its -t option!" + fi + echo echo " Important! Continuing will delete all data from ${TARGET}!" @@ -686,7 +744,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 @@ -696,6 +754,8 @@ fi # interactive mode {{{ interactive_mode() { + check4progs dialog || bailout 1 + welcome_dialog prompt_for_release @@ -721,6 +781,17 @@ if [ -z "$TARGET" -o -n "$INTERACTIVE" ] ; then fi # }}} +# architecture setup {{{ +if [ -n "$ARCH" ] ; then + ARCHCMD="--arch $ARCH" + ARCHINFO=" (${ARCH})" +else + ARCH="$(dpkg --print-architecture)" + ARCHCMD="--arch $ARCH" + ARCHINFO=" (${ARCH})" +fi +# }}} + checkconfiguration # finally make sure at least $TARGET is set [the partition for the new system] {{{ @@ -729,7 +800,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 # }}} @@ -772,37 +843,13 @@ else fi # }}} -# architecture setup {{{ -if [ -n "$ARCH" ] ; then - ARCHCMD="--arch $ARCH" - ARCHINFO=" (${ARCH})" -else - ARCH="$(dpkg --print-architecture)" - ARCHCMD="--arch $ARCH" - ARCHINFO=" (${ARCH})" -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 file*) # do nothing ;; *) - ISO=file:$1 + ISO=file:$ISO ;; esac fi @@ -810,6 +857,12 @@ ISODIR=${ISO##file:} ISODIR=${ISODIR%%/} # }}} +# Debian ISOs do not contain signed Release files {{{ +if [ -n "$ISO" ] ; then + DEBOOTSTRAP_OPT="$DEBOOTSTRAP_OPT --no-check-gpg" +fi +# }}} + # create filesystem {{{ mkfs() { if [ -n "$DIRECTORY" ] ; then @@ -817,7 +870,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 @@ -890,7 +943,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 @@ -900,10 +953,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 || ! grep -q device-mapper /proc/misc >/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 @@ -916,7 +988,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 } # }}} @@ -929,7 +1001,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." @@ -940,7 +1012,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/" @@ -949,6 +1021,9 @@ finalize_vm() { rm -f "${MNTPOINT}/tmp/core.img" einfo "Updating grub configuration file." + if [ -n "$BOOT_APPEND" ] ; then + sed -i "/GRUB_CMDLINE_LINUX_DEFAULT/ s#\"\$# ${BOOT_APPEND}\"#" "${MNTPOINT}"/etc/default/grub + fi chroot "${MNTPOINT}" update-grub umount "${MNTPOINT}"/proc @@ -958,7 +1033,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 @@ -973,19 +1048,34 @@ debootstrap_system() { fi 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 $? + : else - eerror "Error: $MNTPOINT not mounted, can not continue." - eend 1 + eerror "Error: $MNTPOINT not mounted, can not continue." + eend 1 ; exit 1 + fi + + if [ -n "$ISO" ] ; then + einfo "Running $DEBOOTSTRAP $DEBOOTSTRAP_OPT for release ${RELEASE}${ARCHINFO} using ${ISO}" + einfo "Executing: $DEBOOTSTRAP $ARCHCMD $KEYRING $DEBOOTSTRAP_OPT $RELEASE $MNTPOINT $ISO" + $DEBOOTSTRAP $ARCHCMD $KEYRING $DEBOOTSTRAP_OPT $RELEASE $MNTPOINT $ISO + RC=$? + else + einfo "Running $DEBOOTSTRAP $DEBOOTSTRAP_OPT for release ${RELEASE}${ARCHINFO} using ${MIRROR}" + einfo "Executing: $DEBOOTSTRAP $ARCHCMD $KEYRING $DEBOOTSTRAP_OPT $RELEASE $MNTPOINT $MIRROR" + $DEBOOTSTRAP $ARCHCMD $KEYRING $DEBOOTSTRAP_OPT $RELEASE $MNTPOINT $MIRROR + RC=$? fi + + if [ $RC -ne 0 ] ; then + if [ -r "$MNTPOINT/debootstrap/debootstrap.log" ] && \ + [ -s "$MNTPOINT/debootstrap/debootstrap.log" ] ; then + einfo "Presenting last ten lines of debootstrap.log:" + tail -10 $MNTPOINT/debootstrap/debootstrap.log + einfo "End of debootstrap.log" + fi + fi + + eend $RC } # }}} @@ -998,21 +1088,44 @@ 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 "$NOPASSWORD" ] && echo "NOPASSWORD=true" >> $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 "$BACKPORTREPOS" ] && echo "BACKPORTREPOS=\"$BACKPORTREPOS\"" >> $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 "$DEFAULT_LOCALES" ] && echo "DEFAULT_LOCALES=\"$DEFAULT_LOCALES\"" >> $CHROOT_VARIABLES + [ -n "$EXTRAPACKAGES" ] && echo "EXTRAPACKAGES=\"$EXTRAPACKAGES\"" >> $CHROOT_VARIABLES + [ -n "$FALLBACK_MIRROR" ] && echo "FALLBACK_MIRROR=\"$FALLBACK_MIRROR\"" >> $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 @@ -1124,18 +1237,29 @@ execute_scripts() { # execute chroot-script {{{ chrootscript() { if ! [ -r "$MNTPOINT/bin/chroot-script" ] ; then - mount_target + mount_target fi - if [ -x "$MNTPOINT/bin/chroot-script" ] ; then - einfo "Executing chroot-script now" - mount --bind /dev "$MNTPOINT"/dev - chroot "$MNTPOINT" /bin/chroot-script ; RC=$? - umount "$MNTPOINT"/dev - eend $RC + if ! [ -x "$MNTPOINT/bin/chroot-script" ] ; then + eerror "Fatal: $MNTPOINT/bin/chroot-script could not be found." + eend 1 else - eerror "Fatal: $MNTPOINT/bin/chroot-script could not be found." - eend 1 + einfo "Executing chroot-script now" + mount --bind /dev "$MNTPOINT"/dev + chroot "$MNTPOINT" /bin/chroot-script ; RC=$? + umount "$MNTPOINT"/dev + eend $RC + fi + + # finally get rid of chroot-script again, there's no good reason to + # keep it on the installed system + if grep -q GRML_CHROOT_SCRIPT_MARKER "${MNTPOINT}/bin/chroot-script" ; then + einfo "Removing chroot-script again" + rm -f "${MNTPOINT}/bin/chroot-script" + eend $? + else + einfo "Keeping chroot-script as string GRML_CHROOT_SCRIPT_MARKER could not be found" + eend 0 fi } # }}} @@ -1168,12 +1292,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 } # }}} @@ -1182,19 +1311,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 {{{ @@ -1211,4 +1332,4 @@ fi # }}} ## END OF FILE ################################################################# -# vim: ai tw=100 expandtab foldmethod=marker shiftwidth=3 +# vim: ai tw=100 expandtab foldmethod=marker shiftwidth=2