Fixes.

diff --git a/bookworm/preseed.cfg b/bookworm/preseed.cfg
index 82d6d682102e854e6533306414ff82f228c7c5a5..c9b535804e19bb51c5743ccd652b8ee0c70c1dac 100644 (file)
--- a/bookworm/preseed.cfg
+++ b/bookworm/preseed.cfg
@@ -1,12 +1,12 @@
 #_preseed_V1
 
-#d-i debian-installer/load-cdrom/title
+#d-i anna/choose-modules multiselect ,
 
-d-i netcfg/choose_interface select auto
 d-i netcfg/link_wait_timeout string 3
-#d-i netcfg/wireless_security_type wpa
-d-i netcfg/use_autoconfig true
-#d-i netcfg/wireless_essid kadatheron
+d-i netcfg/choose_interface select auto
+#d-i netcfg/wireless_essid string kadatheron
+d-i netcfg/wireless_security_type select wpa
+d-i netcfg/use_autoconfig boolean true
 d-i netcfg/get_hostname string unassigned-hostname
 d-i netcfg/get_domain string unassigned-domain
 
@@ -14,10 +14,9 @@ d-i passwd/root-login boolean true
 user-setup-udeb        passwd/make-user boolean false
 
 #d-i partman-auto/method string crypto
-#d-i partman-auto/select_disk /var/lib/partman/devices/=dev=nvme0n1
+#d-i partman-auto/select_disk string /var/lib/partman/devices/=dev=nvme0n1
 d-i partman-auto-lvm/guided_size string max
-#d-i partman-auto-lvm/new_vg_name plomvg
-#d-i partman-lvm/confirm true
+#d-i partman-auto-lvm/new_vg_name string plomvg
 #d-i partman-auto/choose_recipe select atomic
 d-i partman-auto-crypto/erase_disks boolean false
 # d-i partman-lvm/confirm boolean true
@@ -27,15 +26,15 @@ d-i base-installer/initramfs-tools/driver-policy most
 
 #d-i pkgsel/run_tasksel boolean false
 
-#d-i apt-setup/use-mirror true
+#d-i apt-setup/use-mirror boolean true
 d-i mirror/protocol string http
-#d-i mirror/http/proxy
+d-i mirror/http/proxy string ""
 #d-i mirror/http/hostname string http.us.debian.org
 d-i apt-setup/enable-source-repositories true
 d-i apt-setup/non-free-firmware boolean true
 d-i apt-setup/non-free boolean true
 d-i apt-setup/contrib boolean true
-d-i apt-setup/services-select security, updates
+d-i apt-setup/services-select multiselect security, updates
 
 d-i grub-installer/force-efi-extra-removable false
 d-i grub-installer/update-nvram true

diff --git a/bookworm/scripts/lib/constants_user b/bookworm/scripts/lib/constants_user
new file mode 100644 (file)
index 0000000..90747aa
--- /dev/null
+++ b/bookworm/scripts/lib/constants_user
@@ -0,0 +1,2 @@
+USERNAME=plom
+PATH_USER_HOME="/home/${USERNAME}"

diff --git a/bookworm/scripts/lib/setup_users b/bookworm/scripts/lib/setup_users
index 96c5d58364070403ac5a19a3ce276341aaea6394..01b15ea6ab0c3b30eb47fff9bba328629f27e94d 100644 (file)
--- a/bookworm/scripts/lib/setup_users
+++ b/bookworm/scripts/lib/setup_users
@@ -1,11 +1,10 @@
 . lib/copy_dirtree
+. lib/constants_user
 
 setup_users() {
-    USERNAME="$1"
-    MIN_TAGS="$2"
+    MIN_TAGS="$1"
     TAGS_USER="$2"
     PATH_CONF_HOME=../home
-    PATH_USER_HOME=/home/"${USERNAME}"
 
     echo "\nSetting up root user's home directory."
     copy_dirtree "${PATH_CONF_HOME}" '/root' ${MIN_TAGS} root

diff --git a/bookworm/scripts/setup_server.sh b/bookworm/scripts/setup_server.sh
index b04de66083c5b66d62c34a8c99ae71d0526464e9..79086eff8238d005f4c5a843ed4f1b28a41398bc 100755 (executable)
--- a/bookworm/scripts/setup_server.sh
+++ b/bookworm/scripts/setup_server.sh
@@ -3,6 +3,7 @@ set -e
 cd $(dirname "$0")
 . lib/constants_repopaths # PATH_CONF
 . lib/constants_server  # PATH_REL_SSH, PATH_SSH
+. lib/constants_user  # USERNAME
 . lib/copy_dirtree
 . lib/determine_ip
 . lib/expect_min_n_args
@@ -15,8 +16,6 @@ expect_min_n_args 2 '(hostname, FQDN)' "$@"
 HOSTNAME="$1"
 FQDN="$2"
 
-USERNAME=plom
-PATH_USER_HOME="/home/${USERNAME}"
 PATH_REL_ETC=etc
 PATH_CONF_ETC="${PATH_CONF}/${PATH_REL_ETC}"
 PATH_USER_SSH="${PATH_USER_HOME}/${PATH_REL_SSH}"
@@ -38,7 +37,7 @@ echo '\nSetting Berlin localtime.'
 ln -sf /usr/share/zoneinfo/Europe/Berlin "${PATH_ETC}/localtime"
 ntpdate-debian
 
-setup_users plom "${MIN_TAGS}"
+setup_users "${MIN_TAGS}" ""
 
 mkdir -p "${PATH_USER_SSH}"
 mv "${PATH_SSH}/authorized_keys" "${PATH_USER_SSH}/"

diff --git a/testing/scripts/_setup_secrets_user.sh b/testing/scripts/_setup_secrets_user.sh
index 30e08aadd5278b31babbe67f8a4834944d75e547..f190d5d8d60738d747faeec161aadb7b17e59d7e 100644 (file)
--- a/testing/scripts/_setup_secrets_user.sh
+++ b/testing/scripts/_setup_secrets_user.sh
@@ -2,7 +2,7 @@
 set -e
 cd $(dirname "$0")
 
-. lib/constants  # USERNAME
+. lib/constants_user  # USERNAME
 . lib/abort
 . lib/abort_if_exists
 . lib/abort_if_not_user

diff --git a/testing/scripts/lib/constants b/testing/scripts/lib/constants
deleted file mode 100644 (file)
index 90747aa..0000000
--- a/testing/scripts/lib/constants
+++ /dev/null
@@ -1,2 +0,0 @@
-USERNAME=plom
-PATH_USER_HOME="/home/${USERNAME}"

diff --git a/testing/scripts/lib/constants_user b/testing/scripts/lib/constants_user
new file mode 120000 (symlink)
index 0000000..1e15899
--- /dev/null
+++ b/testing/scripts/lib/constants_user
@@ -0,0 +1 @@
+../../../bookworm/scripts/lib/constants_user
\ No newline at end of file

diff --git a/testing/scripts/setup_desktop.sh b/testing/scripts/setup_desktop.sh
index f1b39b2c0c82d21c8fafb8cded44a8ae03cea2e3..c27758fb16c6d6ad818bc6c3f99bfbceeef5a553 100755 (executable)
--- a/testing/scripts/setup_desktop.sh
+++ b/testing/scripts/setup_desktop.sh
@@ -3,8 +3,8 @@ set -e
 cd $(dirname "$0")
 . lib/abort
 . lib/abort_if_offline
-. lib/constants  # PATH_USER_HOME, USERNAME
 . lib/constants_repopaths  # PATH_CONF
+. lib/constants_user  # PATH_USER_HOME, USERNAME
 . lib/copy_dirtree
 . lib/determine_ip
 . lib/expect_min_n_args
@@ -111,5 +111,5 @@ echo "\nSetting Berlin localtime."
 ln -sf /usr/share/zoneinfo/Europe/Berlin /etc/localtime
 ntpdate-debian
 
-setup_users 'plom' "${MIN_TAGS}" "${TAGS_USER}"
+setup_users "${MIN_TAGS}" "${TAGS_USER}"
 passwd "${USERNAME}"