X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=grml-debootstrap;h=a87dbab67c702c12d8f24b8270ddb5e753056daf;hp=0637089fdc58751aaf0efbc0b6f6e99d4855642a;hb=6359370c21819973a396b6277bcf3f04b25aa565;hpb=e426be2b57c02a85774bc72462224e4fd0260421 diff --git a/grml-debootstrap b/grml-debootstrap index 0637089..a87dbab 100755 --- a/grml-debootstrap +++ b/grml-debootstrap @@ -2,7 +2,7 @@ # Filename: grml-debootstrap # Purpose: wrapper around debootstrap for installing plain Debian via Grml # Authors: grml-team (grml.org), (c) Michael Prokop -# Bug-Reports: see http://grml.org/bugs/ +# Bug-Reports: see https://grml.org/bugs/ # License: This file is licensed under the GPL v2+ ################################################################################ @@ -40,7 +40,7 @@ fi # variables {{{ PN="$(basename "$0")" -if [[ -d "$(dirname "$(which "$0")")"/.git ]]; then +if [[ -d "$(dirname "$(command -v "$0")")"/.git ]]; then VERSION="$(git describe | sed 's|^v||')" else VERSION="$(dpkg-query --show --showformat='${Version}' "$PN")" @@ -58,7 +58,7 @@ MNTPOINT="/mnt/debootstrap.$$" [ -n "$DEFAULT_LOCALES" ] || DEFAULT_LOCALES='en_US.UTF-8' [ -n "$DISK_IDENTIFIER" ] || DISK_IDENTIFIER='26ada0c0-1165-4098-884d-aafd2220c2c6' [ -n "$EXTRAPACKAGES" ] || EXTRAPACKAGES='yes' -[ -n "$FALLBACK_MIRROR" ] || FALLBACK_MIRROR='http://httpredir.debian.org/debian' +[ -n "$FALLBACK_MIRROR" ] || FALLBACK_MIRROR='http://deb.debian.org/debian' [ -n "$FIXED_DISK_IDENTIFIERS" ] || FIXED_DISK_IDENTIFIERS="no" [ -n "$FORCE" ] || FORCE='' [ -n "$HOSTNAME" ] || HOSTNAME='grml' @@ -72,7 +72,7 @@ MNTPOINT="/mnt/debootstrap.$$" [ -n "$POST_SCRIPTS" ] || POST_SCRIPTS='yes' [ -n "$PRE_SCRIPTS" ] || PRE_SCRIPTS='yes' [ -n "$RECONFIGURE" ] || RECONFIGURE='console-data' -[ -n "$RELEASE" ] || RELEASE='stretch' +[ -n "$RELEASE" ] || RELEASE='buster' [ -n "$RM_APTCACHE" ] || RM_APTCACHE='yes' [ -n "$SCRIPTS" ] || SCRIPTS='no' # deprecated, replaced by POST_SCRIPTS [ -n "$SECURE" ] || SECURE='yes' @@ -80,6 +80,7 @@ MNTPOINT="/mnt/debootstrap.$$" [ -n "$TUNE2FS" ] || TUNE2FS='tune2fs -c0 -i0' [ -n "$UPGRADE_SYSTEM" ] || UPGRADE_SYSTEM='yes' [ -n "$VMSIZE" ] || VMSIZE="2G" +[ -n "$GRUB_INSTALL" ] || GRUB_INSTALL='yes' # inside the chroot system locales might not be available, so use minimum: export LANG=C @@ -102,7 +103,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: stretch). + -r, --release Release of new Debian system (default: buster). -t, --target Target partition (/dev/...) or directory where the system should be installed to. -p, --mntpoint Mountpoint used for mounting the target system, @@ -154,6 +155,7 @@ Configuration options: --hostname Hostname of Debian system. --nopassword Do not prompt for the root password. --password Use specified password as password for user root. + --sshcopyid Use locally available public keys to authorise root login on the target system. --bootappend Add specified appendline to kernel whilst booting. --chroot-scripts Execute chroot scripts from specified directory. --pre-scripts Execute scripts from specified directory (before chroot-scripts). @@ -168,7 +170,7 @@ Other options: -V, --version Show summary of options and exit. Usage examples can be found in the grml-debootstrap manpage. -Send bugreports to the grml-team: bugs (at) grml.org || http://grml.org/bugs/ +Send bugreports to the grml-team: bugs (at) grml.org || https://grml.org/bugs/ " } @@ -186,7 +188,7 @@ WARN='' NORMAL='' einfo() { - einfon "$1\n" + einfon "$1\\n" return 0 } @@ -198,13 +200,13 @@ einfon() { } ewarn() { - printf " %s*%s $*\n" "${WARN}" "${NORMAL}" + printf " %s*%s $*\\n" "${WARN}" "${NORMAL}" return 0 } eerror() { [ "${RC_ENDCOL}" != "yes" ] && [ "${LAST_E_CMD}" = "ebegin" ] && echo - printf " %s*%s $*\n" "${BAD}" "${NORMAL}" >&2 + printf " %s*%s $*\\n" "${BAD}" "${NORMAL}" >&2 LAST_E_CMD=eerror return 0 } @@ -213,7 +215,7 @@ eend() { local retval="${1:-0}" shift if [ "$retval" -gt 0 ]; then - printf " %s-> Failed (rc=%s)%s\n" "${BAD}" "${retval}" "${NORMAL}" + printf " %s-> Failed (rc=%s)%s\\n" "${BAD}" "${retval}" "${NORMAL}" fi return "$retval" } @@ -227,7 +229,7 @@ check4root(){ check4progs(){ local RC='' for arg in "$@" ; do - which "$arg" >/dev/null 2>&1 || RC="$arg" + command -v "$arg" >/dev/null 2>&1 || RC="$arg" done if [ -n "$RC" ] ; then echo "$RC not installed" @@ -265,7 +267,7 @@ cleanup() { # 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/pts /dev/pts /dev /dev ; do + 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 done @@ -298,7 +300,13 @@ cleanup() { if [ -n "${ORIG_TARGET}" ] ; then einfo "Removing loopback mount of file ${ORIG_TARGET}." - kpartx -d "${ORIG_TARGET}" ; eend $? + kpartx -d "${ORIG_TARGET}" + # 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 + fi + eend $? fi } @@ -328,7 +336,7 @@ stage() { # }}} # make sure we have what we need {{{ -check4progs debootstrap || bailout 1 +check4progs "${DEBOOTSTRAP}" || bailout 1 # }}} # source main configuration file {{{ @@ -339,19 +347,177 @@ fi # }}} # cmdline handling {{{ -# source external command line parameter-processing script -self_dir="$(dirname "$(which "$0")")" -if [ -r "${self_dir}"/cmdlineopts.clp ] ; then - # shellcheck source=cmdlineopts.clp - . "${self_dir}"/cmdlineopts.clp -elif [ -r /usr/share/grml-debootstrap/functions/cmdlineopts.clp ] ; then - # shellcheck source=cmdlineopts.clp - . /usr/share/grml-debootstrap/functions/cmdlineopts.clp -else - eerror "Error: cmdline function file not found, exiting." - eend 1 - bailout 1 +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:,keep_src_list,hostname:,password:,nopassword,grmlrepos,backportrepos,bootappend:,grub:,efi:,arch:,insecure,verbose,help,version,force,debug,contrib,non-free,remove-configs,sshcopyid + +_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 fi +eval set -- "$_opt_temp" + +while :; do + case "$1" in + + # == Bootstrap options + --mirror|-m) # Mirror which should be used for apt-get/aptitude + shift; _opt_mirror="$1" + ;; + --iso|-i) # Mountpoint where a Debian ISO is mounted to + shift; _opt_iso="$1" + ;; + --release|-r) # Release of new Debian system + shift; _opt_release="$1" + ;; + --target|-t) # Target partition (/dev/...) or directory + shift; _opt_target="$1" + ;; + --vm) # Virtual machine image (no file) + _opt_vm="T" + ;; + --vmfile) # Virtual machine file + _opt_vmfile="T" + ;; + --vmsize) # size of Virtual machine file + shift; _opt_vmsize="$1" + ;; + --mntpoint|-p) # Mountpoint used for mounting the target system + shift; _opt_mntpoint="$1" + ;; + --debopt) # Extra parameters passed to the debootstrap command + shift; _opt_debopt="$1" + ;; + --filesystem) # Filesystem that should be used + shift; _opt_filesystem="$1" + ;; + --interactive) # Use interactive mode (frontend) + _opt_interactive=T + ;; + --nodebootstrap) # Skip debootstrap, only do configuration to the target + _opt_nodebootstrap=T + ;; + --nopackages) # Skip installation of packages defined in /etc/debootstrap/packages + _opt_nopackages=T + ;; + --arch) # Target architecutre + shift; _opt_arch="$1" + ;; + # just for backwards compatibility + --insecure) + _opt_insecure=T + ;; + # + + # == Configuration options + --config|-c) # Use specified configuration file, defaults to /etc/debootstrap + shift; _opt_config="$1" + ;; + --confdir|-d) # Place of config files for debootstrap, defaults to /etc/debootstrap + shift; _opt_confdir="$1" + ;; + --packages) # Install packages defined in specified file + shift; _opt_packages="$1" + _opt_packages_set=T + ;; + --debconf) # Pre-seed packages using specified file + shift; _opt_debconf="$1" + _opt_debconf_set=T + ;; + --pre-scripts) # Execute scripts from specified directory (before chroot-scripts). + shift; _opt_pre_scripts="$1" + _opt_pre_scripts_set=T + ;; + --scripts) # Execute scripts from specified directory [NOTE: deprecated, replaced via --post-scripts] + shift; _opt_scripts="$1" + _opt_scripts_set=T + ;; + --post-scripts) # Execute scripts from specified directory + shift; _opt_post_scripts="$1" + _opt_post_scripts_set=T + ;; + --chroot-scripts) # Execute chroot scripts from specified directory + shift; _opt_chroot_scripts="$1" + _opt_chroot_scripts_set=T + ;; + --keep_src_list) # Do not overwrite user provided apt sources.list + _opt_keep_src_list=T + ;; + --hostname) # Hostname of Debian system + shift; _opt_hostname="$1" + ;; + --password) # Use specified password as password for user root + shift; _opt_password="$1" + ;; + --defaultinterfaces) # Install default /etc/network/interfaces + _opt_defaultinterfaces=T + ;; + --nointerfaces) # Skip installation of /etc/network/interfaces + _opt_nointerfaces=T + ;; + --nokernel) # Skip installation of default kernel images + _opt_nokernel=T + ;; + --nopassword) # Skip password dialog + _opt_nopassword=T + ;; + --sshcopyid) # Use locally available public keys to authorise root login on the target system + _opt_sshcopyid=T + ;; + --grmlrepos) # Enable Grml repository + _opt_grmlrepos=T + ;; + --backportrepos) # Enable Debian backports repository + _opt_backportrepos=T + ;; + --bootappend) # Add specified appendline to kernel whilst booting + shift; _opt_bootappend="$1" + ;; + --grub) # Target for grub installation. Use grub syntax for specifying + shift; _opt_grub="$1" + ;; + --efi) # Target for EFI boot installation + shift; _opt_efi="$1" + ;; + --contrib) # Add 'contrib' to list of components + _opt_contrib=T + ;; + --non-free) # Add 'non-free' to list of components + _opt_non_free=T + ;; + --remove-configs) # Drop config files from installed system + _opt_remove_configs=T + ;; + + # == Other options + --verbose|-v) # Increase verbosity + if [ "$_opt_verbose" ]; then + _opt_verbose=$( _opt_verbose + 1 ) + else + _opt_verbose=1 + fi + ;; + --debug) # Execute in debug mode + _opt_debug=T + ;; + --help|-h) # Print usage information and exit + _opt_help=T + ;; + --version|-V) # Show version information and exit + _opt_version=T + ;; + --force) # Do not prompt for user input + _opt_force=T + ;; + --) + shift; break + ;; + *) + eerror "Internal getopt error!"; eend 1 ; exit 1 + ;; + esac + shift +done # == business-logic of command line parameter-processing @@ -398,6 +564,7 @@ fi [ "$_opt_defaultinterfaces" ] && USE_DEFAULT_INTERFACES="true" [ "$_opt_nointerfaces" ] && NOINTERFACES="true" [ "$_opt_nokernel" ] && NOKERNEL="true" +[ "$_opt_sshcopyid" ] && SSHCOPYID="true" [ "$_opt_bootappend" ] && BOOT_APPEND=$_opt_bootappend [ "$_opt_grub" ] && GRUB=$_opt_grub [ "$_opt_efi" ] && EFI=$_opt_efi @@ -426,6 +593,12 @@ if [ "$_opt_grub" ] && [ "$_opt_vmfile" ] ; then 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 if [ "$DEBUG" = "true" ] ; then set -x @@ -439,7 +612,7 @@ fi [ "$_opt_version" ] && { einfo "$PN - version $VERSION" - einfo "Send bug reports to bugs@grml.org or http://grml.org/bugs/" + einfo "Report bugs via https://github.com/grml/grml-debootstrap/ or https://grml.org/bugs/" eend 0 exit 0 } @@ -597,15 +770,17 @@ prompt_for_bootmanager() # ask for Debian release {{{ prompt_for_release() { - [ -n "$RELEASE" ] && DEFAULT_RELEASE="$RELEASE" || DEFAULT_RELEASE='stretch' + [ -n "$RELEASE" ] && DEFAULT_RELEASE="$RELEASE" || DEFAULT_RELEASE='buster' RELEASE="$(dialog --stdout --title "${PN}" --default-item $DEFAULT_RELEASE --menu \ "Please enter the Debian release you would like to use for installation:" \ - 0 50 5 \ + 0 50 8 \ lenny Debian/5.0 \ squeeze Debian/6.0 \ wheezy Debian/7.0 \ jessie Debian/8.0 \ stretch Debian/9.0 \ + buster Debian/10.0 \ + bullseye Debian/11.0 \ sid Debian/unstable)" [ $? -eq 0 ] || bailout } @@ -663,7 +838,7 @@ prompt_for_mirror() [ $? -eq 0 ] || bailout if [ "$CHOOSE_MIRROR" = 'net' ] ; then - [ -n "$MIRROR" ] || MIRROR='http://httpredir.debian.org/debian' + [ -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)" @@ -773,6 +948,7 @@ Do you want to stop now?" 0 0 2>/dev/null } # }}} +# format efi partition {{{ format_efi_partition() { if [ -z "$EFI" ] ; then return 0 @@ -798,6 +974,7 @@ format_efi_partition() { fi fi } +# }}} # check for EFI support or try to enable it {{{ efi_support() { @@ -972,7 +1149,7 @@ fi # 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 lenny, squeeze, wheezy, jessie or stretch." ; eend 1 +Please use specific codenames such as stretch or buster." ; eend 1 bailout 1 fi # }}} @@ -1023,6 +1200,12 @@ set_target_directory(){ if [ -b "$TARGET" ] || [ -n "$VIRTUAL" ] ; then PARTITION=1 else + # $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 + bailout 1 + fi set_target_directory fi # }}} @@ -1132,6 +1315,7 @@ mkfs() { } # }}} +# retrieve ID_FS_UUID {{{ identify_target_uuid() { local device="$1" @@ -1147,7 +1331,9 @@ identify_target_uuid() { return 1 fi } +# }}} +# identify TARGET_UUID {{{ mountpoint_to_blockdevice() { TARGET_UUID='' @@ -1172,6 +1358,7 @@ mountpoint_to_blockdevice() { fi done } +# }}} # modify filesystem settings {{{ tunefs() { @@ -1226,6 +1413,21 @@ prepare_vm() { bailout 1 fi + # make sure loop module is present and a usable loop device exists + modprobe -q loop + if ! losetup -f >/dev/null 2>&1; then + eerror "Error finding usable loop device" ; eend 1 + 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 + if ! grep -q 'device-mapper' /proc/misc >/dev/null 2>&1 ; then + eerror "Device-mapper support missing in kernel." ; eend 1 + bailout 1 + fi + ORIG_TARGET="$TARGET" # store for later reuse if [ -n "$VMFILE" ]; then @@ -1236,32 +1438,13 @@ prepare_vm() { einfo "Adjusting disk signature to a fixed (non-random) value" MBRTMPFILE=$(mktemp) dd if="${TARGET}" of="${MBRTMPFILE}" bs=512 count=1 - echo -en "\x41\x41\x41\x41" | dd of="${MBRTMPFILE}" conv=notrunc seek=440 bs=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 2M -1' parted -s "${TARGET}" 'set 1 boot on' - # 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 -asv "$TARGET") # e.g. 'add map loop0p1 (254:5): 0 20477 linear 7:0 3' if [ -z "${DEVINFO}" ] ; then eerror "Error setting up loopback device." ; eend 1 @@ -1271,6 +1454,7 @@ prepare_vm() { # hopefully this always works as expected LOOP_PART="${DEVINFO##add map }" # 'loop0p1 (254:5): 0 20477 linear 7:0 3' LOOP_PART="${LOOP_PART// */}" # 'loop0p1' + LOOP_DISK="${LOOP_PART%p*}" # 'loop0' export TARGET="/dev/mapper/$LOOP_PART" # '/dev/mapper/loop1p1' if [ -z "$TARGET" ] ; then @@ -1280,11 +1464,15 @@ prepare_vm() { } # }}} -# make VM image bootable and unmount it {{{ -finalize_vm() { +# make VM image bootable {{{ +grub_install() { if [ -z "${VIRTUAL}" ] ; then return 0 fi + if [ "${GRUB_INSTALL}" != "yes" ] ; then + einfo "Not installing GRUB as requested via \$GRUB_INSTALL=$GRUB_INSTALL" + return 0 + fi if ! mount "${TARGET}" "${MNTPOINT}" ; then eerror "Error: Mounting ${TARGET} failed, can not continue." ; eend 1 @@ -1298,7 +1486,7 @@ finalize_vm() { # Has chroot-script installed GRUB to MBR using grub-install (successfully), already? # chroot-script skips installation for unset ${GRUB} -if [[ -z "${GRUB}" ]] || ! dd if="${GRUB}" bs=512 count=1 2>/dev/null | cat -v | fgrep -q GRUB; then +if [[ -z "${GRUB}" ]] || ! dd if="${GRUB}" bs=512 count=1 2>/dev/null | cat -v | grep -Fq GRUB; then einfo "Installing Grub as bootloader." if ! chroot "${MNTPOINT}" dpkg --list grub-pc 2>/dev/null | grep -q '^ii' ; then @@ -1346,15 +1534,30 @@ fi ewarn "Please note that your system might NOT be able to properly boot." else einfo "Adjusting grub.cfg for successful boot sequence." - sed -i "s;root=[^ ]\+;root=UUID=$TARGET_UUID;" "${MNTPOINT}"/boot/grub/grub.cfg + sed -i "s;root=[^ ]\\+;root=UUID=$TARGET_UUID;" "${MNTPOINT}"/boot/grub/grub.cfg fi umount "${MNTPOINT}"/proc umount "${MNTPOINT}"/sys umount "${MNTPOINT}"/dev/pts try_umount 3 "${MNTPOINT}"/dev + +} +# }}} + +# unmount VM image {{{ +umount_target() { + if [ -z "${VIRTUAL}" ] ; then + return 0 + fi + umount "${MNTPOINT}" kpartx -d "${ORIG_TARGET}" >/dev/null + # 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 + fi } # }}} @@ -1493,7 +1696,7 @@ preparechroot() { cp $VERBOSE -a -L "${CONFFILES}"/extrapackages/ "${MNTPOINT}"/etc/debootstrap/ - # make sure we can access network [relevant for cdebootstrap] + # make sure we can access network [relevant for cdebootstrap/mmdebstrap] [ -f "${MNTPOINT}"/etc/resolv.conf ] || cp $VERBOSE /etc/resolv.conf "${MNTPOINT}"/etc/resolv.conf # setup default locales @@ -1525,6 +1728,16 @@ allow-hotplug eth0 iface eth0 inet dhcp " + # add dhcp setting for Predictable Network Interface Names + if [ -x /bin/udevadm ]; then + for interface in $(udevadm info -e | sed -n -e 's/E: ID_NET_NAME_PATH=\([^$*]\)/\1/p'); do + DEFAULT_INTERFACES="${DEFAULT_INTERFACES} +allow-hotplug ${interface} +iface ${interface} inet dhcp +" + done + fi + if [ -n "$NOINTERFACES" ] ; then einfo "Not installing /etc/network/interfaces as requested via --nointerfaces option" ; eend 0 elif [ -n "$USE_DEFAULT_INTERFACES" ] ; then @@ -1550,6 +1763,27 @@ iface eth0 inet dhcp cp /etc/network/interfaces.examples "$MNTPOINT/etc/network/interfaces.examples" fi + if [ -n "${SSHCOPYID}" ] ; then + ssh-add -L > /dev/null 2>&1 ; RC=$? + if [ $RC -eq 0 ] ; then + einfo "Use locally available public keys to authorise root login on the target system as requested via --sshcopyid option." + mkdir "${MNTPOINT}"/root/.ssh + chmod 0700 "${MNTPOINT}"/root/.ssh + ssh-add -L > "${MNTPOINT}"/root/.ssh/authorized_keys + eend 0 + else + ewarn "Could not open a connection to your authentication agent or the agent has no identites." + eend $? + fi + fi + + if [ -d /run/udev ] ; then + einfo "Setting up bind-mount /run/udev" + mkdir -p "${MNTPOINT}"/run/udev + mount --bind /run/udev "${MNTPOINT}"/run/udev + eend $? + fi + eend 0 } # }}} @@ -1599,6 +1833,7 @@ execute_post_scripts() { } # }}} +# unmount mountpoint {{{ try_umount() { local tries=$1 local mountpoint="$2" @@ -1618,6 +1853,7 @@ try_umount() { done return 1 # Tried enough } +# }}} # execute chroot-script {{{ chrootscript() { @@ -1672,6 +1908,12 @@ umount_chroot() { fi if grep -q "$MNTPOINT" /proc/mounts ; then + 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" @@ -1718,7 +1960,7 @@ remove_configs() { for i in format_efi_partition prepare_vm mkfs tunefs \ mount_target mountpoint_to_blockdevice debootstrap_system \ preparechroot execute_pre_scripts chrootscript execute_post_scripts \ - remove_configs umount_chroot finalize_vm fscktool ; do + remove_configs umount_chroot grub_install umount_target fscktool ; do if stage "${i}" ; then if "$i" ; then stage "${i}" 'done' && rm -f "${STAGES}/${i}"