# variables {{{
PN="$(basename "$0")"
if [[ -d "$(dirname "$(command -v "$0")")"/.git ]]; then
- VERSION="$(git describe | sed 's|^v||')"
+ VERSION="$(git --git-dir $(dirname "$(command -v "$0")")/.git describe | sed 's|^v||')"
else
VERSION="$(dpkg-query --show --showformat='${Version}' "$PN")"
fi
[ -n "$FORCE" ] || FORCE=''
[ -n "$HOSTNAME" ] || HOSTNAME='grml'
[ -n "$INITRD" ] || INITRD='yes'
+[ -n "$INITRD_GENERATOR" ] || INITRD_GENERATOR='initramfs-tools'
+[ -n "$INITRD_GENERATOR_OPTS" ] || INITRD_GENERATOR_OPTS=''
[ -n "$INSTALL_NOTES" ] || INSTALL_NOTES='/etc/debootstrap/install_notes'
[ -n "$LOCALES" ] || LOCALES='yes'
[ -n "$MIRROR" ] || MIRROR="$FALLBACK_MIRROR"
[ -n "$POST_SCRIPTS" ] || POST_SCRIPTS='yes'
[ -n "$PRE_SCRIPTS" ] || PRE_SCRIPTS='yes'
[ -n "$RECONFIGURE" ] || RECONFIGURE='console-data'
-[ -n "$RELEASE" ] || RELEASE='bullseye'
+[ -n "$RELEASE" ] || RELEASE='bookworm'
[ -n "$RM_APTCACHE" ] || RM_APTCACHE='yes'
[ -n "$SCRIPTS" ] || SCRIPTS='no' # deprecated, replaced by POST_SCRIPTS
[ -n "$SECURE" ] || SECURE='yes'
Example: --vmfile --target /mnt/sda1/qemu.img
--vmsize <size> Use specified size for size of VM file (default: 2G).
Syntax as supported by qemu-img, like: --vmsize 3G
+ --vmefi Create an EFI boot partition for the VM.
Configuration options:
--backportrepos Enable Debian's backports repository (backports.debian.org).
--keep_src_list Do not overwrite user provided apt sources.list.
--contrib Enable 'contrib' in COMPONENTS (defaults to 'main' only).
- --non-free Enable non-free in COMPONENTS (defaults to 'main' only).
+ --non-free Enable non-free / non-free-firmware in COMPONENTS (defaults to 'main' only).
--hostname <name> Hostname of Debian system.
--nopassword Do not prompt for the root password.
--password <pwd> Use specified password as password for user root.
fi
if [ -n "$DIRECTORY" ] ; then
- einfo "Not unmounting $MNTPOINT as you requested me to install into a directory of your own choice." ; eend 0
+ einfo "Not unmounting $MNTPOINT as you requested me to install into a directory of your own choice."
else
einfo "Unmounting $MNTPOINT"
umount "$MNTPOINT"
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
+ ewarn "Notice: stage $1 has been executed already, skipping execution therefore."
+ ewarn " To reexecute it clean up the according directory inside $STAGES"
return 1
fi
}
# }}}
# 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:,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
+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 -- "$@")
--vmsize) # size of Virtual machine file
shift; _opt_vmsize="$1"
;;
+ --vmefi) # Create an EFI boot partition for the VM
+ _opt_vmefi="T"
+ ;;
--mntpoint|-p) # Mountpoint used for mounting the target system
shift; _opt_mntpoint="$1"
;;
shift; _opt_debopt="$1"
;;
--filesystem) # Filesystem that should be used
- shift; _opt_filesystem="$1"
+ shift; _opt_filesystem="$1" ; FILESYSTEM="${_opt_filesystem}"
;;
--interactive) # Use interactive mode (frontend)
_opt_interactive=T
[ "$_opt_vm" ] && VIRTUAL=1
[ "$_opt_vmfile" ] && VMFILE=1 && VIRTUAL=1
[ "$_opt_vmsize" ] && VMSIZE=$_opt_vmsize
+[ "$_opt_vmefi" ] && VMEFI=1
[ "$_opt_mntpoint" ] && MNTPOINT=$_opt_mntpoint
[ "$_opt_debopt" ] && DEBOOTSTRAP_OPT=$_opt_debopt
[ "$_opt_interactive" ] && INTERACTIVE=1
# make sure main is always included
[ -z "$COMPONENTS" ] && COMPONENTS="main"
[ "$_opt_contrib" ] && COMPONENTS="$COMPONENTS contrib"
-[ "$_opt_non_free" ] && COMPONENTS="$COMPONENTS non-free"
+
+case "${RELEASE}" in
+ lenny|squeeze|wheezy|jessie|stretch|buster|bullseye)
+ [ "$_opt_non_free" ] && COMPONENTS="$COMPONENTS non-free"
+ ;;
+ *)
+ [ "$_opt_non_free" ] && COMPONENTS="$COMPONENTS non-free-firmware non-free"
+ ;;
+esac
# command line option checks
if [ "$_opt_scripts_set" ] ; then
fi
[ "$_opt_help" ] && {
- usage ; eend 0
- eend 0
+ usage
exit 0
}
[ "$_opt_version" ] && {
einfo "$PN - version $VERSION"
einfo "Report bugs via https://github.com/grml/grml-debootstrap/ or https://grml.org/bugs/"
- eend 0
exit 0
}
# }}}
RELEASE="$(dialog --stdout --title "${PN}" --default-item $DEFAULT_RELEASE --menu \
"Please enter the Debian release you would like to use for installation:" \
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 \
+ buster Debian/10 \
+ bullseye Debian/11 \
+ bookworm Debian/12 \
sid Debian/unstable)"
[ $? -eq 0 ] || bailout
}
fi
if fsck.vfat -bn "$EFI" >/dev/null; then
- einfo "EFI partition $EFI seems to have a FAT filesystem, not modifying." ; eend 0
+ einfo "EFI partition $EFI seems to have a FAT filesystem, not modifying."
else
einfo "EFI partition $EFI doesn't seem to be formatted, creating filesystem."
- mkfs.fat -F32 -n "EFI System Partition" "$EFI"
+ mkfs.fat -F32 -n "EFI" "$EFI"
RC=$?
- if [ $RC -eq 0 ] ; then
- eend 0
- else
+ if [ ! $RC -eq 0 ] ; then
eerror "Error while creating filesystem on ${EFI}."
eend 1
bailout 1
# check for EFI support or try to enable it {{{
efi_support() {
local efivars_loaded=false
+ # this is for kernels versions before v3.10, which didn't provide efivarfs yet
if modprobe efivars &>/dev/null ; then
efivars_loaded=true
fi
+ # kernel versions v3.10 and newer usually provide efivarfs
+ if modprobe efivarfs &>/dev/null ; then
+ efivars_loaded=true
+ fi
if [ -d /sys/firmware/efi ] ; then
- einfo "EFI support detected." ; eend 0
+ einfo "EFI support detected."
return 0
fi
if efi_support ; then
if [ -z "$_opt_efi" ] ; then
- ewarn "EFI support detected but no --efi option given, please consider enabling it." ; eend 0
+ ewarn "EFI support detected but no --efi option given, please consider enabling it."
fi
else
if [ -n "$_opt_efi" ] ; then
- eerror "EFI option used but no EFI support detected." ; eend 0
+ eerror "EFI option used but no EFI support detected."
bailout 1
fi
fi
if [ -n "$AUTOINSTALL" ] ; then
if checkforrun ; then
- eerror "Exiting as requested" ; eend 0
+ eerror "Exiting as requested"
bailout 1
fi
elif [ -n "$INTERACTIVE" ] ; then
if [ -n "$VIRTUAL" ] ; then
echo " Install grub: yes"
+ [ -n "$VMEFI" ] && echo " Install efi: yes" || echo " Install efi: no"
else
[ -n "$GRUB" ] && echo " Install grub: $GRUB" || echo " Install grub: no"
[ -n "$EFI" ] && echo " Install efi: $EFI" || echo " Install efi: no"
ARCHCMD="--arch $ARCH"
ARCHINFO=" (${ARCH})"
fi
+
+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
+ bailout 1
+fi
# }}}
# It is not possible to build amd64 on i686. {{{
# 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 buster or bullseye." ; eend 1
+Please use specific codenames such as bullseye or bookworm." ; eend 1
bailout 1
fi
# }}}
mkfs.ext*)
einfo "Enabling force option (-F) for mkfs.ext* tool as requested via --force switch."
MKFS_OPTS="$MKFS_OPTS -F"
- eend 0
-
;;
esac
fi
if [ -n "$e2fsprogs_version" ] && dpkg --compare-versions "$e2fsprogs_version" ge '1.43~WIP.2015.05.18-1' ; then
einfo "Disabling metadata_csum feature for $MKFS as $RELEASE doesn't support it."
MKFS_OPTS="$MKFS_OPTS -O ^metadata_csum"
- eend 0
+ fi
+ ;;
+ esac
+ fi
+
+ # starting with e2fsprogs v1.47.0 mkfs.ext4 enables the metadata_csum_seed feature
+ # by default, which requires Linux kernel >=4.4, e2fsprogs >=1.43, according GRUB etc.
+ # Disable this feature for Debian releases older than bookworm
+ if [ -n "$MKFS" ] && [ "$MKFS" = "mkfs.ext4" ] ; then
+ case "$RELEASE" in
+ lenny|squeeze|wheezy|jessie|stretch|buster|bullseye)
+ local e2fsprogs_version
+ # assume a more recent version if we can't identify the version via dpkg-query
+ e2fsprogs_version="$(dpkg-query --show --showformat='${Version}' e2fsprogs 2>/dev/null || echo 1.47)"
+ if [ -n "$e2fsprogs_version" ] && dpkg --compare-versions "$e2fsprogs_version" ge '1.43' ; then
+ einfo "Disabling metadata_csum_seed feature for $MKFS as $RELEASE doesn't support it."
+ MKFS_OPTS="$MKFS_OPTS -O ^metadata_csum_seed"
fi
;;
esac
bailout 1
else
einfo "Changing disk uuid for $TARGET to fixed (non-random) value $DISK_IDENTIFIER using tune2fs"
- tune2fs "$TARGET" -U "$DISK_IDENTIFIER"
+ tune2fs "$TARGET" -U "$DISK_IDENTIFIER" </dev/null
eend $?
fi
fi
+ if [ -n "$VIRTUAL" ] && [ -n "$EFI_TARGET" ]; then
+ einfo "Creating FAT filesystem on $EFI_TARGET"
+ mkfs.fat -F32 -n "EFI" "$EFI_TARGET"
+ eend $?
+ fi
+
# make sure /dev/disk/by-uuid/... is up2date, otherwise grub
# will fail to detect the uuid in the chroot
if [ -n "$VIRTUAL" ] ; then
tunefs() {
if [ -n "$TUNE2FS" ] && echo "$MKFS" | grep -q "mkfs.ext" ; then
einfo "Disabling automatic filesystem check on $TARGET via tune2fs"
- $TUNE2FS "$TARGET"
+ $TUNE2FS "$TARGET" </dev/null
eend $?
fi
}
einfo "Running grml-debootstrap on a directory, nothing to mount."
else
if grep -q "$TARGET" /proc/mounts ; then
- ewarn "$TARGET already mounted, continuing anyway." ; eend 0
+ ewarn "$TARGET already mounted, continuing anyway."
else
if ! [ -d "${MNTPOINT}" ] ; then
[ -n "$VIRTUAL" ] || mkdir -p "${MNTPOINT}"
if [ -n "$VMFILE" ]; then
qemu-img create -f raw "${TARGET}" "${VMSIZE}"
fi
- parted -s "${TARGET}" 'mklabel msdos'
- if [ "$FIXED_DISK_IDENTIFIERS" = "yes" ] ; then
- 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
- dd if="${MBRTMPFILE}" of="${TARGET}" conv=notrunc
- eend $?
+ if [ -n "$VMEFI" ]; then
+ parted -s "${TARGET}" 'mklabel gpt'
+ parted -s "${TARGET}" 'mkpart ESP fat32 1MiB 101MiB'
+ parted -s "${TARGET}" 'set 1 boot on'
+ parted -s "${TARGET}" 'mkpart bios_grub 101MiB 102MiB'
+ parted -s "${TARGET}" 'set 2 bios_grub on'
+ parted -s "${TARGET}" 'mkpart primary ext4 102MiB 100%'
+
+ else
+ parted -s "${TARGET}" 'mklabel msdos'
+ if [ "$FIXED_DISK_IDENTIFIERS" = "yes" ] ; then
+ 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
+ dd if="${MBRTMPFILE}" of="${TARGET}" conv=notrunc
+ eend $?
+ fi
+ parted -s "${TARGET}" 'mkpart primary ext4 4MiB 100%'
+ parted -s "${TARGET}" 'set 1 boot on'
fi
- parted -s "${TARGET}" 'mkpart primary ext4 2M -1'
- parted -s "${TARGET}" 'set 1 boot on'
DEVINFO=$(kpartx -asv "$TARGET") # e.g. 'add map loop0p1 (254:5): 0 20477 linear 7:0 3'
if [ -z "${DEVINFO}" ] ; then
# 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'
+ if [ -n "$VMEFI" ]; then
+ export EFI_TARGET="/dev/mapper/$LOOP_PART" # '/dev/mapper/loop0p1'
+ LOOP_PART="${LOOP_PART%p1}p3"
+ fi
LOOP_DISK="${LOOP_PART%p*}" # 'loop0'
export TARGET="/dev/mapper/$LOOP_PART" # '/dev/mapper/loop1p1'
if ! chroot "${MNTPOINT}" dpkg --list grub-pc 2>/dev/null | grep -q '^ii' ; then
echo "Notice: grub-pc package not present yet, installing it therefore."
# shellcheck disable=SC2086
- DEBIAN_FRONTEND=$DEBIAN_FRONTEND chroot "$MNTPOINT" apt-get -y install $DPKG_OPTIONS grub-pc
+ DEBIAN_FRONTEND=$DEBIAN_FRONTEND chroot "$MNTPOINT" apt-get -y --no-install-recommends install $DPKG_OPTIONS grub-pc
fi
mkdir -p "${MNTPOINT}/boot/grub"
cp -a "${MNTPOINT}"/usr/lib/grub/i386-pc "${MNTPOINT}/boot/grub/"
;;
esac
- dd if="${MNTPOINT}/usr/lib/grub/i386-pc/boot.img" of="${ORIG_TARGET}" conv=notrunc bs=440 count=1
- chroot "${MNTPOINT}" grub-mkimage -O i386-pc -p "(hd0,msdos1)/boot/grub" -o /tmp/core.img biosdisk part_msdos ext2
- dd if="${MNTPOINT}/tmp/core.img" of="${ORIG_TARGET}" conv=notrunc seek=1
- rm -f "${MNTPOINT}/tmp/core.img"
+
+ if [ -n "$VMEFI" ]; then
+
+ mkdir -p "${MNTPOINT}"/boot/efi
+ mount -t vfat "${EFI_TARGET}" "${MNTPOINT}"/boot/efi
+
+ if ! chroot "${MNTPOINT}" dpkg --list shim-signed 2>/dev/null | grep -q '^ii' ; then
+ echo "Notice: shim-signed package not present yet, installing it therefore."
+ # shellcheck disable=SC2086
+ DEBIAN_FRONTEND=$DEBIAN_FRONTEND chroot "$MNTPOINT" apt-get -y --no-install-recommends install $DPKG_OPTIONS shim-signed
+ fi
+
+ if [ "$(dpkg --print-architecture)" = "arm64" ]; then
+ if ! chroot "${MNTPOINT}" dpkg --list grub-efi-arm64-signed 2>/dev/null | grep -q '^ii' ; then
+ echo "Notice: grub-efi-arm64-signed package not present yet, installing it therefore."
+ # shellcheck disable=SC2086
+ DEBIAN_FRONTEND=$DEBIAN_FRONTEND chroot "$MNTPOINT" apt-get -y --no-install-recommends install $DPKG_OPTIONS grub-efi-arm64-bin grub-efi-arm64-signed
+ fi
+ chroot "$MNTPOINT" grub-install --target=arm64-efi --efi-directory=/boot/efi --uefi-secure-boot --removable "/dev/$LOOP_DISK"
+ elif [ "$(dpkg --print-architecture)" = "i386" ]; then
+ if ! chroot "${MNTPOINT}" dpkg --list grub-efi-ia32-signed 2>/dev/null | grep -q '^ii' ; then
+ echo "Notice: grub-efi-ia32-signed package not present yet, installing it therefore."
+ # shellcheck disable=SC2086
+ DEBIAN_FRONTEND=$DEBIAN_FRONTEND chroot "$MNTPOINT" apt-get -y --no-install-recommends install $DPKG_OPTIONS grub-efi-ia32-bin grub-efi-ia32-signed
+ fi
+ chroot "$MNTPOINT" grub-install --target=i386-efi --efi-directory=/boot/efi --uefi-secure-boot --removable "/dev/$LOOP_DISK"
+ chroot "$MNTPOINT" grub-install --target=i386-pc "/dev/$LOOP_DISK"
+ else
+ if ! chroot "${MNTPOINT}" dpkg --list grub-efi-amd64-signed 2>/dev/null | grep -q '^ii' ; then
+ echo "Notice: grub-efi-amd64-signed package not present yet, installing it therefore."
+ # shellcheck disable=SC2086
+ DEBIAN_FRONTEND=$DEBIAN_FRONTEND chroot "$MNTPOINT" apt-get -y --no-install-recommends install $DPKG_OPTIONS grub-efi-amd64-bin grub-efi-amd64-signed
+ fi
+ chroot "$MNTPOINT" grub-install --target=x86_64-efi --efi-directory=/boot/efi --uefi-secure-boot --removable "/dev/$LOOP_DISK"
+ chroot "$MNTPOINT" grub-install --target=i386-pc "/dev/$LOOP_DISK"
+ fi
+ else
+ dd if="${MNTPOINT}/usr/lib/grub/i386-pc/boot.img" of="${ORIG_TARGET}" conv=notrunc bs=440 count=1
+ case "${_opt_filesystem}" in
+ f2fs)
+ chroot "${MNTPOINT}" grub-mkimage -O i386-pc -p "(hd0,msdos1)/boot/grub" -o /tmp/core.img biosdisk part_msdos f2fs
+ ;;
+ xfs)
+ chroot "${MNTPOINT}" grub-mkimage -O i386-pc -p "(hd0,msdos1)/boot/grub" -o /tmp/core.img biosdisk part_msdos xfs
+ ;;
+ # NOTE - we might need to distinguish between further filesystems
+ *)
+ chroot "${MNTPOINT}" grub-mkimage -O i386-pc -p "(hd0,msdos1)/boot/grub" -o /tmp/core.img biosdisk part_msdos ext2
+ ;;
+ esac
+
+ dd if="${MNTPOINT}/tmp/core.img" of="${ORIG_TARGET}" conv=notrunc seek=1
+ rm -f "${MNTPOINT}/tmp/core.img"
+ fi
fi
# workaround for Debian bug #918590 with lvm + udev:
umount "${MNTPOINT}"/dev/pts
try_umount 3 "${MNTPOINT}"/dev
+ if [ -n "$VMEFI" ]; then
+ umount "${MNTPOINT}"/boot/efi
+ 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"
+ einfo "Executing: $DEBOOTSTRAP $ARCHCMD $DEBOOTSTRAP_OPT $RELEASE $MNTPOINT $ISO"
# shellcheck disable=SC2086
- "$DEBOOTSTRAP" $ARCHCMD $KEYRING $DEBOOTSTRAP_OPT "$RELEASE" "$MNTPOINT" "$ISO"
+ "$DEBOOTSTRAP" $ARCHCMD $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"
+ einfo "Executing: $DEBOOTSTRAP $ARCHCMD $DEBOOTSTRAP_OPT $RELEASE $MNTPOINT $MIRROR"
# shellcheck disable=SC2086
- "$DEBOOTSTRAP" $ARCHCMD $KEYRING $DEBOOTSTRAP_OPT "$RELEASE" "$MNTPOINT" "$MIRROR"
+ "$DEBOOTSTRAP" $ARCHCMD $DEBOOTSTRAP_OPT "$RELEASE" "$MNTPOINT" "$MIRROR"
RC=$?
fi
[ -n "$EXTRAPACKAGES" ] && echo "EXTRAPACKAGES='$(sed "s,','\\\\'',g" <<<"${EXTRAPACKAGES}")'" >> "$CHROOT_VARIABLES"
[ -n "$EFI" ] && echo "EFI='$(sed "s,','\\\\'',g" <<<"${EFI}")'" >> "$CHROOT_VARIABLES"
[ -n "$FALLBACK_MIRROR" ] && echo "FALLBACK_MIRROR='$(sed "s,','\\\\'',g" <<<"${FALLBACK_MIRROR}")'" >> "$CHROOT_VARIABLES"
+ [ -n "$FILESYSTEM" ] && echo "FILESYSTEM='$(sed "s,','\\\\'',g" <<<"${FILESYSTEM}")'" >> "$CHROOT_VARIABLES"
[ -n "$FORCE" ] && echo "FORCE='$(sed "s,','\\\\'',g" <<<"${FORCE}")'" >> "$CHROOT_VARIABLES"
[ -n "$GRMLREPOS" ] && echo "GRMLREPOS='$(sed "s,','\\\\'',g" <<<"${GRMLREPOS}")'" >> "$CHROOT_VARIABLES"
[ -n "$GRUB" ] && echo "GRUB='$(sed "s,','\\\\'',g" <<<"${GRUB}")'" >> "$CHROOT_VARIABLES"
[ -n "$HOSTNAME" ] && echo "HOSTNAME='$(sed "s,','\\\\'',g" <<<"${HOSTNAME}")'" >> "$CHROOT_VARIABLES"
[ -n "$INITRD" ] && echo "INITRD='$(sed "s,','\\\\'',g" <<<"${INITRD}")'" >> "$CHROOT_VARIABLES"
+ [ -n "$INITRD_GENERATOR" ] && echo "INITRD_GENERATOR='$(sed "s,','\\\\'',g" <<<"${INITRD_GENERATOR}")'" >> "$CHROOT_VARIABLES"
+ [ -n "$INITRD_GENERATOR_OPTS" ] && echo "INITRD_GENERATOR_OPTS='$(sed "s,','\\\\'',g" <<<"${INITRD_GENERATOR_OPTS}")'" >> "$CHROOT_VARIABLES"
[ -n "$INSTALL_NOTES" ] && echo "INSTALL_NOTES='$(sed "s,','\\\\'',g" <<<"${INSTALL_NOTES}")'" >> "$CHROOT_VARIABLES"
[ -n "$ISODIR" ] && echo "ISODIR='$(sed "s,','\\\\'',g" <<<"${ISO}")'" >> "$CHROOT_VARIABLES"
[ -n "$ISO" ] && echo "ISO='$(sed "s,','\\\\'',g" <<<"${ISO}")'" >> "$CHROOT_VARIABLES"
fi
if [ -n "$NOINTERFACES" ] ; then
- einfo "Not installing /etc/network/interfaces as requested via --nointerfaces option" ; eend 0
+ einfo "Not installing /etc/network/interfaces as requested via --nointerfaces option"
elif [ -n "$USE_DEFAULT_INTERFACES" ] ; then
einfo "Installing default /etc/network/interfaces as requested via --defaultinterfaces options."
mkdir -p "${MNTPOINT}/etc/network"
einfo "Use locally available public keys to authorise root login on the target system as requested via --sshcopyid option."
mkdir -p "${MNTPOINT}"/root/.ssh
chmod 0700 "${MNTPOINT}"/root/.ssh
- if ssh-add -L >> "${MNTPOINT}"/root/.ssh/authorized_keys ; then
- eend 0
- else
+ if ! ssh-add -L >> "${MNTPOINT}"/root/.ssh/authorized_keys ; then
eerror "Error: executing 'ssh-add -L' failed."
eend 1
bailout 1
einfo "copying '$AUTHORIZED_KEYS_SOURCE' to '$AUTHORIZED_KEYS_TARGET' as requested via --sshcopyid option."
mkdir -p "$AUTHORIZED_KEYS_TARGET"
chmod 0700 "$AUTHORIZED_KEYS_TARGET"
- if cp "$AUTHORIZED_KEYS_SOURCE" "$AUTHORIZED_KEYS_TARGET" ; then
- eend 0
- else
+ if ! cp "$AUTHORIZED_KEYS_SOURCE" "$AUTHORIZED_KEYS_TARGET" ; then
eerror "Error: copying '$AUTHORIZED_KEYS_SOURCE' to '$AUTHORIZED_KEYS_TARGET' failed"
eend 1
bailout 1
einfo "Copying '${AUTHORIZED_KEYS_SOURCE}' to '${AUTHORIZED_KEYS_TARGET}' as requested via --sshcopyauth option."
mkdir -p "${AUTHORIZED_KEYS_TARGET}"
chmod 0700 "${AUTHORIZED_KEYS_TARGET}"
- if cp "${AUTHORIZED_KEYS_SOURCE}" "${AUTHORIZED_KEYS_TARGET}" ; then
- eend 0
- else
+ if ! cp "${AUTHORIZED_KEYS_SOURCE}" "${AUTHORIZED_KEYS_TARGET}" ; then
eerror "Error: copying '${AUTHORIZED_KEYS_SOURCE}' to '${AUTHORIZED_KEYS_TARGET}' failed."
eend 1
bailout 1
mount --bind /run/udev "${MNTPOINT}"/run/udev
eend $?
fi
-
- eend 0
}
# }}}
eend $?
else
einfo "Keeping chroot-script as string GRML_CHROOT_SCRIPT_MARKER could not be found"
- eend 0
fi
}
# }}}
fi
if ! mountpoint "${MNTPOINT}" >/dev/null 2>&1 ; then
- ewarn "Target ${MNTPOINT} doesn't seem to be mounted, can't remove configuration files." ; eend 0
+ ewarn "Target ${MNTPOINT} doesn't seem to be mounted, can't remove configuration files."
return 0
fi
noeject noprompt reboot
fi
else
- einfo "Finished execution of ${PN}. Enjoy your Debian system." ; eend 0
+ einfo "Finished execution of ${PN}. Enjoy your Debian system."
fi
# }}}