Add trixie.

diff --git a/testing/aptmark/all b/testing/aptmark/all
index 1913f5e9f4679f55fd3d9937f1f38e675de94130..02ff91d50edd7adef81b7f716a722b7ab0b4db9a 120000 (symlink)
--- a/testing/aptmark/all
+++ b/testing/aptmark/all
@@ -1 +1 @@
-../../bookworm/aptmark/all
\ No newline at end of file
+../../trixie/aptmark/all
\ No newline at end of file

diff --git a/testing/aptmark/user b/testing/aptmark/user
index 41adec5048a044c6a384a1d050cb16bd9386a1f9..6fe2545b36d8c522ef3c0239a49b3652d18879a9 120000 (symlink)
--- a/testing/aptmark/user
+++ b/testing/aptmark/user
@@ -1 +1 @@
-../../bookworm/aptmark/user
\ No newline at end of file
+../../trixie/aptmark/user
\ No newline at end of file

diff --git a/testing/copy/all/__home/plom/.bash_profile b/testing/copy/all/__home/plom/.bash_profile
deleted file mode 120000 (symlink)
index 6d0c662..0000000
--- a/testing/copy/all/__home/plom/.bash_profile
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../bookworm/copy/all/home/plom/.bash_profile
\ No newline at end of file

diff --git a/testing/copy/all/__home/plom/.bashrc b/testing/copy/all/__home/plom/.bashrc
deleted file mode 120000 (symlink)
index f142d7e..0000000
--- a/testing/copy/all/__home/plom/.bashrc
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../bookworm/copy/all/home/plom/.bashrc
\ No newline at end of file

diff --git a/testing/copy/all/__home/plom/.local/bin/LINK_ME b/testing/copy/all/__home/plom/.local/bin/LINK_ME
deleted file mode 100644 (file)
index 6750cfc..0000000
--- a/testing/copy/all/__home/plom/.local/bin/LINK_ME
+++ /dev/null
@@ -1,2 +0,0 @@
-../../.plomlib
-lib

diff --git a/testing/copy/all/__home/plom/.plomlib/file_dot_variants b/testing/copy/all/__home/plom/.plomlib/file_dot_variants
deleted file mode 120000 (symlink)
index 326fd9d..0000000
--- a/testing/copy/all/__home/plom/.plomlib/file_dot_variants
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../bookworm/copy/all/home/plom/.plomlib/file_dot_variants
\ No newline at end of file

diff --git a/testing/copy/all/__home/plom/.profile b/testing/copy/all/__home/plom/.profile
deleted file mode 120000 (symlink)
index d460c3f..0000000
--- a/testing/copy/all/__home/plom/.profile
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../bookworm/copy/all/home/plom/.profile
\ No newline at end of file

diff --git a/testing/copy/all/__root/.bash_profile b/testing/copy/all/__root/.bash_profile
deleted file mode 120000 (symlink)
index ecf4029..0000000
--- a/testing/copy/all/__root/.bash_profile
+++ /dev/null
@@ -1 +0,0 @@
-../home/plom/.bash_profile
\ No newline at end of file

diff --git a/testing/copy/all/__root/.bashrc b/testing/copy/all/__root/.bashrc
deleted file mode 120000 (symlink)
index 9ebea20..0000000
--- a/testing/copy/all/__root/.bashrc
+++ /dev/null
@@ -1 +0,0 @@
-../home/plom/.bashrc
\ No newline at end of file

diff --git a/testing/copy/all/__root/.local b/testing/copy/all/__root/.local
deleted file mode 120000 (symlink)
index bad616a..0000000
--- a/testing/copy/all/__root/.local
+++ /dev/null
@@ -1 +0,0 @@
-../home/plom/.local
\ No newline at end of file

diff --git a/testing/copy/all/__root/.plomlib b/testing/copy/all/__root/.plomlib
deleted file mode 120000 (symlink)
index 76e877f..0000000
--- a/testing/copy/all/__root/.plomlib
+++ /dev/null
@@ -1 +0,0 @@
-../home/plom/.plomlib
\ No newline at end of file

diff --git a/testing/copy/all/__root/.profile b/testing/copy/all/__root/.profile
deleted file mode 120000 (symlink)
index edcf39c..0000000
--- a/testing/copy/all/__root/.profile
+++ /dev/null
@@ -1 +0,0 @@
-../home/plom/.profile
\ No newline at end of file

diff --git a/testing/copy/all/__root/.shell_prompt_color b/testing/copy/all/__root/.shell_prompt_color
deleted file mode 120000 (symlink)
index e86be85..0000000
--- a/testing/copy/all/__root/.shell_prompt_color
+++ /dev/null
@@ -1 +0,0 @@
-../../../../bookworm/copy/all/root/.shell_prompt_color
\ No newline at end of file

diff --git a/testing/copy/all/etc/apt/__apt.conf.d/99_minimize_dependencies b/testing/copy/all/etc/apt/__apt.conf.d/99_minimize_dependencies
deleted file mode 120000 (symlink)
index 086a699..0000000
--- a/testing/copy/all/etc/apt/__apt.conf.d/99_minimize_dependencies
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../bookworm/copy/all/etc/apt/apt.conf.d/99_minimize_dependencies
\ No newline at end of file

diff --git a/testing/copy/all/etc/apt/apt.conf.d b/testing/copy/all/etc/apt/apt.conf.d
index b8a462fefd69c9124c383b8d8aa1900ad642e683..a21609b32203e43f900dc2b3a87cdf37a732360f 120000 (symlink)
--- a/testing/copy/all/etc/apt/apt.conf.d
+++ b/testing/copy/all/etc/apt/apt.conf.d
@@ -1 +1 @@
-../../../../../bookworm/copy/all/etc/apt/apt.conf.d
\ No newline at end of file
+../../../../../trixie/copy/all/etc/apt/apt.conf.d
\ No newline at end of file

diff --git a/testing/copy/all/etc/hosts b/testing/copy/all/etc/hosts
index bd0fd44f54bbda858009beb3df086ac53dd6a880..122385e4da5c4ba2fd71c7f0441412a8ca914e01 120000 (symlink)
--- a/testing/copy/all/etc/hosts
+++ b/testing/copy/all/etc/hosts
@@ -1 +1 @@
-../../../../bookworm/copy/all/etc/hosts
\ No newline at end of file
+../../../../trixie/copy/all/etc/hosts
\ No newline at end of file

diff --git a/testing/copy/all/home b/testing/copy/all/home
index 0016e7438d2fd0f328050792e21ff4cf59d78328..25cc51dc560a62b39f74f35d576f6c851d09868b 120000 (symlink)
--- a/testing/copy/all/home
+++ b/testing/copy/all/home
@@ -1 +1 @@
-../../../bookworm/copy/all/home
\ No newline at end of file
+../../../trixie/copy/all/home
\ No newline at end of file

diff --git a/testing/copy/all/root b/testing/copy/all/root
index ab75fb119fd4574662986389351c38b1884f8806..929f606782c19437f4369bf5dadb46171db7f16d 120000 (symlink)
--- a/testing/copy/all/root
+++ b/testing/copy/all/root
@@ -1 +1 @@
-../../../bookworm/copy/all/root
\ No newline at end of file
+../../../trixie/copy/all/root
\ No newline at end of file

diff --git a/testing/scripts/_setup_secrets_user.sh b/testing/scripts/_setup_secrets_user.sh
index 634f4fcc691b00f6da7e19fa5d22166def118ed0..8d3f9bd63dae64a5e443e6c58dab98e26cc038da 100644 (file)
--- a/testing/scripts/_setup_secrets_user.sh
+++ b/testing/scripts/_setup_secrets_user.sh
@@ -31,7 +31,7 @@ echo "\nSetting up ~/.ssh"
 cp -a "${PATH_SECRETS_SSH}" "${PATH_USER_SSH}"
 eval $(ssh-agent)
 stty -echo
-trapp stty +echo
+trapp stty echo
 retry_until 1 'echo ""' 'ssh-add -q' 'echo "Aborting due to ssh-add error"'
 stty echo
 trapp

diff --git a/testing/scripts/from_older_upgrade.sh b/testing/scripts/from_older_upgrade.sh
new file mode 120000 (symlink)
index 0000000..437779a
--- /dev/null
+++ b/testing/scripts/from_older_upgrade.sh
@@ -0,0 +1 @@
+../../trixie/scripts/from_older_upgrade.sh
\ No newline at end of file

diff --git a/testing/scripts/lib/INSTALLER_VERSION b/testing/scripts/lib/INSTALLER_VERSION
index 74e85c535fabb387b813caa99b200b775afa4664..21096015c902f6699929d017f550cddf02819aaa 120000 (symlink)
--- a/testing/scripts/lib/INSTALLER_VERSION
+++ b/testing/scripts/lib/INSTALLER_VERSION
@@ -1 +1 @@
-../../../bookworm/scripts/lib/INSTALLER_VERSION
\ No newline at end of file
+../../../trixie/scripts/lib/INSTALLER_VERSION
\ No newline at end of file

diff --git a/testing/scripts/lib/abort b/testing/scripts/lib/abort
index 55742334a709031ce309b602d5b14503c3ead109..76dab43481389c1c4791f53c253c757b7cfa0e55 120000 (symlink)
--- a/testing/scripts/lib/abort
+++ b/testing/scripts/lib/abort
@@ -1 +1 @@
-../../../bookworm/scripts/lib/abort
\ No newline at end of file
+../../../trixie/scripts/lib/abort
\ No newline at end of file

diff --git a/testing/scripts/lib/check_finished_marker b/testing/scripts/lib/check_finished_marker
index d8daf8fb2d39a13e724b45ece44d17377f1d5d61..ce96ad410ebd3c4eb8eb0bd9771a10dd822c980f 120000 (symlink)
--- a/testing/scripts/lib/check_finished_marker
+++ b/testing/scripts/lib/check_finished_marker
@@ -1 +1 @@
-../../../bookworm/scripts/lib/check_finished_marker
\ No newline at end of file
+../../../trixie/scripts/lib/check_finished_marker
\ No newline at end of file

diff --git a/testing/scripts/lib/constants_etc b/testing/scripts/lib/constants_etc
index 5c4073f87a63da91a32bf4653c050f590e5fcff3..a2af76ec025d5149387d31f625cbc2be9ee4b949 120000 (symlink)
--- a/testing/scripts/lib/constants_etc
+++ b/testing/scripts/lib/constants_etc
@@ -1 +1 @@
-../../../bookworm/scripts/lib/constants_etc
\ No newline at end of file
+../../../trixie/scripts/lib/constants_etc
\ No newline at end of file

diff --git a/testing/scripts/lib/constants_finished b/testing/scripts/lib/constants_finished
index ec93895319f4310bc47b0747b05597863d9c5649..0ece9e9ac06de08ab66ff4f16814fe402771d71a 120000 (symlink)
--- a/testing/scripts/lib/constants_finished
+++ b/testing/scripts/lib/constants_finished
@@ -1 +1 @@
-../../../bookworm/scripts/lib/constants_finished
\ No newline at end of file
+../../../trixie/scripts/lib/constants_finished
\ No newline at end of file

diff --git a/testing/scripts/lib/constants_repopaths b/testing/scripts/lib/constants_repopaths
index d796f1ce36382eb85281040e346002ac9318ca4f..c9d7aa0da64cb132bb1a015e017fdf0d5842990c 120000 (symlink)
--- a/testing/scripts/lib/constants_repopaths
+++ b/testing/scripts/lib/constants_repopaths
@@ -1 +1 @@
-../../../bookworm/scripts/lib/constants_repopaths
\ No newline at end of file
+../../../trixie/scripts/lib/constants_repopaths
\ No newline at end of file

diff --git a/testing/scripts/lib/constants_ssh b/testing/scripts/lib/constants_ssh
index b7110253b3f0a4fdc998bab6b9bac7d6a933aa38..53f0a7e4acc5cef69e4016d6b4006b2d7ac3027c 120000 (symlink)
--- a/testing/scripts/lib/constants_ssh
+++ b/testing/scripts/lib/constants_ssh
@@ -1 +1 @@
-../../../bookworm/scripts/lib/constants_ssh
\ No newline at end of file
+../../../trixie/scripts/lib/constants_ssh
\ No newline at end of file

diff --git a/testing/scripts/lib/constants_user b/testing/scripts/lib/constants_user
index 1e158993b30b8d131eb30276515294892168741a..3f1f61830daa27f65b1c146f76a9d39ad59baec3 120000 (symlink)
--- a/testing/scripts/lib/constants_user
+++ b/testing/scripts/lib/constants_user
@@ -1 +1 @@
-../../../bookworm/scripts/lib/constants_user
\ No newline at end of file
+../../../trixie/scripts/lib/constants_user
\ No newline at end of file

diff --git a/testing/scripts/lib/copy_dirtrees_of_tags b/testing/scripts/lib/copy_dirtrees_of_tags
index d33a1503eff7edfa23f0854196592bcc527a0dd3..c8af1ddf68a5e174a3db60d13f681f831f38401e 120000 (symlink)
--- a/testing/scripts/lib/copy_dirtrees_of_tags
+++ b/testing/scripts/lib/copy_dirtrees_of_tags
@@ -1 +1 @@
-../../../bookworm/scripts/lib/copy_dirtrees_of_tags
\ No newline at end of file
+../../../trixie/scripts/lib/copy_dirtrees_of_tags
\ No newline at end of file

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

diff --git a/testing/scripts/lib/ensure_packages_of_tags b/testing/scripts/lib/ensure_packages_of_tags
index 3c5fdf54e7f33ab292bc815c21deb901fb4daf01..220fddaf46e76e0baf6a855ca9f399f7b40a1fc3 120000 (symlink)
--- a/testing/scripts/lib/ensure_packages_of_tags
+++ b/testing/scripts/lib/ensure_packages_of_tags
@@ -1 +1 @@
-../../../bookworm/scripts/lib/ensure_packages_of_tags
\ No newline at end of file
+../../../trixie/scripts/lib/ensure_packages_of_tags
\ No newline at end of file

diff --git a/testing/scripts/lib/expect_n_args b/testing/scripts/lib/expect_n_args
index 5c37e825f5596e11b427057afebbbb2c759de212..9ec786a7dd0230c4dafaaeb1cd69539ed61d5b42 120000 (symlink)
--- a/testing/scripts/lib/expect_n_args
+++ b/testing/scripts/lib/expect_n_args
@@ -1 +1 @@
-../../../bookworm/scripts/lib/expect_n_args
\ No newline at end of file
+../../../trixie/scripts/lib/expect_n_args
\ No newline at end of file

diff --git a/testing/scripts/lib/init_packages b/testing/scripts/lib/init_packages
index 4556d4371ef60cc4703c078e22b4a3a753b5f4ab..345c04917e2516565f1c83e1ba96e30a8ffcd516 120000 (symlink)
--- a/testing/scripts/lib/init_packages
+++ b/testing/scripts/lib/init_packages
@@ -1 +1 @@
-../../../bookworm/scripts/lib/init_packages
\ No newline at end of file
+../../../trixie/scripts/lib/init_packages
\ No newline at end of file

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

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

diff --git a/testing/scripts/lib/path_tmp_timestamped b/testing/scripts/lib/path_tmp_timestamped
index 2f17d83dc2b7496bde550b5236a0cfd5fdb30813..a7ae07ce426c8499077d7675b8c0c6e37177e3aa 120000 (symlink)
--- a/testing/scripts/lib/path_tmp_timestamped
+++ b/testing/scripts/lib/path_tmp_timestamped
@@ -1 +1 @@
-../../../bookworm/scripts/lib/path_tmp_timestamped
\ No newline at end of file
+../../../trixie/scripts/lib/path_tmp_timestamped
\ No newline at end of file

diff --git a/testing/scripts/lib/put_finished_marker b/testing/scripts/lib/put_finished_marker
index 54b65502cea867a692d125c9f929e0f005fa3c39..8f3439ab2ede400ba0b121bf6e5ac4f2649be4cc 120000 (symlink)
--- a/testing/scripts/lib/put_finished_marker
+++ b/testing/scripts/lib/put_finished_marker
@@ -1 +1 @@
-../../../bookworm/scripts/lib/put_finished_marker
\ No newline at end of file
+../../../trixie/scripts/lib/put_finished_marker
\ No newline at end of file

diff --git a/testing/scripts/lib/set_hostname_and_hosts b/testing/scripts/lib/set_hostname_and_hosts
index 691795b6c4e7a4b846741e811a625c7a7fc7e82f..8d37cd4caa2e47dbfe1a11dc5b98b303060fed76 120000 (symlink)
--- a/testing/scripts/lib/set_hostname_and_hosts
+++ b/testing/scripts/lib/set_hostname_and_hosts
@@ -1 +1 @@
-../../../bookworm/scripts/lib/set_hostname_and_hosts
\ No newline at end of file
+../../../trixie/scripts/lib/set_hostname_and_hosts
\ No newline at end of file

diff --git a/testing/scripts/lib/setup_user b/testing/scripts/lib/setup_user
index 66571a271ac3d08f797498d74fb1eda7c7228e05..4095beb00f200b3c6e1ec14f2723c2f8d504d417 120000 (symlink)
--- a/testing/scripts/lib/setup_user
+++ b/testing/scripts/lib/setup_user
@@ -1 +1 @@
-../../../bookworm/scripts/lib/setup_user
\ No newline at end of file
+../../../trixie/scripts/lib/setup_user
\ No newline at end of file

diff --git a/testing/scripts/setup_desktop.sh b/testing/scripts/setup_desktop.sh
index 91765e718203abe79871f7380667c43bf084254b..b43be603d4ff3be7e4cd2533f4320faf4b0fcb4d 100755 (executable)
--- a/testing/scripts/setup_desktop.sh
+++ b/testing/scripts/setup_desktop.sh
@@ -13,12 +13,10 @@ cd $(dirname "$0")
 . lib/set_hostname_and_hosts
 
 PATH_NETWORK_INTERFACES="${PATH_ETC}/network/interfaces"
-PATH_ETC_APT="${PATH_ETC}/apt"
-PATH_ETC_APT_CONF=${PATH_ETC_APT}/apt.conf.d
+THINKPAD_NAMES="x220 w530 t490s"
 
 abort_if_offline
 
-THINKPAD_NAMES="x220 w530 t490s"
 get_system_class_for() {
     for THINKPAD_NAME in $THINKPAD_NAMES; do
         if [ "$1" = "${THINKPAD_NAME}" ]; then
@@ -41,22 +39,7 @@ expect_n_args 1 1 "(system name)" $@
 SYSTEM_NAME="$1"
 abort_if_illegal_system_name "${SYSTEM_NAME}"
 SYSTEM_CLASS_NAME="$(get_system_class_for ${SYSTEM_NAME})"
-TAG_ALL=all
-INSTALL_TAGS="${TAG_ALL} ${SYSTEM_CLASS_NAME} ${SYSTEM_NAME} user desktop"
-PATH_COPY_TAG_ALL="../copy/${TAG_ALL}"
-
-upgrade_from_older_release() {
-    apt_update_to_full_upgrade() {
-        apt-get -q -q update
-        apt-get -q -q -y -o Dpkg::Options::='--force-confnew' upgrade
-        apt-get -q -q -y -o Dpkg::Options::='--force-confnew' full-upgrade
-    }
-    apt_update_to_full_upgrade
-    cp "${PATH_COPY_TAG_ALL}${PATH_ETC_APT}/sources.list" "${PATH_ETC_APT}/"
-    apt-get clean
-    apt_update_to_full_upgrade
-    apt-get -q -q -y --purge autoremove
-}
+INSTALL_TAGS="all ${SYSTEM_CLASS_NAME} ${SYSTEM_NAME} user desktop"
 
 adopt_wifi_connection() {
     get_network_interfaces_last_wpa_value() {
@@ -75,15 +58,11 @@ adopt_wifi_connection() {
     fi
 }
 
-export DEBIAN_FRONTEND=noninteractive
-
 echo "\nUpgrading to testing."
-# For this step only very selectively prepare /etc/ files.
-cp "${PATH_COPY_TAG_ALL}${PATH_ETC_APT_CONF}/99_minimize_dependencies" "${PATH_ETC_APT_CONF}/"
-upgrade_from_older_release
+./from_older_upgrade.sh
 
 # NB: This needs to come before steps potentially overwriting /etc/network/interfaces.
-apt -y install network-manager
+apt-get -y install network-manager > /dev/null
 if [ "$(nmcli -f TYPE conn | grep 'wifi' | wc -l)" = "0" ]; then
     echo "\nChecking for existing wifi config in ${PATH_NETWORK_INTERFACES}."
     adopt_wifi_connection

diff --git a/trixie/aptmark b/trixie/aptmark
new file mode 120000 (symlink)
index 0000000..8e3a4c4
--- /dev/null
+++ b/trixie/aptmark
@@ -0,0 +1 @@
+../bookworm/aptmark
\ No newline at end of file

diff --git a/trixie/copy/all/etc/LINK_ME__localtime b/trixie/copy/all/etc/LINK_ME__localtime
new file mode 120000 (symlink)
index 0000000..49c646e
--- /dev/null
+++ b/trixie/copy/all/etc/LINK_ME__localtime
@@ -0,0 +1 @@
+../../../../bookworm/copy/all/etc/LINK_ME__localtime
\ No newline at end of file

diff --git a/trixie/copy/all/etc/apt/apt.conf.d b/trixie/copy/all/etc/apt/apt.conf.d
new file mode 120000 (symlink)
index 0000000..b8a462f
--- /dev/null
+++ b/trixie/copy/all/etc/apt/apt.conf.d
@@ -0,0 +1 @@
+../../../../../bookworm/copy/all/etc/apt/apt.conf.d
\ No newline at end of file

diff --git a/trixie/copy/all/etc/apt/sources.list b/trixie/copy/all/etc/apt/sources.list
new file mode 100644 (file)
index 0000000..c22075b
--- /dev/null
+++ b/trixie/copy/all/etc/apt/sources.list
@@ -0,0 +1,4 @@
+deb http://deb.debian.org/debian trixie main contrib non-free non-free-firmware
+deb http://security.debian.org/debian-security trixie-security main contrib non-free non-free-firmware
+deb http://deb.debian.org/debian trixie-updates main contrib non-free non-free-firmware
+deb http://ftp.debian.org/debian trixie-backports main contrib non-free non-free-firmware

diff --git a/trixie/copy/all/etc/hosts b/trixie/copy/all/etc/hosts
new file mode 120000 (symlink)
index 0000000..bd0fd44
--- /dev/null
+++ b/trixie/copy/all/etc/hosts
@@ -0,0 +1 @@
+../../../../bookworm/copy/all/etc/hosts
\ No newline at end of file

diff --git a/trixie/copy/all/home b/trixie/copy/all/home
new file mode 120000 (symlink)
index 0000000..0016e74
--- /dev/null
+++ b/trixie/copy/all/home
@@ -0,0 +1 @@
+../../../bookworm/copy/all/home
\ No newline at end of file

diff --git a/trixie/copy/all/root b/trixie/copy/all/root
new file mode 120000 (symlink)
index 0000000..ab75fb1
--- /dev/null
+++ b/trixie/copy/all/root
@@ -0,0 +1 @@
+../../../bookworm/copy/all/root
\ No newline at end of file

diff --git a/trixie/copy/catgirl b/trixie/copy/catgirl
new file mode 120000 (symlink)
index 0000000..dc216f8
--- /dev/null
+++ b/trixie/copy/catgirl
@@ -0,0 +1 @@
+../../bookworm/copy/catgirl
\ No newline at end of file

diff --git a/trixie/copy/seedbox b/trixie/copy/seedbox
new file mode 120000 (symlink)
index 0000000..6249719
--- /dev/null
+++ b/trixie/copy/seedbox
@@ -0,0 +1 @@
+../../bookworm/copy/seedbox
\ No newline at end of file

diff --git a/trixie/copy/server b/trixie/copy/server
new file mode 120000 (symlink)
index 0000000..8ae4636
--- /dev/null
+++ b/trixie/copy/server
@@ -0,0 +1 @@
+../../bookworm/copy/server/
\ No newline at end of file

diff --git a/trixie/scripts/from_older_upgrade.sh b/trixie/scripts/from_older_upgrade.sh
new file mode 100755 (executable)
index 0000000..811f61c
--- /dev/null
+++ b/trixie/scripts/from_older_upgrade.sh
@@ -0,0 +1,23 @@
+#!/bin/sh
+set -e
+cd $(dirname "$0")
+. lib/constants_etc  # PATH_ETC
+
+PATH_ETC_APT="${PATH_ETC}/apt"
+PATH_ETC_APT_CONF=${PATH_ETC_APT}/apt.conf.d
+PATH_COPY_TAG='../copy/all'
+export DEBIAN_FRONTEND=noninteractive
+
+apt_update_to_full_upgrade() {
+    apt-get -q -q update
+    apt-get -q -q -y -o Dpkg::Options::='--force-confnew' upgrade
+    apt-get -q -q -y -o Dpkg::Options::='--force-confnew' full-upgrade
+}
+
+cp "${PATH_COPY_TAG}${PATH_ETC_APT_CONF}/99_minimize_dependencies" "${PATH_ETC_APT_CONF}/"
+apt_update_to_full_upgrade
+
+cp "${PATH_COPY_TAG}${PATH_ETC_APT}/sources.list" "${PATH_ETC_APT}/"
+apt-get clean
+apt_update_to_full_upgrade
+apt-get -q -q -y autopurge 

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

diff --git a/trixie/scripts/setup_catgirl.sh b/trixie/scripts/setup_catgirl.sh
new file mode 120000 (symlink)
index 0000000..34e99a8
--- /dev/null
+++ b/trixie/scripts/setup_catgirl.sh
@@ -0,0 +1 @@
+../../bookworm/scripts/setup_catgirl.sh
\ No newline at end of file

diff --git a/trixie/scripts/setup_seedbox.sh b/trixie/scripts/setup_seedbox.sh
new file mode 120000 (symlink)
index 0000000..bc78651
--- /dev/null
+++ b/trixie/scripts/setup_seedbox.sh
@@ -0,0 +1 @@
+../../bookworm/scripts/setup_seedbox.sh
\ No newline at end of file

diff --git a/trixie/scripts/setup_server.sh b/trixie/scripts/setup_server.sh
new file mode 120000 (symlink)
index 0000000..d4eabff
--- /dev/null
+++ b/trixie/scripts/setup_server.sh
@@ -0,0 +1 @@
+../../bookworm/scripts/setup_server.sh
\ No newline at end of file