X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=chroot-script;h=80b45ab0ac4740aeecf46d44f7463126d14a4885;hp=e14ca21b6a5e97cc7b931883e2a5082b157a430a;hb=7e1e9b8dbdcf2ad71aff50ffdb032eb9df8a9e64;hpb=0592c21f3db581e9910c3fc8ac9f5a603551b0bc

diff --git a/chroot-script b/chroot-script
index e14ca21..80b45ab 100755
--- a/chroot-script
+++ b/chroot-script
@@ -2,7 +2,7 @@
 # Filename:      /etc/debootstrap/chroot-script
 # Purpose:       script executed in chroot when installing Debian via grml-debootstrap
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
-# 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
@@ -17,10 +17,13 @@ if [ "$REPORT_TRAP_ERR" = "yes" ] || [ "$FAIL_TRAP_ERR" = "yes" ]; then
 fi
 # }}}
 
+# shellcheck disable=SC1091
 . /etc/debootstrap/config    || exit 1
+# shellcheck disable=SC1091
 . /etc/debootstrap/variables || exit 1
 
 [ -r /proc/1 ] || mount -t proc none /proc
+[ -r /sys/kernel ] || mount -t sysfs none /sys
 
 # variable checks {{{
 
@@ -64,7 +67,7 @@ askpass() {
   # read -s emulation for dash. result is in $resp.
   set -o noglob
   [ -t 0 ] && stty -echo
-  read resp
+  read -r resp
   [ -t 0 ] && stty echo
   set +o noglob
 }
@@ -127,12 +130,12 @@ remove_chrootmirror() {
 
   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" ] && 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
@@ -157,8 +160,11 @@ grmlrepos() {
 EOF
      fi
 
+     # shellcheck disable=SC2086
      if apt-get update $DPKG_OPTIONS; then
+       # shellcheck disable=SC2086
        apt-get -y --allow-unauthenticated install grml-debian-keyring $DPKG_OPTIONS
+       # shellcheck disable=SC2086
        apt-get update $DPKG_OPTIONS
      else
        # make sure we have the keys available for aptitude
@@ -186,29 +192,15 @@ EOF
 }
 # }}}
 
-# check available backports release version {{{
-checkbackports() {
-  wget -q -O/dev/null "http://backports.debian.org/debian-backports/dists/${1}-backports/Release"
-}
-# }}}
-
 # feature to provide Debian backports repos {{{
 backportrepos() {
-    if [ -n "$BACKPORTREPOS" ] ; then
-        if ! checkbackports "$RELEASE" ; then
-            echo "Backports for ${RELEASE} are not available." >&2
-            exit 1
-        else
-            # user might have provided their own apt sources.list
-            if ! grep -q backports /etc/apt/sources.list.d/backports.list 2>/dev/null ; then
-                cat >> /etc/apt/sources.list.d/backports.list << EOF
+  if [ -n "$BACKPORTREPOS" ] ; then
+    cat >> /etc/apt/sources.list.d/backports.list << EOF
 # debian backports: ${RELEASE}-backports repository:
-deb     http://backports.debian.org/debian-backports ${RELEASE}-backports main
-deb-src http://backports.debian.org/debian-backports ${RELEASE}-backports main
+deb     ${MIRROR} ${RELEASE}-backports main
+deb-src ${MIRROR} ${RELEASE}-backports main
 EOF
-            fi
-        fi
-    fi
+  fi
 }
 # }}}
 
@@ -255,6 +247,7 @@ upgrade_system() {
 remove_apt_cache() {
   if [ "$RM_APTCACHE" = 'yes' ] ; then
     echo "Cleaning apt cache."
+    # shellcheck disable=SC2086
     apt-get clean $DPKG_OPTIONS
   else
     echo "Not cleaning apt cache as \$RM_APTCACHE is unset."
@@ -277,6 +270,7 @@ packages() {
        exit 1
      else
        $APTUPDATE
+       # shellcheck disable=SC2086,SC2046
        DEBIAN_FRONTEND=$DEBIAN_FRONTEND $APTINSTALL $(grep -v '^#' /etc/debootstrap/packages) $GRMLPACKAGES
      fi
   fi
@@ -288,6 +282,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
@@ -314,6 +309,7 @@ get_kernel_version() {
 
   local KARCH
 
+  # shellcheck disable=SC2153
   case "$ARCH" in
     i386)
       case "$RELEASE" in
@@ -356,6 +352,7 @@ kernel() {
      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!"
@@ -367,8 +364,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
@@ -426,24 +423,12 @@ 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
 }
@@ -466,19 +451,28 @@ default_locales() {
 # 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"
+  if [ -n "$TARGET_UUID" ] ; then
+    echo "/dev/disk/by-uuid/${TARGET_UUID} /  auto    defaults,errors=remount-ro 0   1" > /etc/fstab
+  else
+    echo "Warning: couldn't identify target UUID for rootfs, your /etc/fstab might be incomplete."
+  fi
+
+if [ -n "$EFI" ] ; then
+  # shellcheck disable=SC2086
+  echo "UUID=$(blkid -o value -s UUID $EFI)  /boot/efi       vfat    umask=0077      0       1" >> /etc/fstab
 fi
 
 cat >> /etc/fstab << EOF
@@ -526,7 +520,8 @@ hostname() {
      fi
      if [ -r /etc/mailname ] ; then
         # adjust /etc/mailname
-        local etc_mail_domain=$(/bin/dnsdomainname 2>/dev/null || echo localdomain)
+        local etc_mail_domain
+        etc_mail_domain=$(/bin/dnsdomainname 2>/dev/null || echo localdomain)
         case "$HOSTNAME" in
           *.*)
             local mailname="$HOSTNAME"
@@ -545,6 +540,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
@@ -561,6 +557,24 @@ initrd() {
 }
 # }}}
 
+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 || return 1
+
+  echo "Invoking efibootmgr"
+  efibootmgr || return 1
+}
+
 # grub configuration/installation {{{
 grub_install() {
 
@@ -569,12 +583,25 @@ 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 || return 1
+
+  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
+  echo "Setting ${GRUB_PACKAGE} debconf configuration for install device to $GRUB"
+  echo "${GRUB_PACKAGE} ${GRUB_PACKAGE}/install_devices multiselect $GRUB" | 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 "$(which grub-install)" ] ; then
+  if ! [ -x "$(command -v grub-install)" ] ; then
      echo "Error: grub-install not available. (Error while installing grub package?)" >&2
      return 1
   fi
@@ -613,6 +640,8 @@ grub_install() {
     return 1
   fi
 
+  mountpoint /boot/efi &>/dev/null && umount /boot/efi
+
   $UPDATEGRUB
 }
 # }}}
@@ -645,6 +674,7 @@ finalize() {
 
   [ -n "$POLICYRCD" ] && rm -f /usr/sbin/policy-rc.d
 
+  umount /sys >/dev/null 2>/dev/null || true
   umount /proc >/dev/null 2>/dev/null || true
 }
 # }}}