From cdc5e1fb338ff7ec0f2146ccfc14c7829db5de74 Mon Sep 17 00:00:00 2001 From: Christian Heller Date: Fri, 4 Apr 2025 19:48:25 +0200 Subject: [PATCH] Fixes. --- bookworm/preseed.cfg | 16 ++++++++++---- bookworm/scripts/lib/INSTALLER_VERSION | 1 + bookworm/scripts/lib/abort_if_not_user | 7 ------ bookworm/scripts/lib/abort_if_offline | 7 ------ bookworm/scripts/lib/constants_ssh | 3 --- bookworm/scripts/lib/expect_n_args | 21 ------------------ .../home/desktop/.plomlib.sh/expect_n_args | 1 + testing/preseed.cfg | 1 + .../scripts/lib/abort_if_command_unknown | 0 testing/scripts/lib/abort_if_not_user | 8 ++++++- testing/scripts/lib/abort_if_offline | 8 ++++++- .../scripts/lib/constants_installer | 0 testing/scripts/lib/constants_ssh | 4 +++- testing/scripts/lib/expect_n_args | 22 ++++++++++++++++++- .../scripts/lib/get_mountable_device_path | 0 .../scripts/make_writable_installer.sh | 6 ++--- .../scripts/update_preseed.sh | 0 17 files changed, 55 insertions(+), 50 deletions(-) create mode 100644 bookworm/scripts/lib/INSTALLER_VERSION delete mode 100644 bookworm/scripts/lib/abort_if_not_user delete mode 100644 bookworm/scripts/lib/abort_if_offline delete mode 100644 bookworm/scripts/lib/constants_ssh delete mode 100644 bookworm/scripts/lib/expect_n_args create mode 120000 testing/home/desktop/.plomlib.sh/expect_n_args create mode 120000 testing/preseed.cfg rename {bookworm => testing}/scripts/lib/abort_if_command_unknown (100%) mode change 120000 => 100644 testing/scripts/lib/abort_if_not_user mode change 120000 => 100644 testing/scripts/lib/abort_if_offline rename {bookworm => testing}/scripts/lib/constants_installer (100%) mode change 120000 => 100644 testing/scripts/lib/constants_ssh mode change 120000 => 100644 testing/scripts/lib/expect_n_args rename {bookworm => testing}/scripts/lib/get_mountable_device_path (100%) rename {bookworm => testing}/scripts/make_writable_installer.sh (98%) rename {bookworm => testing}/scripts/update_preseed.sh (100%) diff --git a/bookworm/preseed.cfg b/bookworm/preseed.cfg index d095933..8e3d89b 100644 --- a/bookworm/preseed.cfg +++ b/bookworm/preseed.cfg @@ -4,15 +4,22 @@ d-i anna/choose_modules multiselect d-i netcfg/link_wait_timeout string 3 d-i netcfg/choose_interface select auto -d-i netcfg/wireless_show_essids select kadatheron #d-i netcfg/wireless_essid string kadatheron +#d-i netcfg/wireless_essid seen true +d-i netcfg/wireless_show_essids select kadatheron #d-i netcfg/wireless_show_essids seen true +#d-i netcfg/confirm_essid boolean true +#d-i netcfg/confirm_essid seen true d-i netcfg/wireless_security_type select wpa +d-i netcfg/wireless_wpa string REPLACE_WITH_WIFI_PASSWORD +d-i netcfg/wireless_wpa seen true d-i netcfg/use_autoconfig boolean true d-i netcfg/get_hostname string unassigned-hostname d-i netcfg/get_domain string unassigned-domain d-i passwd/root-login boolean true +d-i passwd/root-password password REPLACE_WITH_ROOT_PASSWORD +d-i passwd/root-password-again password REPLACE_WITH_ROOT_PASSWORD user-setup-udeb passwd/make-user boolean false #d-i partman-auto/method string crypto @@ -30,9 +37,10 @@ d-i base-installer/initramfs-tools/driver-policy most d-i apt-setup/use_mirror boolean true d-i mirror/protocol string http -d-i mirror/http/proxy string -d-i mirror/http/countries select US -d-i mirror/http/mirror select deb.debian.org +d-i mirror/http/proxy string +#d-i mirror/http/countries select US +#d-i mirror/http/countries seen true +#d-i mirror/http/mirror select deb.debian.org #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 diff --git a/bookworm/scripts/lib/INSTALLER_VERSION b/bookworm/scripts/lib/INSTALLER_VERSION new file mode 100644 index 0000000..bd9fd08 --- /dev/null +++ b/bookworm/scripts/lib/INSTALLER_VERSION @@ -0,0 +1 @@ +INSTALLER_VERSION=12.10.0 diff --git a/bookworm/scripts/lib/abort_if_not_user b/bookworm/scripts/lib/abort_if_not_user deleted file mode 100644 index a7b3da3..0000000 --- a/bookworm/scripts/lib/abort_if_not_user +++ /dev/null @@ -1,7 +0,0 @@ -. lib/abort - -abort_if_not_user() { - if [ "$(whoami)" != "$1" ]; then - abort "Must be run as ${1}." - fi -} diff --git a/bookworm/scripts/lib/abort_if_offline b/bookworm/scripts/lib/abort_if_offline deleted file mode 100644 index b81c784..0000000 --- a/bookworm/scripts/lib/abort_if_offline +++ /dev/null @@ -1,7 +0,0 @@ -. lib/abort - -abort_if_offline() { - if ! ping -c1 -W2 1.1.1.1 > /dev/null 2>&1; then - abort 'Must be run online.' - fi -} diff --git a/bookworm/scripts/lib/constants_ssh b/bookworm/scripts/lib/constants_ssh deleted file mode 100644 index 43e6ee5..0000000 --- a/bookworm/scripts/lib/constants_ssh +++ /dev/null @@ -1,3 +0,0 @@ -. lib/constants_user -PATH_REL_SSH=.ssh -PATH_USER_SSH="${PATH_USER_HOME}/${PATH_REL_SSH}" diff --git a/bookworm/scripts/lib/expect_n_args b/bookworm/scripts/lib/expect_n_args deleted file mode 100644 index 950671a..0000000 --- a/bookworm/scripts/lib/expect_n_args +++ /dev/null @@ -1,21 +0,0 @@ -. lib/abort - -expect_n_args() { - _N_MIN_ARGS="$1" - _N_MAX_ARGS="$2" - _USAGE="$3" - shift 3 - _ABORT_MSG= - if [ "$#" -lt "${_N_MIN_ARGS}" ]; then - _ABORT_MSG="missing arguments (got $# instead of ${_N_MAX_ARGS})." - elif [ "$#" -gt "${_N_MAX_ARGS}" ]; then - shift "${_N_MAX_ARGS}" - _ABORT_MSG="unexpected arguments beyond expected number (${_N_MAX_ARGS}): $@" - fi - if [ ! -z "${_ABORT_MSG}" ]; then - if [ ! -z "${_USAGE}" ]; then - _ABORT_MSG="${_ABORT_MSG}\nExpected arguments: ${_USAGE}" - fi - abort "Aborting due to ${_ABORT_MSG}" - fi -} diff --git a/testing/home/desktop/.plomlib.sh/expect_n_args b/testing/home/desktop/.plomlib.sh/expect_n_args new file mode 120000 index 0000000..a0925a1 --- /dev/null +++ b/testing/home/desktop/.plomlib.sh/expect_n_args @@ -0,0 +1 @@ +../../../scripts/lib/expect_n_args \ No newline at end of file diff --git a/testing/preseed.cfg b/testing/preseed.cfg new file mode 120000 index 0000000..71c2003 --- /dev/null +++ b/testing/preseed.cfg @@ -0,0 +1 @@ +../bookworm/preseed.cfg \ No newline at end of file diff --git a/bookworm/scripts/lib/abort_if_command_unknown b/testing/scripts/lib/abort_if_command_unknown similarity index 100% rename from bookworm/scripts/lib/abort_if_command_unknown rename to testing/scripts/lib/abort_if_command_unknown diff --git a/testing/scripts/lib/abort_if_not_user b/testing/scripts/lib/abort_if_not_user deleted file mode 120000 index b152dca..0000000 --- a/testing/scripts/lib/abort_if_not_user +++ /dev/null @@ -1 +0,0 @@ -../../../bookworm/scripts/lib/abort_if_not_user \ No newline at end of file diff --git a/testing/scripts/lib/abort_if_not_user b/testing/scripts/lib/abort_if_not_user new file mode 100644 index 0000000..a7b3da3 --- /dev/null +++ b/testing/scripts/lib/abort_if_not_user @@ -0,0 +1,7 @@ +. lib/abort + +abort_if_not_user() { + if [ "$(whoami)" != "$1" ]; then + abort "Must be run as ${1}." + fi +} diff --git a/testing/scripts/lib/abort_if_offline b/testing/scripts/lib/abort_if_offline deleted file mode 120000 index c2f519f..0000000 --- a/testing/scripts/lib/abort_if_offline +++ /dev/null @@ -1 +0,0 @@ -../../../bookworm/scripts/lib/abort_if_offline \ No newline at end of file diff --git a/testing/scripts/lib/abort_if_offline b/testing/scripts/lib/abort_if_offline new file mode 100644 index 0000000..b81c784 --- /dev/null +++ b/testing/scripts/lib/abort_if_offline @@ -0,0 +1,7 @@ +. lib/abort + +abort_if_offline() { + if ! ping -c1 -W2 1.1.1.1 > /dev/null 2>&1; then + abort 'Must be run online.' + fi +} diff --git a/bookworm/scripts/lib/constants_installer b/testing/scripts/lib/constants_installer similarity index 100% rename from bookworm/scripts/lib/constants_installer rename to testing/scripts/lib/constants_installer diff --git a/testing/scripts/lib/constants_ssh b/testing/scripts/lib/constants_ssh deleted file mode 120000 index b711025..0000000 --- a/testing/scripts/lib/constants_ssh +++ /dev/null @@ -1 +0,0 @@ -../../../bookworm/scripts/lib/constants_ssh \ No newline at end of file diff --git a/testing/scripts/lib/constants_ssh b/testing/scripts/lib/constants_ssh new file mode 100644 index 0000000..43e6ee5 --- /dev/null +++ b/testing/scripts/lib/constants_ssh @@ -0,0 +1,3 @@ +. lib/constants_user +PATH_REL_SSH=.ssh +PATH_USER_SSH="${PATH_USER_HOME}/${PATH_REL_SSH}" diff --git a/testing/scripts/lib/expect_n_args b/testing/scripts/lib/expect_n_args deleted file mode 120000 index 5c37e82..0000000 --- a/testing/scripts/lib/expect_n_args +++ /dev/null @@ -1 +0,0 @@ -../../../bookworm/scripts/lib/expect_n_args \ No newline at end of file diff --git a/testing/scripts/lib/expect_n_args b/testing/scripts/lib/expect_n_args new file mode 100644 index 0000000..950671a --- /dev/null +++ b/testing/scripts/lib/expect_n_args @@ -0,0 +1,21 @@ +. lib/abort + +expect_n_args() { + _N_MIN_ARGS="$1" + _N_MAX_ARGS="$2" + _USAGE="$3" + shift 3 + _ABORT_MSG= + if [ "$#" -lt "${_N_MIN_ARGS}" ]; then + _ABORT_MSG="missing arguments (got $# instead of ${_N_MAX_ARGS})." + elif [ "$#" -gt "${_N_MAX_ARGS}" ]; then + shift "${_N_MAX_ARGS}" + _ABORT_MSG="unexpected arguments beyond expected number (${_N_MAX_ARGS}): $@" + fi + if [ ! -z "${_ABORT_MSG}" ]; then + if [ ! -z "${_USAGE}" ]; then + _ABORT_MSG="${_ABORT_MSG}\nExpected arguments: ${_USAGE}" + fi + abort "Aborting due to ${_ABORT_MSG}" + fi +} diff --git a/bookworm/scripts/lib/get_mountable_device_path b/testing/scripts/lib/get_mountable_device_path similarity index 100% rename from bookworm/scripts/lib/get_mountable_device_path rename to testing/scripts/lib/get_mountable_device_path diff --git a/bookworm/scripts/make_writable_installer.sh b/testing/scripts/make_writable_installer.sh similarity index 98% rename from bookworm/scripts/make_writable_installer.sh rename to testing/scripts/make_writable_installer.sh index 1cf871d..b5327e7 100755 --- a/bookworm/scripts/make_writable_installer.sh +++ b/testing/scripts/make_writable_installer.sh @@ -2,6 +2,7 @@ # based on set -e cd $(dirname "$0") +. lib/INSTALLER_VERSION . lib/abort . lib/abort_if_command_unknown . lib/abort_if_not_user @@ -10,9 +11,6 @@ cd $(dirname "$0") . lib/expect_n_args . lib/get_mountable_device_path -INSTALLER_VERSION=12.10.0 -PATH_MNT_ISO=/mnt/iso - expect_n_args 1 1 'DEVICE (e.g. "sdb")' $@ abort_if_not_user root abort_if_offline @@ -20,9 +18,9 @@ abort_if_command_unknown mkfs.vfat abort_if_command_unknown parted abort_if_command_unknown rsync abort_if_command_unknown wget - PATH_STICK="$(get_mountable_device_path $1)" +PATH_MNT_ISO=/mnt/iso FILENAME_ISO="debian-${INSTALLER_VERSION}-amd64-netinst.iso" echo "Retrieving ${FILENAME_ISO}." URL_ISO="https://cdimage.debian.org/debian-cd/current/amd64/iso-cd/${FILENAME_ISO}" diff --git a/bookworm/scripts/update_preseed.sh b/testing/scripts/update_preseed.sh similarity index 100% rename from bookworm/scripts/update_preseed.sh rename to testing/scripts/update_preseed.sh -- 2.30.2