X-Git-Url: https://plomlompom.com/repos/%7B%7Bprefix%7D%7D?a=blobdiff_plain;f=buster%2Fsetup_scripts%2Fsetup.sh;h=42d45ef867cc28911515a43a640f48d365a57c8f;hb=0be40f11034ad8642b83a7f4bdc7c0304869fa92;hp=51cdbde532fb2fb11ccfddc3331313aaf2e66d74;hpb=30d41305616e01d1bb202d23509b90f8ceac4ea8;p=config

diff --git a/buster/setup_scripts/setup.sh b/buster/setup_scripts/setup.sh
index 51cdbde..42d45ef 100755
--- a/buster/setup_scripts/setup.sh
+++ b/buster/setup_scripts/setup.sh
@@ -2,21 +2,22 @@
 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}"
@@ -24,8 +25,8 @@ cd "${setup_scripts_dir}"
 # 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