From: Michael Prokop Date: Fri, 22 Dec 2023 16:14:59 +0000 (+0100) Subject: Merge remote-tracking branch 'origin/pr/259' X-Git-Tag: v0.106~5 X-Git-Url: http://git.grml.org/?a=commitdiff_plain;ds=inline;h=7a320f260a3a5f75018d9a9598a714e5206c9f93;hp=-c;p=grml-debootstrap.git Merge remote-tracking branch 'origin/pr/259' --- 7a320f260a3a5f75018d9a9598a714e5206c9f93 diff --combined grml-debootstrap index d671de8,3e6ef66..581a74f --- a/grml-debootstrap +++ b/grml-debootstrap @@@ -8,25 -8,36 +8,25 @@@ # shellcheck disable=SC2001,SC2181 # error_handler {{{ -[ -n "$REPORT_TRAP_ERR" ] || REPORT_TRAP_ERR='no' -[ -n "$FAIL_TRAP_ERR" ] || FAIL_TRAP_ERR='no' - error_handler() { last_exit_code="$?" last_bash_command="$BASH_COMMAND" - if [ "$REPORT_TRAP_ERR" = "yes" ]; then - echo "Unexpected non-zero exit code $last_exit_code in ${BASH_SOURCE[*]} at line ${BASH_LINENO[*]} detected! + echo "Unexpected non-zero exit code $last_exit_code in ${BASH_SOURCE[*]} at line ${BASH_LINENO[*]} detected! last bash command: $last_bash_command" - fi - if [ ! "$FAIL_TRAP_ERR" = "yes" ]; then - return - fi ## Check if "bailout" function is available. ## This is not the case in chroot-script. if command -v bailout >/dev/null 2>&1; then bailout 1 else - echo 'FAIL_TRAP_ERR is set to "yes", exit 1.' exit 1 fi } -if [ "$REPORT_TRAP_ERR" = "yes" ] || [ "$FAIL_TRAP_ERR" = "yes" ]; then - set -e - set -E - set -o pipefail - trap "error_handler" ERR - export -f "error_handler" -fi +set -e +set -E +set -o pipefail +trap "error_handler" ERR +export -f "error_handler" # }}} # variables {{{ @@@ -244,22 -255,20 +244,22 @@@ check4progs() # helper functions {{{ cleanup() { if [ -n "$CHROOT_VARIABLES" ] ; then - einfo "Removing ${CHROOT_VARIABLES}" ; rm "$CHROOT_VARIABLES" ; eend $? + einfo "Removing ${CHROOT_VARIABLES}" ; rm "$CHROOT_VARIABLES" || eend $? fi if [ -n "$STAGES" ] ; then - einfo "Removing ${STAGES}" ; rmdir "$STAGES" ; eend $? + einfo "Removing ${STAGES}" ; rmdir "$STAGES" || eend $? fi - if [ -n "$ARM_EFI_TARGET" ]; then - umount "${MNTPOINT}/boot/efi" >/dev/null 2>&1 + if findmnt "${MNTPOINT}"/boot/efi &>/dev/null ; then + umount "${MNTPOINT}"/boot/efi fi # Remove temporary mountpoint again if echo "$MNTPOINT" | grep -q '/mnt/debootstrap\.' ; then - rmdir "$MNTPOINT" 2>/dev/null + if [ -d "$MNTPOINT" ] ; then + rmdir "$MNTPOINT" || true + fi fi # make sure $TARGET is not mounted when exiting grml-debootstrap @@@ -272,24 -281,25 +272,24 @@@ fi done - [ -x "$MNTPOINT"/bin/umount ] && chroot "$MNTPOINT" umount -a >/dev/null 2>&1 + [ -x "$MNTPOINT"/bin/umount ] && chroot "$MNTPOINT" umount -a >/dev/null 2>&1 || true # 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 /run/udev /sys /proc /proc /dev/pts /dev/pts /dev /dev ; do - [ -x "$MNTPOINT"/bin/umount ] && chroot "$MNTPOINT" umount $ARG >/dev/null 2>&1 - umount "$MNTPOINT"/$ARG >/dev/null 2>&1 + [ -x "$MNTPOINT"/bin/umount ] && chroot "$MNTPOINT" umount $ARG >/dev/null 2>&1 || true + umount "$MNTPOINT"/$ARG >/dev/null 2>&1 || true done if [ -n "$ISODIR" ] ; then - [ -d "$MNTPOINT/$ISODIR" ] && umount "$MNTPOINT/$ISODIR" >/dev/null 2>&1 + [ -d "$MNTPOINT/$ISODIR" ] && umount "$MNTPOINT/$ISODIR" >/dev/null 2>&1 || true fi if [ -n "$DIRECTORY" ] ; then einfo "Not unmounting $MNTPOINT as you requested me to install into a directory of your own choice." else einfo "Unmounting $MNTPOINT" - umount "$MNTPOINT" - eend $? + umount "$MNTPOINT" || eend $? fi if [ -n "$STAGES" ] ; then @@@ -299,28 -309,27 +299,28 @@@ # 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 $? + if [ -d "$MNTPOINT" ] ; then + einfo "Removing directory ${MNTPOINT}" + rmdir "$MNTPOINT" || eend $? + fi fi fi fi if [ -n "${ORIG_TARGET}" ] ; then einfo "Removing loopback mount of file ${ORIG_TARGET}." - kpartx -d "${ORIG_TARGET}" + kpartx -d "${ORIG_TARGET}" || eend $? # Workaround for a bug in kpartx which doesn't clean up properly, # see Debian Bug #891077 and Github-PR grml/grml-debootstrap#112 if dmsetup ls | grep -q "^${LOOP_PART} "; then - kpartx -d "/dev/${LOOP_DISK}" >/dev/null + kpartx -d "/dev/${LOOP_DISK}" >/dev/null || eend $? fi - eend $? fi } # we want to exit smoothly and clean: bailout(){ + eend "$1" || true cleanup @@@ -346,7 -355,6 +346,7 @@@ stage() # source main configuration file {{{ if [ -r /etc/debootstrap/config ] ; then + bash -n /etc/debootstrap/config # shellcheck disable=SC1091 . /etc/debootstrap/config fi @@@ -355,10 -363,11 +355,10 @@@ # cmdline handling {{{ CMDLINE_OPTS=mirror:,iso:,release:,target:,mntpoint:,debopt:,defaultinterfaces,interactive,nodebootstrap,nointerfaces,nokernel,nopackages,filesystem:,config:,confdir:,packages:,chroot-scripts:,scripts:,post-scripts:,pre-scripts:,debconf:,vm,vmfile,vmsize:,vmefi,keep_src_list,hostname:,password:,nopassword,grmlrepos,backportrepos,bootappend:,grub:,efi:,arch:,insecure,verbose,help,version,force,debug,contrib,non-free,remove-configs,sshcopyid,sshcopyauth -_opt_temp=$(getopt --name grml-debootstrap -o +m:i:r:t:p:c:d:vhV --long \ - $CMDLINE_OPTS -- "$@") - -if [ $? != 0 ]; then - eerror "Try 'grml-debootstrap --help' for more information."; eend 1; exit 1 +if ! _opt_temp=$(getopt --name grml-debootstrap -o +m:i:r:t:p:c:d:vhV --long \ + $CMDLINE_OPTS -- "$@"); then + eerror "Try 'grml-debootstrap --help' for more information." + bailout 1 fi eval set -- "$_opt_temp" @@@ -537,11 -546,11 +537,11 @@@ don CONFFILES=$_opt_confdir einfo "Using config files under $CONFFILES/." if ! [ -r "$CONFFILES/config" ] ; then - eerror "Error: config file $CONFFILES/config not found."; eend 1; bailout 1 + eerror "Error: config file $CONFFILES/config not found."; bailout 1 fi # shellcheck disable=SC1091 source=config if ! . "$CONFFILES/config" ; then - eerror "Error reading config file $CONFFILES/config" ; eend 1 ; bailout 1 + eerror "Error reading config file $CONFFILES/config" ; bailout 1 fi # restore the command line parameter value CONFFILES=$_opt_confdir @@@ -610,17 -619,20 +610,17 @@@ f if [ "$_opt_grub" ] && [ "$_opt_vmfile" ] ; then eerror "The --grub option is incompatible with --vmfile, please drop it from your command line." eerror "The --grub option is unneeded as GRUB will be installed automatically (unless GRUB_INSTALL='no')." - eend 1 bailout 1 fi if [ "${_opt_sshcopyid}" ] && [ "${_opt_sshcopyauth}" ] ; then eerror "The --sshcopyid option is incompatible with --sshcopyauth, please drop either of them from your command line." - eend 1 bailout 1 fi if [ -n "$ISO" ] && [[ "$DEBOOTSTRAP" =~ mmdebstrap$ ]] ; then eerror "The ISO option is incompatible with usage of mmdebstrap for bootstrapping." eerror "Either drop the --iso ... option or use plain debootstrap instead." - eend 1 bailout 1 fi @@@ -658,10 -670,9 +658,10 @@@ f # source specified configuration file {{{ if [ -n "$CONFIGFILE" ] ; then einfo "Reading specified config file $CONFIGFILE." + bash -n "$CONFIGFILE" # shellcheck disable=SC1091 source=config if ! . "$CONFIGFILE" ; then - eerror "Error reading config file $CONFIGFILE" ; eend 1 ; bailout 1 + eerror "Error reading config file $CONFIGFILE" ; bailout 1 fi fi # }}} @@@ -671,12 -682,14 +671,12 @@@ if [ -n "$GROOT" ] ; the eerror "Error: you seem to have \$GROOT configured." eerror "This variable is no longer supported, please visit the" eerror "grml-debootstrap documentation for details." - eend 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 bailout 1 fi # }}} @@@ -701,7 -714,8 +701,7 @@@ prompt_for_target( dialog --title "$PN" --trim \ --msgbox "Sorry, no partitions found. Please configure your harddisks (see /proc/partitions) using a tool like fdisk, - cfdisk, gpart, gparted,..." 0 0 - bailout 1 + cfdisk, gpart, gparted,..." 0 0 || bailout 1 fi PARTITION_LIST=$(for i in $AVAILABLE_PARTITIONS ; do @@@ -714,7 -728,8 +714,7 @@@ # shellcheck disable=SC2086 TARGET=$(dialog --title "$PN" --single-quoted --stdout \ --menu "Please select the target partition:" 0 0 0 \ - $PARTITION_LIST) - [ $? -eq 0 ] || bailout 1 + $PARTITION_LIST) || bailout 1 } # }}} @@@ -762,7 -777,8 +762,7 @@@ prompt_for_bootmanager( --menu "Where do you want to install the bootmanager grub?" 0 0 0 \ mbr "install bootmanager into $MBRPART" \ nowhere "do not install bootmanager at all" \ - ${ADDITIONAL_PARAMS}) - [ $? -eq 0 ] || bailout 3 + ${ADDITIONAL_PARAMS}) || bailout 3 IFS="$OIFS" case "$GETMBR" in @@@ -797,8 -813,8 +797,8 @@@ prompt_for_release( buster Debian/10 \ bullseye Debian/11 \ bookworm Debian/12 \ - sid Debian/unstable)" - [ $? -eq 0 ] || bailout + sid Debian/unstable)" \ + || bailout } # }}} @@@ -807,7 -823,8 +807,7 @@@ 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 + 0 0 "$HOSTNAME")" || bailout } # }}} @@@ -823,11 -840,13 +823,11 @@@ prompt_for_password( 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 + "Please enter the password for the root account:" 10 60) || bailout ROOTPW2=$(dialog --insecure --stdout --title "${PN}" --passwordbox \ "Please enter the password for the root account again for \ - confirmation:" 10 60) - [ $? -eq 0 ] || bailout + confirmation:" 10 60) || bailout if [ "$ROOTPW1" != "$ROOTPW2" ]; then dialog --stdout --title "${PN}" --ok-label \ @@@ -848,18 -867,20 +848,18 @@@ 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://deb.debian.org/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 + 0 0 $MIRROR)" || 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 + 0 0 $ISO)" || bailout fi } # }}} @@@ -882,7 -903,8 +882,7 @@@ TARGET=$(dialog --stdout --title "$PN" --menu "Which device do you want to use for ${RAIDLEVEL}? Notice: activated devices will not be listed for security reasons. Anyway, please make sure the selected device is not in use already!" 0 0 0 \ -$MD_LIST) -[ $? -eq 0 ] || bailout 20 +$MD_LIST) || bailout 20 AVAILABLE_PARTITIONS=$(LANG=C fdisk -l 2>/dev/null | \ sed 's/*//' | \ @@@ -896,8 -918,8 +896,8 @@@ PARTITION_LIST=$(for i in $AVAILABLE_PA # shellcheck disable=SC2086 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 + $PARTITION_LIST 2>"$TMPFILE" || bailout + SELECTED_PARTITIONS="$(cat "$TMPFILE")" NUM_PARTITIONS=0 @@@ -971,6 -993,7 +971,6 @@@ format_efi_partition() RC=$? if [ ! $RC -eq 0 ] ; then eerror "Error while creating filesystem on ${EFI}." - eend 1 bailout 1 fi fi @@@ -1052,7 -1075,8 +1052,7 @@@ elif [ -n "$INTERACTIVE" ] ; the Is this ok for you? Notice: selecting 'No' will exit ${PN}." dialog --title "$PN" --no-collapse \ - --yesno "$INFOTEXT" 0 0 - [ $? -eq 0 ] || bailout 0 + --yesno "$INFOTEXT" 0 0 || bailout 0 else # if not running automatic installation display configuration and prompt for execution: einfo "$PN [${VERSION}] - Please recheck configuration before execution:" @@@ -1099,7 -1123,7 +1099,7 @@@ einfon "Is this ok for you? [y/N] " read -r a if ! [ "$a" = 'y' ] || [ "$a" = 'Y' ] ; then - eerror "Exiting as requested." ; eend 1 + eerror "Exiting as requested." bailout 1 fi fi @@@ -1149,7 -1173,7 +1149,7 @@@ f if [ -z "${ARCH:-}" ] ; then eerror 'Architecture neither set (environment variable ARCH), nor could be automatically identified (using dpkg).' - eerror 'Consider setting the --arch ... option.' ; eend 1 + eerror 'Consider setting the --arch ... option.' bailout 1 fi # }}} @@@ -1158,7 -1182,7 +1158,7 @@@ CURRENT_ARCH="$(uname -m)" if [ "$CURRENT_ARCH" != "x86_64" ] ; then if [ "$ARCH" = "amd64" ] ; then - eerror "It is not possible to build amd64 on $CURRENT_ARCH. Consider installing and booting the 'linux-image-amd64' kernel or using '--arch i386' instead." ; eend 1 + eerror "It is not possible to build amd64 on $CURRENT_ARCH. Consider installing and booting the 'linux-image-amd64' kernel or using '--arch i386' instead." bailout 1 fi fi @@@ -1167,7 -1191,7 +1167,7 @@@ # Support for generic release codenames is unavailable. {{{ if [ "$RELEASE" = "stable" ] || [ "$RELEASE" = "testing" ] ; then eerror "Generic release codenames (stable, testing) are unsupported. \ -Please use specific codenames such as bullseye or bookworm." ; eend 1 +Please use specific codenames such as bullseye or bookworm." bailout 1 fi # }}} @@@ -1179,7 -1203,7 +1179,7 @@@ if [ -n "$TARGET" ] ; the SHORT_TARGET="${TARGET##*/}" else eerror "Please adjust $CONFFILES/config or..." - eerror "... use the interactive version for configuration before running ${0}" ; eend 1 + eerror "... use the interactive version for configuration before running ${0}" bailout 1 fi # }}} @@@ -1193,7 -1217,7 +1193,7 @@@ f if [ -r "$STAGES"/grml-debootstrap ] ; then if grep -q 'done' "${STAGES}/grml-debootstrap" ; then eerror "Error: grml-debootstrap has been executed already, won't continue therefore." - eerror "If you want to re-execute grml-debootstrap just manually remove ${STAGES}" ; eend 1 + eerror "If you want to re-execute grml-debootstrap just manually remove ${STAGES}" fi fi # }}} @@@ -1221,7 -1245,7 +1221,7 @@@ els # $TARGET was not detected as block device, but we do not want to create target directory in /dev/ if [[ $TARGET == "/dev/"* ]]; then eerror "Error: Will not create target directory $TARGET in /dev." - eerror " Please check the partition(s) of the blockdevice."; eend 1 + eerror " Please check the partition(s) of the blockdevice." bailout 1 fi set_target_directory @@@ -1256,7 -1280,7 +1256,7 @@@ mkfs() fi if grep -q "$TARGET" /proc/mounts ; then - eerror "$TARGET already mounted, exiting to avoid possible damage. (Manually unmount $TARGET)" ; eend 1 + eerror "$TARGET already mounted, exiting to avoid possible damage. (Manually unmount $TARGET)" bailout 1 fi @@@ -1310,6 -1334,8 +1310,6 @@@ if [ -n "${ARM_EFI_TARGET}" ] ; then einfo "Running mkfs.fat $MKFS_OPTS on $ARM_EFI_TARGET" mkfs.fat -n "EFI" "$ARM_EFI_TARGET" - eend $? - MKFS_OPTS="$MKFS_OPTS -L LINUX" fi @@@ -1320,16 -1346,19 +1320,16 @@@ if [ "$FIXED_DISK_IDENTIFIERS" = "yes" ] ; then if ! echo "$MKFS" | grep -q "mkfs.ext" ; then eerror "Not changing disk uuid for $TARGET because $MKFS doesn't seem to match for ext{2,3,4} file system" - eend 1 bailout 1 else einfo "Changing disk uuid for $TARGET to fixed (non-random) value $DISK_IDENTIFIER using tune2fs" tune2fs "$TARGET" -U "$DISK_IDENTIFIER" /dev/null 2>&1; then - eerror "Error finding usable loop device" ; eend 1 + eerror "Error finding usable loop device" bailout 1 fi # if dm-mod isn't available then kpartx will fail with # "Is device-mapper driver missing from kernel? [...]" - modprobe -q dm-mod + modprobe dm-mod || true if ! grep -q 'device-mapper' /proc/misc >/dev/null 2>&1 ; then - eerror "Device-mapper support missing in kernel." ; eend 1 + eerror "Device-mapper support missing in kernel." bailout 1 fi @@@ -1483,7 -1517,7 +1483,7 @@@ if [ "$ARCH" = 'arm64' ]; then einfo "Setting up GPT partitions for arm64" parted -s "${TARGET}" 'mklabel gpt' - parted -s "${TARGET}" 'mkpart EFI fat32 1MiB 10MiB' + parted -s "${TARGET}" 'mkpart ESP fat32 1MiB 10MiB' parted -s "${TARGET}" 'set 1 boot on' parted -s "${TARGET}" 'mkpart LINUX ext4 10MiB 100%' else @@@ -1494,6 -1528,7 +1494,6 @@@ dd if="${TARGET}" of="${MBRTMPFILE}" bs=512 count=1 echo -en "\\x41\\x41\\x41\\x41" | dd of="${MBRTMPFILE}" conv=notrunc seek=440 bs=1 dd if="${MBRTMPFILE}" of="${TARGET}" conv=notrunc - eend $? fi parted -s "${TARGET}" 'mkpart primary ext4 4MiB 100%' parted -s "${TARGET}" 'set 1 boot on' @@@ -1502,7 -1537,7 +1502,7 @@@ DEVINFO=$(kpartx -asv "$TARGET") # e.g. 'add map loop0p1 (254:5): 0 20477 linear 7:0 3' - will be multi-line for arm64 if [ -z "${DEVINFO}" ] ; then - eerror "Error setting up loopback device." ; eend 1 + eerror "Error setting up loopback device." bailout 1 fi @@@ -1526,7 -1561,7 +1526,7 @@@ export TARGET="/dev/mapper/$LOOP_PART" # '/dev/mapper/loop0p1' if [ -z "$TARGET" ] ; then - eerror "Error: target could not be set to according /dev/mapper/* device." ; eend 1 + eerror "Error: target could not be set to according /dev/mapper/* device." bailout 1 fi } @@@ -1543,14 -1578,14 +1543,14 @@@ grub_install() fi if ! mount "${TARGET}" "${MNTPOINT}" ; then - eerror "Error: Mounting ${TARGET} failed, can not continue." ; eend 1 + eerror "Error: Mounting ${TARGET} failed, can not continue." bailout 1 fi if [ -n "${ARM_EFI_TARGET}" ]; then - mkdir -p "${MNTPOINT}/boot/efi" - if ! mount "${ARM_EFI_TARGET}" "${MNTPOINT}/boot/efi" ; then - eerror "Error: Mounting ${ARM_EFI_TARGET} failed, can not continue." ; eend 1 + mkdir -p "${MNTPOINT}"/boot/efi + if ! mount "${ARM_EFI_TARGET}" "${MNTPOINT}"/boot/efi ; then + eerror "Error: Mounting ${ARM_EFI_TARGET} failed, can not continue." bailout 1 fi fi @@@ -1577,7 -1612,7 +1577,7 @@@ 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 + eerror "Error: grub not installed inside Virtual Machine. Can not install bootloader." bailout 1 fi cp -a "${MNTPOINT}"/usr/lib/grub/i386-pc "${MNTPOINT}/boot/grub/" @@@ -1643,6 -1678,7 +1643,6 @@@ einfo "Setting up bind-mount /run/udev" mkdir -p "${MNTPOINT}"/run/udev mount --bind /run/udev "${MNTPOINT}"/run/udev - eend $? fi if [ -n "${BOOT_APPEND}" ] ; then @@@ -1675,6 -1711,7 +1675,6 @@@ if mountpoint "${MNTPOINT}"/run/udev &>/dev/null ; then einfo "Unmounting bind-mount /run/udev" umount "${MNTPOINT}"/run/udev - eend $? fi umount "${MNTPOINT}"/proc @@@ -1682,7 -1719,7 +1682,7 @@@ umount "${MNTPOINT}"/dev/pts try_umount 3 "${MNTPOINT}"/dev - if [ -n "$VMEFI" ]; then + if findmnt "${MNTPOINT}"/boot/efi &>/dev/null ; then umount "${MNTPOINT}"/boot/efi fi @@@ -1695,8 -1732,8 +1695,8 @@@ umount_target() return 0 fi - if [ -n "${ARM_EFI_TARGET}" ]; then - umount "${MNTPOINT}/boot/efi" + if findmnt "${MNTPOINT}"/boot/efi &>/dev/null ; then + umount "${MNTPOINT}"/boot/efi fi umount "${MNTPOINT}" @@@ -1913,18 -1950,25 +1913,18 @@@ iface ${interface} inet dhc einfo "Installing default /etc/network/interfaces as requested via --defaultinterfaces options." mkdir -p "${MNTPOINT}/etc/network" echo "$DEFAULT_INTERFACES" > "${MNTPOINT}/etc/network/interfaces" - # shellcheck disable=SC2320 - eend $? elif [ -n "$VIRTUAL" ] ; then einfo "Setting up Virtual Machine, installing default /etc/network/interfaces" mkdir -p "${MNTPOINT}/etc/network" echo "$DEFAULT_INTERFACES" > "${MNTPOINT}/etc/network/interfaces" - # shellcheck disable=SC2320 - eend $? elif [ -r /etc/network/interfaces ] ; then einfo "Copying /etc/network/interfaces from host to target system" mkdir -p "${MNTPOINT}/etc/network" cp $VERBOSE /etc/network/interfaces "${MNTPOINT}/etc/network/interfaces" - eend $? else ewarn "Couldn't read /etc/network/interfaces, installing default /etc/network/interfaces" mkdir -p "${MNTPOINT}/etc/network" echo "$DEFAULT_INTERFACES" > "${MNTPOINT}/etc/network/interfaces" - # shellcheck disable=SC2320 - eend $? fi # install config file providing some example entries @@@ -1942,6 -1986,7 +1942,6 @@@ chmod 0700 "${MNTPOINT}"/root/.ssh if ! ssh-add -L >> "${MNTPOINT}"/root/.ssh/authorized_keys ; then eerror "Error: executing 'ssh-add -L' failed." - eend 1 bailout 1 fi elif [ -f "$AUTHORIZED_KEYS_SOURCE" ]; then @@@ -1950,10 -1995,12 +1950,10 @@@ chmod 0700 "$AUTHORIZED_KEYS_TARGET" if ! cp "$AUTHORIZED_KEYS_SOURCE" "$AUTHORIZED_KEYS_TARGET" ; then eerror "Error: copying '$AUTHORIZED_KEYS_SOURCE' to '$AUTHORIZED_KEYS_TARGET' failed" - eend 1 bailout 1 fi else eerror "Error: Could not open a connection to your authentication agent or the agent has no identities." - eend 1 bailout 1 fi fi @@@ -1963,6 -2010,7 +1963,6 @@@ if ! [ -f "${AUTHORIZED_KEYS_SOURCE}" ]; then eerror "Error: could not read '${AUTHORIZED_KEYS_SOURCE}' for setting up SSH key login." - eend 1 bailout 1 fi @@@ -1972,6 -2020,7 +1972,6 @@@ chmod 0700 "${AUTHORIZED_KEYS_TARGET}" if ! cp "${AUTHORIZED_KEYS_SOURCE}" "${AUTHORIZED_KEYS_TARGET}" ; then eerror "Error: copying '${AUTHORIZED_KEYS_SOURCE}' to '${AUTHORIZED_KEYS_TARGET}' failed." - eend 1 bailout 1 fi fi @@@ -1980,6 -2029,7 +1980,6 @@@ einfo "Setting up bind-mount /run/udev" mkdir -p "${MNTPOINT}"/run/udev mount --bind /run/udev "${MNTPOINT}"/run/udev - eend $? fi } # }}} @@@ -1997,7 -2047,7 +1997,7 @@@ execute_pre_scripts() for script in "${pre_scripts}"/* ; do if [ -x "$script" ] ; then einfo "Executing pre-script $script" - "$script" ; eend $? + "$script" fi done fi @@@ -2022,7 -2072,7 +2022,7 @@@ execute_post_scripts() for script in "${post_scripts}"/* ; do if [ -x "$script" ] ; then einfo "Executing post-script $script" - "$script" ; eend $? + "$script" fi done fi @@@ -2079,6 -2129,7 +2079,6 @@@ chrootscript() 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" fi @@@ -2097,6 -2148,7 +2097,6 @@@ umount_chroot() if grep -q "$ISODIR" /proc/mounts ; then einfo "Unmount $MNTPOINT/$ISODIR" umount "$MNTPOINT/$ISODIR" - eend $? fi fi @@@ -2104,11 -2156,13 +2104,11 @@@ if mountpoint "${MNTPOINT}"/run/udev &>/dev/null ; then einfo "Unmounting bind-mount /run/udev" umount "${MNTPOINT}"/run/udev - eend $? fi if [ -n "$PARTITION" ] ; then einfo "Unmount $MNTPOINT" umount "$MNTPOINT" - eend $? fi fi } @@@ -2125,6 -2179,7 +2125,6 @@@ fscktool() [ -n "$FSCKTOOL" ] || FSCKTOOL="fsck.${MKFS#mkfs.}" einfo "Checking filesystem on $TARGET using $FSCKTOOL" "$FSCKTOOL" "$TARGET" - eend $? fi } # }}} @@@ -2142,6 -2197,7 +2142,6 @@@ remove_configs() einfo "Removing configuration files from installed system as requested via --remove-configs / REMOVE_CONFIGS." rm -rf "${MNTPOINT}"/etc/debootstrap/ - eend $? } # }}} @@@ -2152,8 -2208,11 +2152,8 @@@ for i in format_efi_partition prepare_v remove_configs umount_chroot grub_install umount_target fscktool ; do if stage "${i}" ; then "$i" - if [ $? -eq 0 ]; then - stage "${i}" 'done' && rm -f "${STAGES}/${i}" - else - bailout 2 "$i" - fi + stage "${i}" 'done' + rm -f "${STAGES}/${i}" fi done