From c255a19192d039a88d568b3e4565c8e07736af11 Mon Sep 17 00:00:00 2001 From: Christian Heller Date: Mon, 8 Sep 2025 11:55:42 +0200 Subject: [PATCH] Fix. --- trixie/aptmark/desktop | 2 ++ trixie/scripts/lib/INSTALLER_VERSION.sh | 2 +- trixie/scripts/make_writable_installer.sh | 7 ++++--- trixie/scripts/update_preseed.sh | 4 ++-- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/trixie/aptmark/desktop b/trixie/aptmark/desktop index 2980cf8..9942983 100644 --- a/trixie/aptmark/desktop +++ b/trixie/aptmark/desktop @@ -37,4 +37,6 @@ wget xz-utils # for ytplom to run libmpv2 +# for android syncs +go-mtpfs # diff --git a/trixie/scripts/lib/INSTALLER_VERSION.sh b/trixie/scripts/lib/INSTALLER_VERSION.sh index d9aceff..549df00 100644 --- a/trixie/scripts/lib/INSTALLER_VERSION.sh +++ b/trixie/scripts/lib/INSTALLER_VERSION.sh @@ -1 +1 @@ -INSTALLER_VERSION=13.0.0 +INSTALLER_VERSION=13.1.0 diff --git a/trixie/scripts/make_writable_installer.sh b/trixie/scripts/make_writable_installer.sh index 5aecd7a..b88ca97 100755 --- a/trixie/scripts/make_writable_installer.sh +++ b/trixie/scripts/make_writable_installer.sh @@ -8,7 +8,7 @@ cd "${PARENT_DIR}" . lib/abort_if_command_unknown.sh . lib/abort_if_not_user.sh . lib/abort_if_offline.sh -. lib/constants_installer.sh # FILENAME_PRESEED_CFG, PATH_PRESEED_CFG +. lib/constants_installer.sh # ARGS_UPDATE_PRESEED, FILENAME_PRESEED_CFG . lib/expect_n_args.sh . lib/get_mountable_device_path.sh . lib/path_tmp_timestamped.sh @@ -97,10 +97,11 @@ if [ "${RESULT}" != "0" ]; then fi fi -prefixed_msg "Installing preseed file …" -cp "${PATH_PRESEED_CFG}" "${PATH_MNT_DEV}/" +prefixed_msg "Preparing grub …" sed --in-place 's/ --- / --- preseed\/file=\/cdrom\/'"${FILENAME_PRESEED_CFG}"' /g' "${PATH_MNT_DEV}/boot/grub/grub.cfg" +prefixed_msg "Now run update_preseed.sh ${ARGS_UPDATE_PRESEED}" + prefixed_msg "Done!" prefixed_msg_exit diff --git a/trixie/scripts/update_preseed.sh b/trixie/scripts/update_preseed.sh index 00d1f97..819c9f4 100755 --- a/trixie/scripts/update_preseed.sh +++ b/trixie/scripts/update_preseed.sh @@ -3,7 +3,7 @@ set -e ROOT=$(dirname "$0") cd "${ROOT}" . lib/abort_if_command_unknown.sh -. lib/constants_installer.sh # FILENAME_PRESEED_CFG, PATH_PRESEED_CFG +. lib/constants_installer.sh # ARGS_UPDATE_PRESEED, FILENAME_PRESEED_CFG, PATH_PRESEED_CFG . lib/expect_n_args.sh . lib/get_mountable_device_path.sh . lib/prefixed_msg.sh @@ -13,7 +13,7 @@ prefixed_msg_init abort_if_command_unknown pmount -expect_n_args 1 4 'DEVICE (e.g. "sdb1") ROOT_PASSWORD WIFI_ESSID WIFI_PASSWORD' "$@" +expect_n_args 1 4 "${ARGS_UPDATE_PRESEED}" "$@" DEVICE_NAME="$1" ROOT_PASSWORD="$2" WIFI_ESSID="$3" -- 2.30.2