Fix.

diff --git a/trixie/aptmark/desktop b/trixie/aptmark/desktop
index 2980cf8c14cc4fbbcec7b85f436b7d0d10987a7b..9942983bc43ce9fca83b8e18f55fd2c900ff0b24 100644 (file)
--- 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 d9aceffc25a34cd2855edb1e46cf57bbf9b2a7b2..549df001d2e7089610efd4ba4a48dcd6756bfe81 100644 (file)
--- 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 5aecd7a4bbfcd18a724b4c4d1e7c5058b6fd5668..b88ca979e4a5784e20275b64f73394561732ccde 100755 (executable)
--- 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 00d1f971941a8af84f1c103e1843f0ead39be069..819c9f4d3e29bd966e5fa3d3f2d515eb1b388f08 100755 (executable)
--- 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"