X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=chroot-script;h=b0737ca77275963cb43a20d9db493619e3b7a84e;hp=d3535b0c76c24f445bedcf0601ed7e4dd6fb33bd;hb=HEAD;hpb=488643ab1a3e97a77bdb01f1070c8e83c6b346f9 diff --git a/chroot-script b/chroot-script index d3535b0..c356bc8 100755 --- a/chroot-script +++ b/chroot-script @@ -1,36 +1,49 @@ -#!/bin/sh +#!/bin/bash # Filename: /etc/debootstrap/chroot-script # Purpose: script executed in chroot when installing Debian via grml-debootstrap # 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. ################################################################################ # GRML_CHROOT_SCRIPT_MARKER - do not remove this line unless you want to keep # this script as /bin/chroot-script on your new installed system ################################################################################ +# shellcheck disable=SC2317 # shellcheck has trouble understanding the code flow in this file + +# error_handler {{{ +set -e +set -E +set -o pipefail +trap "error_handler" ERR +# }}} +bash -n /etc/debootstrap/config +# shellcheck source=config . /etc/debootstrap/config || exit 1 +bash -n /etc/debootstrap/variables +# shellcheck source=tests/shellcheck-stub-debootstrap-variables . /etc/debootstrap/variables || exit 1 [ -r /proc/1 ] || mount -t proc none /proc +[ -r /sys/kernel ] || mount -t sysfs none /sys # variable checks {{{ # use aptitude only if it's available if [ -x /usr/bin/aptitude ] ; then - APTUPDATE='aptitude update' + APTUPDATE="aptitude update $DPKG_OPTIONS" # Debian ISOs do not contain signed Release files if [ -n "$ISO" ] ; then APTINSTALL="aptitude -y --allow-untrusted --without-recommends install $DPKG_OPTIONS" - APTUPGRADE='aptitude -y --allow-untrusted safe-upgrade' + APTUPGRADE="aptitude -y --allow-untrusted safe-upgrade $DPKG_OPTIONS" else APTINSTALL="aptitude -y --without-recommends install $DPKG_OPTIONS" - APTUPGRADE='aptitude -y safe-upgrade' + APTUPGRADE="aptitude -y safe-upgrade $DPKG_OPTIONS" fi else - APTINSTALL="apt-get --force-yes -y --no-install-recommends install $DPKG_OPTIONS" - APTUPDATE='apt-get update' - APTUPGRADE='apt-get --force-yes -y upgrade' + APTINSTALL="apt-get -y --no-install-recommends install $DPKG_OPTIONS" + APTUPDATE="apt-get update $DPKG_OPTIONS" + APTUPGRADE="apt-get -y upgrade $DPKG_OPTIONS" fi if [ -z "$STAGES" ] ; then @@ -44,7 +57,7 @@ stage() { if [ -n "$2" ] ; then echo "$2" > "$STAGES/$1" return 0 - elif grep -q done "$STAGES/$1" 2>/dev/null ; then + elif grep -q 'done' "$STAGES/$1" 2>/dev/null ; then echo " [*] Notice: stage $1 has been executed already, skipping execution therefore.">&2 return 1 fi @@ -55,30 +68,33 @@ stage() { askpass() { # read -s emulation for dash. result is in $resp. set -o noglob - stty -echo - read resp - stty echo + [ -t 0 ] && stty -echo + read -r resp + [ -t 0 ] && stty echo set +o noglob } # }}} # define chroot mirror {{{ chrootmirror() { - if [ -n "$KEEP_SRC_LIST" ] ; then - echo "KEEP_SRC_LIST has been set, skipping chrootmirror stage." + if [ "$KEEP_SRC_LIST" = "yes" ] ; then + echo "KEEP_SRC_LIST has been enabled, skipping chrootmirror stage." return fi if [ -z "$COMPONENTS" ] ; then - COMPONENTS='main contrib non-free' + COMPONENTS='main' fi echo "Using repository components $COMPONENTS" if [ -n "$ISO" ] ; then echo "Adjusting sources.list for ISO (${ISO})." echo "deb $ISO $RELEASE $COMPONENTS" > /etc/apt/sources.list - echo "Adding mirror entry (${MIRROR}) to sources.list." - [ -n "$MIRROR" ] && echo "deb $MIRROR $RELEASE $COMPONENTS" >> /etc/apt/sources.list || true + + if [ -n "$MIRROR" ] ; then + echo "Adding mirror entry (${MIRROR}) to sources.list." + echo "deb $MIRROR $RELEASE $COMPONENTS" >> /etc/apt/sources.list + fi else if [ -n "$MIRROR" ] ; then echo "Adjusting sources.list for mirror (${MIRROR})." @@ -88,30 +104,36 @@ chrootmirror() { # add security.debian.org: case "$RELEASE" in - unstable|sid) ;; # no security pool available - *) + unstable|sid|stretch) ;; # no security pool available + jessie|buster) echo "Adding security.debian.org to sources.list." echo "deb http://security.debian.org ${RELEASE}/updates $COMPONENTS" >> /etc/apt/sources.list ;; + *) + # bullseye and newer releases use a different repository layout, see + # https://lists.debian.org/debian-devel-announce/2019/07/msg00004.html + echo "Adding security.debian.org/debian-security to sources.list." + echo "deb http://security.debian.org/debian-security ${RELEASE}-security $COMPONENTS" >> /etc/apt/sources.list + ;; esac } # }}} # remove local chroot mirror {{{ remove_chrootmirror() { - if [ -n "$KEEP_SRC_LIST" ] ; then - echo "KEEP_SRC_LIST has been set, skipping remove_chrootmirror stage." + if [ "$KEEP_SRC_LIST" = "yes" ] ; then + echo "KEEP_SRC_LIST has been enabled, skipping remove_chrootmirror stage." return fi if [ -n "$ISO" ] ; then echo "Removing ISO (${ISO}) from sources.list." - TMP_ISO=$(echo "$ISO" |sed 's#/#\\/#g') + TMP_ISO="${ISO//\//\\\/}" sed -i "/deb $TMP_ISO $RELEASE $COMPONENTS/ D" /etc/apt/sources.list else - if [ -n "$MIRROR" -a -n "$(echo $MIRROR|grep file:)" ] ; then + if [ -n "$MIRROR" ] && echo "$MIRROR" | grep -q 'file:' ; then echo "Removing local mirror (${MIRROR}) from sources.list." - TMP_MIRROR=$(echo "$MIRROR" |sed 's#/#\\/#g') + TMP_MIRROR="${MIRROR//\//\\\/}" sed -i "/deb $TMP_MIRROR $RELEASE $COMPONENTS/ D" /etc/apt/sources.list echo "Adding fallback mirror entry (${FALLBACK_MIRROR}) to sources.list instead." echo "deb $FALLBACK_MIRROR $RELEASE $COMPONENTS" >> /etc/apt/sources.list @@ -122,45 +144,58 @@ remove_chrootmirror() { # set up grml repository {{{ grmlrepos() { - if [ -n "$GRMLREPOS" ] ; then - # user might have provided their own apt sources.list - if ! grep -q grml /etc/apt/sources.list.d/grml.list 2>/dev/null ; then - cat >> /etc/apt/sources.list.d/grml.list << EOF + if [ -z "$GRMLREPOS" ] ; then + return 0 + fi + + # user might have provided their own apt sources configuration + if [ -r /etc/apt/sources.list.d/grml.list ] ; then + echo "File /etc/apt/sources.list.d/grml.list exists already, not modifying." + else + echo "Setting up /etc/apt/sources.list.d/grml.list." + cat > /etc/apt/sources.list.d/grml.list << EOF # grml: stable repository: - deb http://deb.grml.org/ grml-stable main - deb-src http://deb.grml.org/ grml-stable main + deb [signed-by=/usr/share/keyrings/grml-archive-keyring.gpg] http://deb.grml.org/ grml-stable main + deb-src [signed-by=/usr/share/keyrings/grml-archive-keyring.gpg] http://deb.grml.org/ grml-stable main # grml: testing/development repository: - deb http://deb.grml.org/ grml-testing main - deb-src http://deb.grml.org/ grml-testing main + deb [signed-by=/usr/share/keyrings/grml-archive-keyring.gpg] http://deb.grml.org/ grml-testing main + deb-src [signed-by=/usr/share/keyrings/grml-archive-keyring.gpg] http://deb.grml.org/ grml-testing main EOF - fi - - if apt-get update ; then - apt-get -y --allow-unauthenticated install grml-debian-keyring - apt-get update - else - # make sure we have the keys available for aptitude - gpg --keyserver subkeys.pgp.net --recv-keys F61E2E7CECDEA787 - gpg --export F61E2E7CECDEA787 | apt-key add - || true # not yet sure - # why it's necessary, sometimes we get an error even though it works [mika] - fi - - # make sure we install packages from Grml's pool only if not available - # from Debian! - if ! grep -q grml /etc/apt/preferences 2>/dev/null ; then - cat >> /etc/apt/preferences << EOF -// debian pool (default): -Package: * -Pin: release o=Debian -Pin-Priority: 996 + fi -// main grml-repository: + # make sure we install packages from Grml's pool only if not available from Debian + if [ -r /etc/apt/preferences.d/grml.pref ] ; then + echo "File /etc/apt/preferences.d/grml.pref exists already, not modifying." + else + echo "Setting up /etc/apt/preferences.d/grml.pref." + cat > /etc/apt/preferences.d/grml.pref << EOF +Explanation: use Grml repository only after Debian ones Package: * Pin: origin deb.grml.org -Pin-Priority: 991 +Pin-Priority: 100 +EOF + fi + + apt-get update -o Acquire::AllowInsecureRepositories=1 + apt-get -y --allow-unauthenticated install grml-debian-keyring + apt-get update + + if [ "$(dpkg-query -f "\${db:Status-Status} \${db:Status-Eflag}" -W grml-debian-keyring 2>/dev/null)" != 'installed ok' ]; then + echo "Error: installation of grml-debian-keyring failed." >&2 + exit 1 + fi +} +# }}} + +# feature to provide Debian backports repos {{{ +backportrepos() { + if [ -n "$BACKPORTREPOS" ] ; then + cat >> /etc/apt/sources.list.d/backports.list << EOF +# debian backports: ${RELEASE}-backports repository: +deb ${MIRROR} ${RELEASE}-backports main +deb-src ${MIRROR} ${RELEASE}-backports main EOF - fi fi } # }}} @@ -197,7 +232,7 @@ upgrade_system() { if [ "$UPGRADE_SYSTEM" = "yes" ] ; then echo "Running update + upgrade" $APTUPDATE - $APTUPGRADE + DEBIAN_FRONTEND=$DEBIAN_FRONTEND $APTUPGRADE else echo "Not running update + upgrade as \$UPDATE_AND_UPGRADE is not set to 'yes'." fi @@ -208,7 +243,8 @@ upgrade_system() { remove_apt_cache() { if [ "$RM_APTCACHE" = 'yes' ] ; then echo "Cleaning apt cache." - apt-get clean + # shellcheck disable=SC2086 + apt-get clean $DPKG_OPTIONS else echo "Not cleaning apt cache as \$RM_APTCACHE is unset." fi @@ -221,17 +257,25 @@ packages() { # as seen to prevent debconf from asking the question interactively. [ -f /etc/debootstrap/debconf-selections ] && { echo "Preseeding the debconf database, some lines might be skipped..." - cat /etc/debootstrap/debconf-selections | debconf-set-selections + debconf-set-selections < /etc/debootstrap/debconf-selections } if [ "$PACKAGES" = 'yes' ] ; then - if ! [ -r /etc/debootstrap/packages ] ; then - echo "Error: /etc/debootstrap/packages (inside chroot) not found, exiting." >&2 - exit 1 - else - $APTUPDATE - DEBIAN_FRONTEND=$DEBIAN_FRONTEND $APTINSTALL $(grep -v '^#' /etc/debootstrap/packages) $GRMLPACKAGES - fi + PACKAGES_FILE="/etc/debootstrap/packages" + + if [ "$ARCH" = 'arm64' ]; then + PACKAGES_FILE="/etc/debootstrap/packages-arm64" + fi + + if ! [ -r "${PACKAGES_FILE}" ] ; then + echo "Error: ${PACKAGES_FILE} (inside chroot) not found, exiting." >&2 + exit 1 + else + $APTUPDATE + + # shellcheck disable=SC2086,SC2046 + DEBIAN_FRONTEND=$DEBIAN_FRONTEND $APTINSTALL $(grep -v '^#' "${PACKAGES_FILE}") $GRMLPACKAGES + fi fi } # }}} @@ -241,6 +285,7 @@ extrapackages() { if [ "$EXTRAPACKAGES" = 'yes' ] ; then PACKAGELIST=$(find /etc/debootstrap/extrapackages -type f -name '*.deb') if [ -n "$PACKAGELIST" ]; then + # shellcheck disable=SC2086 dpkg -i $PACKAGELIST # run apt again to resolve any deps DEBIAN_FRONTEND=$DEBIAN_FRONTEND $APTINSTALL @@ -265,32 +310,61 @@ get_kernel_version() { return 0 fi - case $ARCH in - i386) KARCH=i686 ;; - amd64) KARCH=amd64 ;; + local KARCH + + # shellcheck disable=SC2153 + case "$ARCH" in + i386) + KARCH='686-pae' + ;; + amd64) + KARCH='amd64' + ;; + arm64) + KARCH='arm64' + ;; *) - echo "Only i386 and amd64 are currently supported" >&2 + echo "Only i386, amd64 and arm64 are currently supported" >&2 return 1 esac - for KPREFIX in "" "2.6-" ; do # iterate through the kernel prefixes, - # currently "" and "2.6-" - if package_exists linux-image-${KPREFIX}${KARCH} ; then - echo ${KPREFIX}${KARCH} - return 0 - fi + local KPACKAGE + KPACKAGE=linux-image-"${KPREFIX}${KARCH}" + if package_exists "$KPACKAGE"; then + echo "${KPREFIX}${KARCH}" + return 0 + fi - done + echo "Expected kernel package $KPACKAGE not found" >&2 + return 1 } # install kernel packages {{{ kernel() { + if [ -n "$NOKERNEL" ] ; then + echo "Skipping installation of kernel packages as requested via --nokernel" + return 0 + fi + $APTUPDATE KVER=$(get_kernel_version) if [ -n "$KVER" ] ; then - # note: install busybox to be able to debug initramfs - KERNELPACKAGES="linux-image-$KVER linux-headers-$KVER busybox firmware-linux-free firmware-linux" + case "$RELEASE" in + stretch) + echo "Installing busybox on Debian/$RELEASE as it's essential for the initramfs" + DEBIAN_FRONTEND=$DEBIAN_FRONTEND $APTINSTALL busybox + ;; + esac + + KERNELPACKAGES="linux-image-$KVER linux-headers-$KVER firmware-linux-free $INITRD_GENERATOR" + # only add firmware-linux if we have non-free as a component + if expr "$COMPONENTS" : '.*non-free' >/dev/null ; then + KERNELPACKAGES="$KERNELPACKAGES firmware-linux" + fi + # shellcheck disable=SC2086 DEBIAN_FRONTEND=$DEBIAN_FRONTEND $APTINSTALL $KERNELPACKAGES + else + echo "Warning: Could not find a kernel for your system. Your system won't be able to boot itself!" fi } # }}} @@ -299,8 +373,8 @@ kernel() { reconfigure() { if [ -n "$RECONFIGURE" ] ; then for package in $RECONFIGURE ; do - if dpkg --list $package >/dev/null 2>&1 | grep -q '^ii' ; then - DEBIAN_FRONTEND=$DEBIAN_FRONTEND dpkg-reconfigure $package || \ + if dpkg --list "$package" >/dev/null 2>&1 | grep -q '^ii' ; then + DEBIAN_FRONTEND=$DEBIAN_FRONTEND dpkg-reconfigure "$package" || \ echo "Warning: $package does not exist, can not reconfigure it." fi done @@ -316,15 +390,13 @@ passwords() return 0 fi - echo "Activating shadow passwords." - shadowconfig on - CHPASSWD_OPTION= if chpasswd --help 2>&1 | grep -q -- '-m,' ; then CHPASSWD_OPTION='-m' fi if [ -n "$ROOTPASSWORD" ] ; then + # shellcheck disable=SC2086 echo root:"$ROOTPASSWORD" | chpasswd $CHPASSWD_OPTION export ROOTPASSWORD='' else @@ -332,12 +404,12 @@ passwords() b='2' echo "Setting password for user root:" while [ "$a" != "$b" ] ; do - echo -n "Enter new UNIX password for user root: " + printf "Enter new UNIX password for user root: " askpass a="$resp" unset resp echo - echo -n "Retype new UNIX password for user root: " + printf "Retype new UNIX password for user root: " askpass b="$resp" unset resp @@ -347,6 +419,7 @@ passwords() a='1' b='2' else + # shellcheck disable=SC2086 echo root:"$a" | chpasswd $CHPASSWD_OPTION unset a unset b @@ -358,44 +431,27 @@ passwords() # set up /etc/hosts {{{ hosts() { - if [ -f /etc/hosts ] ; then - sed -i "s#127.0.0.1 .*#127.0.0.1 localhost $HOSTNAME#" /etc/hosts - [ -n "$HOSTNAME" ] && sed -i "s/grml/$HOSTNAME/g" /etc/hosts - else + if ! [ -f /etc/hosts ] ; then cat > /etc/hosts << EOF -127.0.0.1 localhost $HOSTNAME - -#127.0.0.1 localhost -#127.0.1.1 $HOSTNAME.example.org $HOSTNAME - -# The following lines are desirable for IPv6 capable hosts -#::1 ip6-localhost ip6-loopback $HOSTNAME -::1 ip6-localhost ip6-loopback -fe00::0 ip6-localnet -ff00::0 ip6-mcastprefix -ff02::1 ip6-allnodes -ff02::2 ip6-allrouters -ff02::3 ip6-allhosts +127.0.0.1 localhost +::1 localhost ip6-localhost ip6-loopback +ff02::1 ip6-allnodes +ff02::2 ip6-allrouters EOF fi } # }}} -# set up /etc/network/interfaces {{{ -interfaces() { - if ! [ -r /etc/network/interfaces ] || ! grep -q "auto lo" /etc/network/interfaces ; then - echo "Setting up /etc/network/interfaces" - cat >> /etc/network/interfaces << EOF - -# loopback device: -iface lo inet loopback -auto lo - -# eth0: -# iface eth0 inet dhcp -# auto eth0 +# set default locales {{{ +default_locales() { + if [ -n "$DEFAULT_LOCALES" ] ; then + if ! [ -x /usr/sbin/update-locale ] ; then + echo "Warning: update-locale executable not available (no locales package installed?)" + echo "Ignoring request to run update-locale for $DEFAULT_LOCALES therefore" + return 0 + fi -EOF + /usr/sbin/update-locale LANGUAGE="$DEFAULT_LANGUAGE" LANG="$DEFAULT_LOCALES" fi } # }}} @@ -403,19 +459,51 @@ EOF # adjust timezone {{{ timezone() { if [ -n "$TIMEZONE" ] ; then - echo "Adjusting /etc/localtime" - ln -sf /usr/share/zoneinfo/$TIMEZONE /etc/localtime + echo "Adjusting /etc/localtime" + ln -sf "/usr/share/zoneinfo/$TIMEZONE" /etc/localtime + + echo "Setting /etc/timezone to $TIMEZONE" + printf '%s\n' "$TIMEZONE" > /etc/timezone + fi } # }}} # helper function for fstab() {{{ createfstab(){ - echo "Setting up /etc/fstab" -if [ -n "$TARGET_UUID" ] ; then - echo "/dev/disk/by-uuid/${TARGET_UUID} / auto defaults,errors=remount-ro 0 1" > /etc/fstab -else - echo "${TARGET} / auto defaults,errors=remount-ro 0 1" > /etc/fstab + echo "Setting up /etc/fstab" + cat > /etc/fstab <> /etc/fstab + else + echo "Warning: couldn't identify target UUID for rootfs, your /etc/fstab might be incomplete." + fi + +if [ -n "$EFI" ] ; then + UUID_EFI="$(blkid -o value -s UUID "$EFI")" + echo "UUID=$UUID_EFI /boot/efi vfat umask=0077 0 1" >> /etc/fstab fi cat >> /etc/fstab << EOF @@ -424,7 +512,7 @@ proc /proc proc defaults 0 0 # some other examples: # /dev/sda2 none swap sw,pri=0 0 0 # /dev/hda1 /Grml ext3 dev,suid,user,noauto 0 2 -# //1.2.3.4/pub /smb/pub smbfs defaults,user,noauto,uid=grml,gid=grml 0 0 +# //1.2.3.4/pub /smb/pub cifs user,noauto,uid=grml,gid=grml 0 0 # linux:/pub /beer nfs defaults 0 0 # tmpfs /tmp tmpfs size=300M 0 0 # /dev/sda5 none swap sw 0 0 @@ -446,6 +534,28 @@ fstab() { } # }}} +# ensure we have according filesystem tools available {{{ +install_fs_tools() { + local pkg="" + + # note: this is supposed to be coming either via command lines' + # $_opt_filesystem or via createfstab() + case "${FILESYSTEM}" in + jfs) + pkg="jfsutils" + ;; + xfs) + pkg="xfsprogs" + ;; + esac + + if [ -n "${pkg:-}" ] && ! dpkg --list "${pkg}" 2>/dev/null | grep -q '^ii' ; then + echo "Filesystem package ${pkg} not present, installing now" + DEBIAN_FRONTEND=$DEBIAN_FRONTEND $APTINSTALL "${pkg}" + fi +} +# }}} + # set up hostname {{{ hostname() { if [ -n "$HOSTNAME" ] ; then @@ -461,6 +571,21 @@ hostname() { sed -i "s/^inet_interfaces = .*/inet_interfaces = loopback-only/" /etc/postfix/main.cf grep -q inet_interfaces /etc/postfix/main.cf || echo 'inet_interfaces = loopback-only' >> /etc/postfix/main.cf fi + if [ -r /etc/mailname ] ; then + # adjust /etc/mailname + local etc_mail_domain + etc_mail_domain=$(/bin/dnsdomainname 2>/dev/null || echo localdomain) + case "$HOSTNAME" in + *.*) + local mailname="$HOSTNAME" + ;; + *) + local mailname="${HOSTNAME}.${etc_mail_domain}" + ;; + esac + echo "Setting mailname to ${mailname}" + echo "$mailname" > /etc/mailname + fi fi } # }}} @@ -468,6 +593,7 @@ hostname() { # generate initrd/initramfs {{{ initrd() { # assume the first available kernel as our main kernel + # shellcheck disable=SC2012 KERNELIMG=$(ls -1 /boot/vmlinuz-* 2>/dev/null | head -1) if [ -z "$KERNELIMG" ] ; then echo 'No kernel image found, skipping initrd stuff.'>&2 @@ -479,12 +605,79 @@ initrd() { # generate initrd if [ -n "$INITRD" ] ; then echo "Generating initrd." - update-initramfs -c -t -k $KERNELVER + if [ "$INITRD_GENERATOR" = 'dracut' ] ; then + # shellcheck disable=SC2086 + dracut --no-hostonly --kver "$KERNELVER" --fstab --add-fstab /etc/fstab --force --reproducible $INITRD_GENERATOR_OPTS + else + # shellcheck disable=SC2086 + update-initramfs -c -t -k "$KERNELVER" $INITRD_GENERATOR_OPTS + fi fi } # }}} +efi_setup() { + if [ -z "$EFI" ] ; then + return 0 + fi + + if ! dpkg --list efibootmgr 2>/dev/null | grep -q '^ii' ; then + echo "Notice: efi option set but no efibootmgr package, installing it therefore." + DEBIAN_FRONTEND=$DEBIAN_FRONTEND $APTINSTALL efibootmgr + fi + + mkdir -p /boot/efi + echo "Mounting $EFI on /boot/efi" + mount "$EFI" /boot/efi + + # if efivarfs kernel module is loaded, but efivars isn't, + # then we need to mount efivarfs for efibootmgr usage + if ! ls /sys/firmware/efi/efivars/* &>/dev/null ; then + echo "Mounting efivarfs on /sys/firmware/efi/efivars" + mount -t efivarfs efivarfs /sys/firmware/efi/efivars + fi + + echo "Invoking efibootmgr" + efibootmgr +} + # grub configuration/installation {{{ + +# helper function to get relevant /dev/disk/by-id/* entries, +# based on GRUB's postinst script +available_ids() { + local path ids + + [ -d /dev/disk/by-id ] || return + ids="$( + for path in /dev/disk/by-id/*; do + [ -e "${path}" ] || continue + printf '%s %s\n' "${path}" "$(readlink -f "${path}")" + done | sort -k2 -s -u | cut -d' ' -f1 + )" + echo "${ids}" +} + +# helper function to report corresponding /dev/disk/by-id/ for a given device name, +# based on GRUB's postinst script +device_to_id() { + local id + + for id in $(available_ids); do + if [ "$(readlink -f "${id}")" = "$(readlink -f "$1")" ]; then + echo "${id}" + return 0 + fi + done + + # Fall back to the plain device name if there's no by-id link for it. + if [ -e "$1" ]; then + echo "$1" + return 0 + fi + return 1 +} + grub_install() { if [ -z "$GRUB" ] ; then @@ -492,40 +685,72 @@ grub_install() { return 0 fi - if ! dpkg --list grub-pc 2>/dev/null | grep -q '^ii' ; then - echo "Notice: grub option set but no grub-pc package, installing it therefore." - DEBIAN_FRONTEND=$DEBIAN_FRONTEND $APTINSTALL grub-pc + efi_setup + + if [ -n "$EFI" ] ; then + GRUB_PACKAGE=grub-efi-amd64 + else + GRUB_PACKAGE=grub-pc + fi + + # make sure this is pre-defined so we have sane settings for automated + # upgrades, see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=711019 + local grub_device + grub_device=$(device_to_id "${GRUB}") + if [ -z "${grub_device:-}" ] ; then + echo "Warning: Could not identify /dev/disk/by-id/... for '${GRUB}', falling back to '${GRUB}'" + grub_device="${GRUB}" fi - if ! [ -x "$(which grub-install)" ] ; then + echo "Setting ${GRUB_PACKAGE} debconf configuration for install device to $GRUB" + echo "${GRUB_PACKAGE} ${GRUB_PACKAGE}/install_devices multiselect ${grub_device}" | debconf-set-selections + + if ! dpkg --list "${GRUB_PACKAGE}" 2>/dev/null | grep -q '^ii' ; then + echo "Notice: grub option set but no ${GRUB_PACKAGE} package, installing it therefore." + DEBIAN_FRONTEND=$DEBIAN_FRONTEND $APTINSTALL "${GRUB_PACKAGE}" + fi + + if ! [ -x "$(command -v grub-install)" ] ; then echo "Error: grub-install not available. (Error while installing grub package?)" >&2 return 1 fi + if ! [ -x "$(command -v update-grub)" ] ; then + echo "Error: update-grub not available. (Error while installing grub package?)" >&2 + return 1 + fi if [ -n "$SELECTED_PARTITIONS" ] ; then # using sw-raid for device in $SELECTED_PARTITIONS ; do GRUB="${device%%[0-9]}" echo "Installing grub on ${GRUB}:" - grub-install --no-floppy "$GRUB" + if ! grub-install --no-floppy "$GRUB" ; then + echo "Error: failed to execute 'grub-install --no-floppy $GRUB'." >&2 + exit 1 + fi + done + rm -f /boot/grub/device.map else - echo "Installing grub on ${GRUB}:" - grub-install --no-floppy "$GRUB" + echo "Installing grub on ${GRUB}:" + echo "(hd0) ${GRUB}" > /boot/grub/device.map + if ! grub-install "(hd0)" ; then + echo "Error: failed to execute 'grub-install (hd0)'." >&2 + exit 1 + fi + rm /boot/grub/device.map fi echo "Adjusting grub configuration for use on ${GRUB}." - # finally install grub - if [ -x /usr/sbin/update-grub ] ; then - UPDATEGRUB='/usr/sbin/update-grub' - elif [ -x /sbin/update-grub ] ; then - UPDATEGRUB='/sbin/update-grub' - else - echo "Error: update-grub not available, can not execute it." >&2 - return 1 + if [ -n "${BOOT_APPEND}" ] ; then + echo "Adding BOOT_APPEND configuration ['${BOOT_APPEND}'] to /etc/default/grub." + sed -i "/GRUB_CMDLINE_LINUX_DEFAULT/ s#\"\$# ${BOOT_APPEND}\"#" /etc/default/grub fi - $UPDATEGRUB + mountpoint /boot/efi &>/dev/null && umount /boot/efi + + # finally install grub. Existence of update-grub is checked above. + update-grub } # }}} @@ -557,6 +782,9 @@ finalize() { [ -n "$POLICYRCD" ] && rm -f /usr/sbin/policy-rc.d + umount /sys/firmware/efi/efivars &>/dev/null || true + + umount /sys >/dev/null 2>/dev/null || true umount /proc >/dev/null 2>/dev/null || true } # }}} @@ -578,13 +806,15 @@ trap signal_handler HUP INT QUIT TERM # always execute install_policy_rcd install_policy_rcd - for i in chrootmirror grmlrepos kernelimg_conf \ - kernel packages extrapackages reconfigure hosts interfaces \ - timezone fstab hostname initrd grub_install passwords \ + for i in chrootmirror grmlrepos backportrepos kernelimg_conf \ + kernel packages extrapackages reconfigure hosts \ + default_locales timezone fstab install_fs_tools hostname \ + initrd grub_install passwords \ custom_scripts upgrade_system remove_apt_cache services \ remove_chrootmirror; do - if stage $i ; then - $i && stage $i done || exit 1 + if stage "$i" ; then + "$i" + stage "$i" 'done' fi done # always execute the finalize stage: