From: Michael Prokop <mika@grml.org>
Date: Fri, 17 Nov 2023 15:57:10 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/pr/245'
X-Git-Tag: v0.105~8
X-Git-Url: http://git.grml.org/?a=commitdiff_plain;h=c5357622163341d7364f38d6d2e675e933dcb157;hp=-c;p=grml-debootstrap.git

Merge remote-tracking branch 'origin/pr/245'
---

c5357622163341d7364f38d6d2e675e933dcb157
diff --combined grml-debootstrap
index f52b8cb,cd2bd93..8d9e1db
--- a/grml-debootstrap
+++ b/grml-debootstrap
@@@ -5,6 -5,7 +5,7 @@@
  # Bug-Reports:   see https://grml.org/bugs/
  # License:       This file is licensed under the GPL v2+
  ################################################################################
+ # shellcheck disable=SC2001,SC2181
  
  # error_handler {{{
  [ -n "$REPORT_TRAP_ERR" ] || REPORT_TRAP_ERR='no'
@@@ -42,7 -43,7 +43,7 @@@ f
  # variables {{{
  PN="$(basename "$0")"
  if [[ -d "$(dirname "$(command -v "$0")")"/.git ]]; then
-   VERSION="$(git --git-dir $(dirname "$(command -v "$0")")/.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
@@@ -1892,6 -1893,9 +1893,6 @@@ preparechroot() 
    # setup default locales
    [ -n "$LOCALES" ] && cp $VERBOSE "${CONFFILES}"/locale.gen "${MNTPOINT}"/etc/locale.gen
  
 -  # MAKEDEV is just a forking bomb crap, let's do it on our own instead :)
 -  ( cd "${MNTPOINT}"/dev && tar zxf /etc/debootstrap/devices.tar.gz )
 -
    # copy any existing files to chroot
    [ -d "${CONFFILES}"/bin   ] && cp $VERBOSE -a -L "${CONFFILES}"/bin/*   "${MNTPOINT}"/bin/
    [ -d "${CONFFILES}"/boot  ] && cp $VERBOSE -a -L "${CONFFILES}"/boot/*  "${MNTPOINT}"/boot/
@@@ -1947,11 -1951,13 +1948,13 @@@ 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"
@@@ -1962,6 -1968,7 +1965,7 @@@
      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