X-Git-Url: https://plomlompom.com/repos/berlin_corona.txt?a=blobdiff_plain;f=buster%2Fsetup_scripts%2Fsetup.sh;h=7e46f8a2800c89515006b3b0777419ea4363f083;hb=53f0311a71f13bf6a08f5e6b2b87122fd38459ce;hp=93f30124947e09d34c9ab019845aee0f276374cc;hpb=9187211b8fd00366f9738fe8ed9551da7b792920;p=config

diff --git a/buster/setup_scripts/setup.sh b/buster/setup_scripts/setup.sh
index 93f3012..7e46f8a 100755
--- a/buster/setup_scripts/setup.sh
+++ b/buster/setup_scripts/setup.sh
@@ -2,34 +2,31 @@
 set -e
 
 # Provide maximum input for set_hostname_and_fqdn.sh.
-if [ "$#" -ne 2 ]; then
-    echo 'Need exactly two arguments (hostname, FQDN).'
+if [ "$#" -lt 2 ]; then
+    echo 'Need at least two arguments (hostname, FQDN).'
     false
 fi
 hostname="$1"
 fqdn="$2"
+shift 2
 
 config_tree_prefix="${HOME}/config/buster"
 setup_scripts_dir="${config_tree_prefix}/setup_scripts"
 cd "${setup_scripts_dir}"
 
-# Adapt /etc/ to our needs by hardlinking into ./linkable_etc_files. This
-# will set basic configurations affecting following steps, such as setup
-# of APT and the locale selection, so needs to be right at the beginning.
-./copy_etc.sh all
+# Adapt /etc/ to our needs by copying from ./etc_files. This will set
+# basic configurations affecting following steps, such as setup of APT
+# and the locale selection, so needs to be right at the beginning.
+./copy_dirtree.sh "${config_tree_prefix}/etc_files" "" all "@"
 
 # Set hostname and FQDN.
 ./set_hostname_and_fqdn.sh "${hostname}" "${fqdn}"
 
-# Some debconf selections we don't want to get asked during coming
-# install actions.
-echo 'libc6:amd64 libraries/restart-without-asking boolean true' | debconf-set-selections
-
 # Ensure package installation state as defined by what packages are
 # defined as required by Debian policy and by settings in ./apt-mark/.
 apt update
-./install_for_target.sh all
-./purge_nonrequireds.sh all
+./install_for_target.sh all "$@"
+./purge_nonrequireds.sh all "$@"
 
 # Ensure our desired locale is available.
 locale-gen