Improve w530 bookworm setup.

[config] / bookworm / setup_scripts / setup.sh

diff --git a/bookworm/setup_scripts/setup.sh b/bookworm/setup_scripts/setup.sh
index 815683edbd91051da2c0eb9e20128a06bfda986c..0502de7e39d82f052aad9a8950293f71408512d5 100755 (executable)
--- a/bookworm/setup_scripts/setup.sh
+++ b/bookworm/setup_scripts/setup.sh
@@ -1,18 +1,13 @@
 #!/bin/sh
 set -e
 debian_version="bookworm"
+. ./misc.sh
 
-# Provide maximum input for set_hostname_and_fqdn.sh.
-if [ "$#" -lt 2 ]; then
-    echo 'Need at least two arguments (hostname, FQDN).'
-    false
-fi
+expect_n_args 2 "(hostname, FQDN)" "$@"
 hostname="$1"
 fqdn="$2"
 shift 2
 
-config_tree_prefix="${HOME}/config/${debian_version}"
-setup_scripts_dir="${config_tree_prefix}/setup_scripts"
 cd "${setup_scripts_dir}"
 
 # Adapt /etc/ to our needs by copying from ./etc_files. This will set