From 60cbc8dc5c02be0a84a8f47209fde14fd7819b99 Mon Sep 17 00:00:00 2001 From: Christian Heller Date: Tue, 22 Apr 2025 08:19:36 +0200 Subject: [PATCH] Add trixie. --- testing/aptmark/all | 2 +- testing/aptmark/user | 2 +- testing/copy/all/__home/plom/.bash_profile | 1 - testing/copy/all/__home/plom/.bashrc | 1 - .../copy/all/__home/plom/.local/bin/LINK_ME | 2 -- .../__home/plom/.plomlib/file_dot_variants | 1 - testing/copy/all/__home/plom/.profile | 1 - testing/copy/all/__root/.bash_profile | 1 - testing/copy/all/__root/.bashrc | 1 - testing/copy/all/__root/.local | 1 - testing/copy/all/__root/.plomlib | 1 - testing/copy/all/__root/.profile | 1 - testing/copy/all/__root/.shell_prompt_color | 1 - .../apt/__apt.conf.d/99_minimize_dependencies | 1 - testing/copy/all/etc/apt/apt.conf.d | 2 +- testing/copy/all/etc/hosts | 2 +- testing/copy/all/home | 2 +- testing/copy/all/root | 2 +- testing/scripts/_setup_secrets_user.sh | 2 +- testing/scripts/from_older_upgrade.sh | 1 + testing/scripts/lib/INSTALLER_VERSION | 2 +- testing/scripts/lib/abort | 2 +- testing/scripts/lib/check_finished_marker | 2 +- testing/scripts/lib/constants_etc | 2 +- testing/scripts/lib/constants_finished | 2 +- testing/scripts/lib/constants_repopaths | 2 +- testing/scripts/lib/constants_ssh | 2 +- testing/scripts/lib/constants_user | 2 +- testing/scripts/lib/copy_dirtrees_of_tags | 2 +- testing/scripts/lib/determine_ip | 1 - testing/scripts/lib/ensure_packages_of_tags | 2 +- testing/scripts/lib/expect_n_args | 2 +- testing/scripts/lib/init_packages | 2 +- testing/scripts/lib/install_aptmarkeds | 1 - testing/scripts/lib/mark_nonrequireds_auto | 1 - testing/scripts/lib/path_tmp_timestamped | 2 +- testing/scripts/lib/put_finished_marker | 2 +- testing/scripts/lib/set_hostname_and_hosts | 2 +- testing/scripts/lib/setup_user | 2 +- testing/scripts/setup_desktop.sh | 29 +++---------------- trixie/aptmark | 1 + trixie/copy/all/etc/LINK_ME__localtime | 1 + trixie/copy/all/etc/apt/apt.conf.d | 1 + trixie/copy/all/etc/apt/sources.list | 4 +++ trixie/copy/all/etc/hosts | 1 + trixie/copy/all/home | 1 + trixie/copy/all/root | 1 + trixie/copy/catgirl | 1 + trixie/copy/seedbox | 1 + trixie/copy/server | 1 + trixie/scripts/from_older_upgrade.sh | 23 +++++++++++++++ trixie/scripts/lib | 1 + trixie/scripts/setup_catgirl.sh | 1 + trixie/scripts/setup_seedbox.sh | 1 + trixie/scripts/setup_server.sh | 1 + 55 files changed, 68 insertions(+), 64 deletions(-) delete mode 120000 testing/copy/all/__home/plom/.bash_profile delete mode 120000 testing/copy/all/__home/plom/.bashrc delete mode 100644 testing/copy/all/__home/plom/.local/bin/LINK_ME delete mode 120000 testing/copy/all/__home/plom/.plomlib/file_dot_variants delete mode 120000 testing/copy/all/__home/plom/.profile delete mode 120000 testing/copy/all/__root/.bash_profile delete mode 120000 testing/copy/all/__root/.bashrc delete mode 120000 testing/copy/all/__root/.local delete mode 120000 testing/copy/all/__root/.plomlib delete mode 120000 testing/copy/all/__root/.profile delete mode 120000 testing/copy/all/__root/.shell_prompt_color delete mode 120000 testing/copy/all/etc/apt/__apt.conf.d/99_minimize_dependencies create mode 120000 testing/scripts/from_older_upgrade.sh delete mode 120000 testing/scripts/lib/determine_ip delete mode 120000 testing/scripts/lib/install_aptmarkeds delete mode 120000 testing/scripts/lib/mark_nonrequireds_auto create mode 120000 trixie/aptmark create mode 120000 trixie/copy/all/etc/LINK_ME__localtime create mode 120000 trixie/copy/all/etc/apt/apt.conf.d create mode 100644 trixie/copy/all/etc/apt/sources.list create mode 120000 trixie/copy/all/etc/hosts create mode 120000 trixie/copy/all/home create mode 120000 trixie/copy/all/root create mode 120000 trixie/copy/catgirl create mode 120000 trixie/copy/seedbox create mode 120000 trixie/copy/server create mode 100755 trixie/scripts/from_older_upgrade.sh create mode 120000 trixie/scripts/lib create mode 120000 trixie/scripts/setup_catgirl.sh create mode 120000 trixie/scripts/setup_seedbox.sh create mode 120000 trixie/scripts/setup_server.sh diff --git a/testing/aptmark/all b/testing/aptmark/all index 1913f5e..02ff91d 120000 --- 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 41adec5..6fe2545 120000 --- 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 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 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 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 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 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 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 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 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 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 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 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 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 b8a462f..a21609b 120000 --- 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 bd0fd44..122385e 120000 --- 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 0016e74..25cc51d 120000 --- 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 ab75fb1..929f606 120000 --- 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 634f4fc..8d3f9bd 100644 --- 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 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 74e85c5..2109601 120000 --- 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 5574233..76dab43 120000 --- 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 d8daf8f..ce96ad4 120000 --- 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 5c4073f..a2af76e 120000 --- 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 ec93895..0ece9e9 120000 --- 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 d796f1c..c9d7aa0 120000 --- 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 b711025..53f0a7e 120000 --- 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 1e15899..3f1f618 120000 --- 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 d33a150..c8af1dd 120000 --- 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 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 3c5fdf5..220fdda 120000 --- 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 5c37e82..9ec786a 120000 --- 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 4556d43..345c049 120000 --- 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 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 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 2f17d83..a7ae07c 120000 --- 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 54b6550..8f3439a 120000 --- 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 691795b..8d37cd4 120000 --- 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 66571a2..4095beb 120000 --- 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 91765e7..b43be60 100755 --- 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 -- 2.30.2