From 7c00194e7d2d8abc2abe31be73730e6c7c6fd031 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gardais=20J=C3=A9r=C3=A9my?= Date: Fri, 5 May 2023 14:02:57 +0200 Subject: [PATCH] Remove/rename everything related to Stretch As Debian Stretch installer is no longer available for download, the script and tftpd fail with Stretch. --- config/debian/menu.cfg | 18 ------------------ preseed/debian/{ => old}/stretch/preseed.cfg | 0 .../stretch/preseed.cinnamon.uefi.cfg | 0 .../{ => old}/stretch/preseed.gnome.uefi.cfg | 0 .../stretch/preseed.gnome.uefi.cipher.cfg | 0 .../{ => old}/stretch/preseed_cinnamon.cfg | 0 .../{ => old}/stretch/preseed_computenode.cfg | 0 .../debian/{ => old}/stretch/preseed_mate.cfg | 0 scripts/download_debian.sh | 3 +-- scripts/latecommand/{ => old}/post.stretch.sh | 0 .../etc/apt/apt.conf.d/25no-recommends.conf | 0 .../{ => old}/stretch/etc/logrotate.conf | 0 .../{ => old}/stretch/etc/logrotate.d/aptitude | 0 .../{ => old}/stretch/etc/logrotate.d/dpkg | 0 .../{ => old}/stretch/etc/logrotate.d/rsyslog | 0 .../{ => old}/stretch/etc/rsyslog.conf | 0 .../stretch/etc/rsyslog.d/00-global.conf | 0 .../etc/rsyslog.d/05-common-defaults.conf | 0 .../etc/rsyslog.d/10-local-modules.conf | 0 .../etc/rsyslog.d/50-default-rulesets.conf | 0 scripts/make_debian_initrd_with_firmware.sh | 4 ++-- 21 files changed, 3 insertions(+), 22 deletions(-) rename preseed/debian/{ => old}/stretch/preseed.cfg (100%) rename preseed/debian/{ => old}/stretch/preseed.cinnamon.uefi.cfg (100%) rename preseed/debian/{ => old}/stretch/preseed.gnome.uefi.cfg (100%) rename preseed/debian/{ => old}/stretch/preseed.gnome.uefi.cipher.cfg (100%) rename preseed/debian/{ => old}/stretch/preseed_cinnamon.cfg (100%) rename preseed/debian/{ => old}/stretch/preseed_computenode.cfg (100%) rename preseed/debian/{ => old}/stretch/preseed_mate.cfg (100%) rename scripts/latecommand/{ => old}/post.stretch.sh (100%) rename scripts/latecommand/{ => old}/stretch/etc/apt/apt.conf.d/25no-recommends.conf (100%) rename scripts/latecommand/{ => old}/stretch/etc/logrotate.conf (100%) rename scripts/latecommand/{ => old}/stretch/etc/logrotate.d/aptitude (100%) rename scripts/latecommand/{ => old}/stretch/etc/logrotate.d/dpkg (100%) rename scripts/latecommand/{ => old}/stretch/etc/logrotate.d/rsyslog (100%) rename scripts/latecommand/{ => old}/stretch/etc/rsyslog.conf (100%) rename scripts/latecommand/{ => old}/stretch/etc/rsyslog.d/00-global.conf (100%) rename scripts/latecommand/{ => old}/stretch/etc/rsyslog.d/05-common-defaults.conf (100%) rename scripts/latecommand/{ => old}/stretch/etc/rsyslog.d/10-local-modules.conf (100%) rename scripts/latecommand/{ => old}/stretch/etc/rsyslog.d/50-default-rulesets.conf (100%) diff --git a/config/debian/menu.cfg b/config/debian/menu.cfg index fae7a14..ae22f61 100644 --- a/config/debian/menu.cfg +++ b/config/debian/menu.cfg @@ -66,24 +66,6 @@ label oldstableGnomeCrypto label separator menu label --- -label oldoldstableFirmware - menu label Debian stretch amd64 Firmwares - kernel installer/debian/stretch/amd64/linux - append vga=normal initrd=installer/debian/stretch/amd64/initrd_firm.xz -- quiet -label oldoldstableAuto - menu label Debian stretch amd64 ^PRESEED - kernel installer/debian/stretch/amd64/linux - IPAPPEND 2 - append vga=normal initrd=installer/debian/stretch/amd64/initrd_firm.xz auto=true interface=auto netcfg/dhcp_timeout=60 netcfg/choose_interface=auto priority=critical preseed/url=tftp://129.20.203.27/preseed/debian/stretch/preseed.cfg -label oldoldstableComputeNode - menu label Debian stretch amd64 for compute node PRESEED - kernel installer/debian/stretch/amd64/linux - IPAPPEND 2 - append vga=normal initrd=installer/debian/stretch/amd64/initrd_firm.xz auto=true interface=auto netcfg/dhcp_timeout=60 netcfg/choose_interface=auto priority=critical preseed/url=tftp://129.20.203.27/preseed/debian/stretch/preseed_computenode.cfg - -label separator - menu label --- - label unstableAmd64 menu label Debian ^sid amd64 kernel installer/debian/sid/amd64/linux diff --git a/preseed/debian/stretch/preseed.cfg b/preseed/debian/old/stretch/preseed.cfg similarity index 100% rename from preseed/debian/stretch/preseed.cfg rename to preseed/debian/old/stretch/preseed.cfg diff --git a/preseed/debian/stretch/preseed.cinnamon.uefi.cfg b/preseed/debian/old/stretch/preseed.cinnamon.uefi.cfg similarity index 100% rename from preseed/debian/stretch/preseed.cinnamon.uefi.cfg rename to preseed/debian/old/stretch/preseed.cinnamon.uefi.cfg diff --git a/preseed/debian/stretch/preseed.gnome.uefi.cfg b/preseed/debian/old/stretch/preseed.gnome.uefi.cfg similarity index 100% rename from preseed/debian/stretch/preseed.gnome.uefi.cfg rename to preseed/debian/old/stretch/preseed.gnome.uefi.cfg diff --git a/preseed/debian/stretch/preseed.gnome.uefi.cipher.cfg b/preseed/debian/old/stretch/preseed.gnome.uefi.cipher.cfg similarity index 100% rename from preseed/debian/stretch/preseed.gnome.uefi.cipher.cfg rename to preseed/debian/old/stretch/preseed.gnome.uefi.cipher.cfg diff --git a/preseed/debian/stretch/preseed_cinnamon.cfg b/preseed/debian/old/stretch/preseed_cinnamon.cfg similarity index 100% rename from preseed/debian/stretch/preseed_cinnamon.cfg rename to preseed/debian/old/stretch/preseed_cinnamon.cfg diff --git a/preseed/debian/stretch/preseed_computenode.cfg b/preseed/debian/old/stretch/preseed_computenode.cfg similarity index 100% rename from preseed/debian/stretch/preseed_computenode.cfg rename to preseed/debian/old/stretch/preseed_computenode.cfg diff --git a/preseed/debian/stretch/preseed_mate.cfg b/preseed/debian/old/stretch/preseed_mate.cfg similarity index 100% rename from preseed/debian/stretch/preseed_mate.cfg rename to preseed/debian/old/stretch/preseed_mate.cfg diff --git a/scripts/download_debian.sh b/scripts/download_debian.sh index b0f64a1..cadecf3 100755 --- a/scripts/download_debian.sh +++ b/scripts/download_debian.sh @@ -4,7 +4,6 @@ # This script will download Debian netboot installer for both AMD64 and i368 # 1. Debian Stable (Bullseye) # 2. Debian oldStable (Buster) -# 3. Debian oldoldStable (Stretch) # 4. Debian Unstable (Sid) # and make a sample menu.cfg config file. # }}} @@ -130,7 +129,7 @@ Create ${DEBIAN_INSTALLER_DIR} tree." true > "${DEBIAN_CONFIG_PXE}" # Parse all Debian's distribution - for DISTRO in bullseye buster stretch sid; do # For "all" Debian's version + for DISTRO in bullseye buster sid; do # For "all" Debian's version ## Then parse architecture for ARCH in amd64 i386; do # For all classic architecture debug_message "Main FOR loop − \ diff --git a/scripts/latecommand/post.stretch.sh b/scripts/latecommand/old/post.stretch.sh similarity index 100% rename from scripts/latecommand/post.stretch.sh rename to scripts/latecommand/old/post.stretch.sh diff --git a/scripts/latecommand/stretch/etc/apt/apt.conf.d/25no-recommends.conf b/scripts/latecommand/old/stretch/etc/apt/apt.conf.d/25no-recommends.conf similarity index 100% rename from scripts/latecommand/stretch/etc/apt/apt.conf.d/25no-recommends.conf rename to scripts/latecommand/old/stretch/etc/apt/apt.conf.d/25no-recommends.conf diff --git a/scripts/latecommand/stretch/etc/logrotate.conf b/scripts/latecommand/old/stretch/etc/logrotate.conf similarity index 100% rename from scripts/latecommand/stretch/etc/logrotate.conf rename to scripts/latecommand/old/stretch/etc/logrotate.conf diff --git a/scripts/latecommand/stretch/etc/logrotate.d/aptitude b/scripts/latecommand/old/stretch/etc/logrotate.d/aptitude similarity index 100% rename from scripts/latecommand/stretch/etc/logrotate.d/aptitude rename to scripts/latecommand/old/stretch/etc/logrotate.d/aptitude diff --git a/scripts/latecommand/stretch/etc/logrotate.d/dpkg b/scripts/latecommand/old/stretch/etc/logrotate.d/dpkg similarity index 100% rename from scripts/latecommand/stretch/etc/logrotate.d/dpkg rename to scripts/latecommand/old/stretch/etc/logrotate.d/dpkg diff --git a/scripts/latecommand/stretch/etc/logrotate.d/rsyslog b/scripts/latecommand/old/stretch/etc/logrotate.d/rsyslog similarity index 100% rename from scripts/latecommand/stretch/etc/logrotate.d/rsyslog rename to scripts/latecommand/old/stretch/etc/logrotate.d/rsyslog diff --git a/scripts/latecommand/stretch/etc/rsyslog.conf b/scripts/latecommand/old/stretch/etc/rsyslog.conf similarity index 100% rename from scripts/latecommand/stretch/etc/rsyslog.conf rename to scripts/latecommand/old/stretch/etc/rsyslog.conf diff --git a/scripts/latecommand/stretch/etc/rsyslog.d/00-global.conf b/scripts/latecommand/old/stretch/etc/rsyslog.d/00-global.conf similarity index 100% rename from scripts/latecommand/stretch/etc/rsyslog.d/00-global.conf rename to scripts/latecommand/old/stretch/etc/rsyslog.d/00-global.conf diff --git a/scripts/latecommand/stretch/etc/rsyslog.d/05-common-defaults.conf b/scripts/latecommand/old/stretch/etc/rsyslog.d/05-common-defaults.conf similarity index 100% rename from scripts/latecommand/stretch/etc/rsyslog.d/05-common-defaults.conf rename to scripts/latecommand/old/stretch/etc/rsyslog.d/05-common-defaults.conf diff --git a/scripts/latecommand/stretch/etc/rsyslog.d/10-local-modules.conf b/scripts/latecommand/old/stretch/etc/rsyslog.d/10-local-modules.conf similarity index 100% rename from scripts/latecommand/stretch/etc/rsyslog.d/10-local-modules.conf rename to scripts/latecommand/old/stretch/etc/rsyslog.d/10-local-modules.conf diff --git a/scripts/latecommand/stretch/etc/rsyslog.d/50-default-rulesets.conf b/scripts/latecommand/old/stretch/etc/rsyslog.d/50-default-rulesets.conf similarity index 100% rename from scripts/latecommand/stretch/etc/rsyslog.d/50-default-rulesets.conf rename to scripts/latecommand/old/stretch/etc/rsyslog.d/50-default-rulesets.conf diff --git a/scripts/make_debian_initrd_with_firmware.sh b/scripts/make_debian_initrd_with_firmware.sh index 0ee2a92..3317ac9 100755 --- a/scripts/make_debian_initrd_with_firmware.sh +++ b/scripts/make_debian_initrd_with_firmware.sh @@ -2,7 +2,7 @@ # Purpose {{{ # This script will build a new initrd with some extra firmwares. -# 1. Download Debian initrd (Bullseye, Buster, Stretch and Sid) +# 1. Download Debian initrd (Bullseye, Buster and Sid) # 2. Download firmwares # * bnx2 # * all non-free (for tigon) @@ -174,7 +174,7 @@ main() { # {{{ define_vars - for DISTRO in bullseye buster stretch sid; do # For ALL Debian's version + for DISTRO in bullseye buster sid; do # For ALL Debian's version debug_message "Main FOR loop − \ Manage initrd and firmwares for ${RED}${DISTRO}${COLOR_DEBUG} release."