Fix.

diff --git a/bookworm/preseed.cfg b/bookworm/preseed.cfg
index 4cb6c50a61a3f8c0933a9cf56b85ad31f5d96999..dddac96c175decd4b0e2519b3b828cbe838bc7a7 100644 (file)
--- a/bookworm/preseed.cfg
+++ b/bookworm/preseed.cfg
@@ -168,4 +168,4 @@ d-i finish-install/reboot_in_progress note
 
 # config script
 d-i pkgsel/include string git,ca-certificates
-d-i preseed/late_command string echo -e "#!/usr/bin/sh\nset -e\ngit clone https://plomlompom.com/repos/clone/config\nconfig/testing/scripts/setup_desktop.sh t490s" > /target/root/run.sh && chmod a+x /target/root/run.sh
+d-i preseed/late_command string apt-install git && in-target git clone https://plomlompom.com/repos/clone/config /root/config && echo -e '#!/usr/bin/sh\nset -e\nif [ -z "$1" ]; then\n    echo "need user password as argument"\n    exit 1\nfi\nconfig/testing/scripts/setup_desktop.sh t490s "$1"\nconfig/testing/scripts/setup_secrets.sh sda' > /target/root/run.sh && chmod a+x /target/root/run.sh

diff --git a/testing/scripts/setup_desktop.sh b/testing/scripts/setup_desktop.sh
index 926bd40236b6acbe5c84347c736c6340d65a231b..141573816fc005d7f06416b30e175dfd1660021e 100755 (executable)
--- a/testing/scripts/setup_desktop.sh
+++ b/testing/scripts/setup_desktop.sh
@@ -33,8 +33,9 @@ abort_if_illegal_system_name() {
     done
     abort 'Need legal system name.'
 }
-expect_n_args 1 1 "(system name)" $@
+expect_n_args 2 2 "SYSTEM_NAME, USER_PW" $@
 SYSTEM_NAME="$1"
+USER_PW="$2"
 abort_if_illegal_system_name "${SYSTEM_NAME}"
 SYSTEM_CLASS_NAME="$(get_system_class_for ${SYSTEM_NAME})"
 INSTALL_TAGS="all ${SYSTEM_CLASS_NAME} ${SYSTEM_NAME} user desktop"
@@ -74,7 +75,7 @@ echo '\n# Ensuring our desired locale is available …'
 locale-gen
 
 echo '\n# Final user setup …'
-adduser --quiet plom plugdev  # so user may use pmount
-passwd "${USERNAME}"
+adduser --quiet "${USERNAME}" plugdev  # so user may use pmount
+echo "${USERNAME}:${USER_PW}" | chpasswd
 
 put_finished_marker 'setup_desktop'