diff --git a/README.md b/README.md index 66e313d..9eb6082 100644 --- a/README.md +++ b/README.md @@ -72,20 +72,13 @@ Contains the files which defines the PXE menu. The [first one][main menu.cfg] wi #### config/debian/menu.cfg 1. Provide PXE entries for : - * Debian Bullseye (Stable) amd64 with additional firmwares (see [make_debian_initrd_with_firmware.sh][debian initrd with firmware script] script). - * Debian Bullseye (Stable) amd64 with additional firmwares and preseed file. - * Debian Bullseye (Stable) amd64 for compute nodes with preseed. - * Debian Bullseye (Stable) amd64 + UEFI + LUKS for minions with preseed (Cinnamon as default GUI). - * Debian Bullseye (Stable) amd64 + UEFI + LUKS for minions with preseed (Gnome3 as default GUI). - * Debian Bullseye (Stable) amd64 + UEFI for minions with preseed (Gnome3 as default GUI). - * Debian Buster (oldStable) amd64 with additional firmwares (see [make_debian_initrd_with_firmware.sh][debian initrd with firmware script] script). - * Debian Buster (oldStable) amd64 with additional firmwares and preseed file. - * Debian Buster (oldStable) amd64 + UEFI for minions with preseed (Cinnamon as default GUI). - * Debian Buster (oldStable) amd64 + UEFI + LUKS for minions with preseed (Cinnamon as default GUI). - * Debian Buster (oldStable) amd64 + UEFI + LUKS for minions with preseed (Gnome3 as default GUI). - * Debian Stretch (oldoldStable) amd64 with additional firmwares (see [make_debian_initrd_with_firmware.sh][debian initrd with firmware script] script). - * Debian Stretch (oldoldStable) amd64 with additional firmwares and preseed file. - * Debian Stretch (oldoldStable) amd64 for compute nodes with preseed. + * Debian Bookworm (Stable) amd64 with additional firmwares (see [make_debian_initrd_with_firmware.sh][debian initrd with firmware script] script). + * Debian Bullseye (oldStable) amd64 with additional firmwares (see [make_debian_initrd_with_firmware.sh][debian initrd with firmware script] script). + * Debian Bullseye (oldStable) amd64 with additional firmwares and preseed file. + * Debian Bullseye (oldStable) amd64 for compute nodes with preseed. + * Debian Bullseye (oldStable) amd64 + UEFI + LUKS for minions with preseed (Cinnamon as default GUI). + * Debian Bullseye (oldStable) amd64 + UEFI + LUKS for minions with preseed (Gnome3 as default GUI). + * Debian Bullseye (oldStable) amd64 + UEFI for minions with preseed (Gnome3 as default GUI). * Debian Sid (unstable) amd64. * Debian Sid (unstable) amd64 with additional firmwares (see [make_debian_initrd_with_firmware.sh][debian initrd with firmware script] script). * Debian Sid (unstable) i386. diff --git a/config/debian/menu.cfg b/config/debian/menu.cfg index ae22f61..0b295bc 100644 --- a/config/debian/menu.cfg +++ b/config/debian/menu.cfg @@ -1,67 +1,42 @@ MENU BACKGROUND /config/debian/debian_background.jpg label stableFirmware - menu label Debian Bullseye amd64 Firmwares + menu label ^Debian Bookworm amd64 Firmwares kernel installer/debian/bullseye/amd64/linux append vga=normal initrd=installer/debian/bullseye/amd64/initrd_firm.xz -- quiet -label stableAuto - menu label Debian Bu^llseye amd64 PRESEED - kernel installer/debian/bullseye/amd64/linux - IPAPPEND 2 - append vga=normal initrd=installer/debian/bullseye/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/bullseye/preseed.cfg -label stableComputeNode - menu label Debian Bullseye amd64 for compute node PRESEED - kernel installer/debian/bullseye/amd64/linux - IPAPPEND 2 - append vga=normal initrd=installer/debian/bullseye/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/bullseye/preseed.computenode.cfg -label stableGnomeCrypto - menu label Debian Bullseye Gnome3 + UEFI + Cipher WITH PRESEED - kernel installer/debian/bullseye/amd64/linux - IPAPPEND 2 - APPEND vga=normal initrd=installer/debian/bullseye/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/bullseye/preseed.gnome.uefi.cipher.cfg -label stableCinnamonCrypto - menu label Debian Bullseye Cinnamon + UEFI + Cipher WITH PRESEED - kernel installer/debian/bullseye/amd64/linux - IPAPPEND 2 - APPEND vga=normal initrd=installer/debian/bullseye/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/bullseye/preseed.cinnamon.uefi.cipher.cfg -label stableGnome - menu label Debian Bullseye Gnome3 + UEFI WITH PRESEED - kernel installer/debian/bullseye/amd64/linux - IPAPPEND 2 - APPEND vga=normal initrd=installer/debian/bullseye/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/bullseye/preseed.gnome.uefi.cfg -label stableCinnamon - menu label Debian Bullseye Cinnamon + UEFI WITH PRESEED - kernel installer/debian/bullseye/amd64/linux - IPAPPEND 2 - APPEND vga=normal initrd=installer/debian/bullseye/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/bullseye/preseed.cinnamon.uefi.cfg label separator menu label --- label oldstableFirmware - menu label Debian Buster amd64 ^Firmwares - kernel installer/debian/buster/amd64/linux - append vga=normal initrd=installer/debian/buster/amd64/initrd_firm.xz -- quiet + menu label Debian Bullseye amd64 Firmwares + kernel installer/debian/bullseye/amd64/linux + append vga=normal initrd=installer/debian/bullseye/amd64/initrd_firm.xz -- quiet label oldstableAuto - menu label Debian B^uster amd64 PRESEED - kernel installer/debian/buster/amd64/linux + menu label Debian Bu^llseye amd64 PRESEED + kernel installer/debian/bullseye/amd64/linux IPAPPEND 2 - append vga=normal initrd=installer/debian/buster/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/buster/preseed.cfg -label oldstableUefiCinnamon - menu label Debian Buster Cinnamon amd64 + UEFI PRESEED - kernel installer/debian/buster/amd64/linux + append vga=normal initrd=installer/debian/bullseye/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/bullseye/preseed.cfg +label oldstableComputeNode + menu label Debian Bullseye amd64 for ^compute node PRESEED + kernel installer/debian/bullseye/amd64/linux IPAPPEND 2 - append vga=normal initrd=installer/debian/buster/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/buster/preseed.cinnamon.uefi.cfg -label oldstableCinnamonCrypto - menu label Debian Buster ^Cinnamon + UEFI + Cipher WITH PRESEED - kernel installer/debian/buster/amd64/linux - IPAPPEND 2 - APPEND vga=normal initrd=installer/debian/buster/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/buster/preseed.cinnamon.uefi.cipher.cfg + append vga=normal initrd=installer/debian/bullseye/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/bullseye/preseed.computenode.cfg label oldstableGnomeCrypto - menu label Debian Buster ^Gnome + UEFI + Cipher WITH PRESEED - kernel installer/debian/buster/amd64/linux + menu label Debian Bullseye Gnome3 + UEFI + Cipher WITH PRESEED + kernel installer/debian/bullseye/amd64/linux IPAPPEND 2 - APPEND vga=normal initrd=installer/debian/buster/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/buster/preseed.gnome.uefi.cipher.cfg + APPEND vga=normal initrd=installer/debian/bullseye/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/bullseye/preseed.gnome.uefi.cipher.cfg +label oldstableCinnamonCrypto + menu label Debian Bullseye Cinnamon + UEFI + Cipher WITH PRESEED + kernel installer/debian/bullseye/amd64/linux + IPAPPEND 2 + APPEND vga=normal initrd=installer/debian/bullseye/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/bullseye/preseed.cinnamon.uefi.cipher.cfg +label oldstableGnome + menu label Debian Bullseye Gnome3 + UEFI WITH PRESEED + kernel installer/debian/bullseye/amd64/linux + IPAPPEND 2 + APPEND vga=normal initrd=installer/debian/bullseye/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/bullseye/preseed.gnome.uefi.cfg label separator menu label --- diff --git a/preseed/debian/buster/preseed.cfg b/preseed/debian/old/buster/preseed.cfg similarity index 100% rename from preseed/debian/buster/preseed.cfg rename to preseed/debian/old/buster/preseed.cfg diff --git a/preseed/debian/buster/preseed.cinnamon.cfg b/preseed/debian/old/buster/preseed.cinnamon.cfg similarity index 100% rename from preseed/debian/buster/preseed.cinnamon.cfg rename to preseed/debian/old/buster/preseed.cinnamon.cfg diff --git a/preseed/debian/buster/preseed.cinnamon.uefi.cfg b/preseed/debian/old/buster/preseed.cinnamon.uefi.cfg similarity index 100% rename from preseed/debian/buster/preseed.cinnamon.uefi.cfg rename to preseed/debian/old/buster/preseed.cinnamon.uefi.cfg diff --git a/preseed/debian/buster/preseed.cinnamon.uefi.cipher.cfg b/preseed/debian/old/buster/preseed.cinnamon.uefi.cipher.cfg similarity index 100% rename from preseed/debian/buster/preseed.cinnamon.uefi.cipher.cfg rename to preseed/debian/old/buster/preseed.cinnamon.uefi.cipher.cfg diff --git a/preseed/debian/buster/preseed.computenode.cfg b/preseed/debian/old/buster/preseed.computenode.cfg similarity index 100% rename from preseed/debian/buster/preseed.computenode.cfg rename to preseed/debian/old/buster/preseed.computenode.cfg diff --git a/preseed/debian/buster/preseed.gnome.uefi.cfg b/preseed/debian/old/buster/preseed.gnome.uefi.cfg similarity index 100% rename from preseed/debian/buster/preseed.gnome.uefi.cfg rename to preseed/debian/old/buster/preseed.gnome.uefi.cfg diff --git a/preseed/debian/buster/preseed.gnome.uefi.cipher.cfg b/preseed/debian/old/buster/preseed.gnome.uefi.cipher.cfg similarity index 100% rename from preseed/debian/buster/preseed.gnome.uefi.cipher.cfg rename to preseed/debian/old/buster/preseed.gnome.uefi.cipher.cfg diff --git a/preseed/debian/buster/preseed.mate.cfg b/preseed/debian/old/buster/preseed.mate.cfg similarity index 100% rename from preseed/debian/buster/preseed.mate.cfg rename to preseed/debian/old/buster/preseed.mate.cfg diff --git a/scripts/download_debian.sh b/scripts/download_debian.sh index cadecf3..547bba1 100755 --- a/scripts/download_debian.sh +++ b/scripts/download_debian.sh @@ -2,9 +2,9 @@ # Purpose {{{ # This script will download Debian netboot installer for both AMD64 and i368 -# 1. Debian Stable (Bullseye) -# 2. Debian oldStable (Buster) -# 4. Debian Unstable (Sid) +# 1. Debian oldStable (Bookworm) +# 2. Debian oldStable (Bullseye) +# 3. Debian Unstable (Sid) # and make a sample menu.cfg config file. # }}} # Vars {{{ @@ -129,7 +129,7 @@ Create ${DEBIAN_INSTALLER_DIR} tree." true > "${DEBIAN_CONFIG_PXE}" # Parse all Debian's distribution - for DISTRO in bullseye buster sid; do # For "all" Debian's version + for DISTRO in bookworm bullseye 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/buster/etc/apt/apt.conf.d/25no-recommends.conf b/scripts/latecommand/old/buster/etc/apt/apt.conf.d/25no-recommends.conf similarity index 100% rename from scripts/latecommand/buster/etc/apt/apt.conf.d/25no-recommends.conf rename to scripts/latecommand/old/buster/etc/apt/apt.conf.d/25no-recommends.conf diff --git a/scripts/latecommand/buster/etc/apt/sources.list b/scripts/latecommand/old/buster/etc/apt/sources.list similarity index 100% rename from scripts/latecommand/buster/etc/apt/sources.list rename to scripts/latecommand/old/buster/etc/apt/sources.list diff --git a/scripts/latecommand/buster/etc/logrotate.conf b/scripts/latecommand/old/buster/etc/logrotate.conf similarity index 100% rename from scripts/latecommand/buster/etc/logrotate.conf rename to scripts/latecommand/old/buster/etc/logrotate.conf diff --git a/scripts/latecommand/buster/etc/logrotate.d/apt b/scripts/latecommand/old/buster/etc/logrotate.d/apt similarity index 100% rename from scripts/latecommand/buster/etc/logrotate.d/apt rename to scripts/latecommand/old/buster/etc/logrotate.d/apt diff --git a/scripts/latecommand/buster/etc/logrotate.d/aptitude b/scripts/latecommand/old/buster/etc/logrotate.d/aptitude similarity index 100% rename from scripts/latecommand/buster/etc/logrotate.d/aptitude rename to scripts/latecommand/old/buster/etc/logrotate.d/aptitude diff --git a/scripts/latecommand/buster/etc/logrotate.d/btmp b/scripts/latecommand/old/buster/etc/logrotate.d/btmp similarity index 100% rename from scripts/latecommand/buster/etc/logrotate.d/btmp rename to scripts/latecommand/old/buster/etc/logrotate.d/btmp diff --git a/scripts/latecommand/buster/etc/logrotate.d/dpkg b/scripts/latecommand/old/buster/etc/logrotate.d/dpkg similarity index 100% rename from scripts/latecommand/buster/etc/logrotate.d/dpkg rename to scripts/latecommand/old/buster/etc/logrotate.d/dpkg diff --git a/scripts/latecommand/buster/etc/logrotate.d/rsyslog b/scripts/latecommand/old/buster/etc/logrotate.d/rsyslog similarity index 100% rename from scripts/latecommand/buster/etc/logrotate.d/rsyslog rename to scripts/latecommand/old/buster/etc/logrotate.d/rsyslog diff --git a/scripts/latecommand/buster/etc/logrotate.d/wtmp b/scripts/latecommand/old/buster/etc/logrotate.d/wtmp similarity index 100% rename from scripts/latecommand/buster/etc/logrotate.d/wtmp rename to scripts/latecommand/old/buster/etc/logrotate.d/wtmp diff --git a/scripts/latecommand/buster/etc/rsyslog.conf b/scripts/latecommand/old/buster/etc/rsyslog.conf similarity index 100% rename from scripts/latecommand/buster/etc/rsyslog.conf rename to scripts/latecommand/old/buster/etc/rsyslog.conf diff --git a/scripts/latecommand/buster/etc/rsyslog.d/00-global.conf b/scripts/latecommand/old/buster/etc/rsyslog.d/00-global.conf similarity index 100% rename from scripts/latecommand/buster/etc/rsyslog.d/00-global.conf rename to scripts/latecommand/old/buster/etc/rsyslog.d/00-global.conf diff --git a/scripts/latecommand/buster/etc/rsyslog.d/05-common-defaults.conf b/scripts/latecommand/old/buster/etc/rsyslog.d/05-common-defaults.conf similarity index 100% rename from scripts/latecommand/buster/etc/rsyslog.d/05-common-defaults.conf rename to scripts/latecommand/old/buster/etc/rsyslog.d/05-common-defaults.conf diff --git a/scripts/latecommand/buster/etc/rsyslog.d/10-local-modules.conf b/scripts/latecommand/old/buster/etc/rsyslog.d/10-local-modules.conf similarity index 100% rename from scripts/latecommand/buster/etc/rsyslog.d/10-local-modules.conf rename to scripts/latecommand/old/buster/etc/rsyslog.d/10-local-modules.conf diff --git a/scripts/latecommand/buster/etc/rsyslog.d/50-default-rulesets.conf b/scripts/latecommand/old/buster/etc/rsyslog.d/50-default-rulesets.conf similarity index 100% rename from scripts/latecommand/buster/etc/rsyslog.d/50-default-rulesets.conf rename to scripts/latecommand/old/buster/etc/rsyslog.d/50-default-rulesets.conf diff --git a/scripts/latecommand/post.buster.sh b/scripts/latecommand/old/post.buster.sh similarity index 100% rename from scripts/latecommand/post.buster.sh rename to scripts/latecommand/old/post.buster.sh diff --git a/scripts/make_debian_initrd_with_firmware.sh b/scripts/make_debian_initrd_with_firmware.sh index 3317ac9..7aeb565 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 and Sid) +# 1. Download Debian initrd (Bookworm, Bullseye and Sid) # 2. Download firmwares # * bnx2 # * all non-free (for tigon) @@ -174,7 +174,7 @@ main() { # {{{ define_vars - for DISTRO in bullseye buster sid; do # For ALL Debian's version + for DISTRO in bookworm bullseye sid; do # For ALL Debian's version debug_message "Main FOR loop − \ Manage initrd and firmwares for ${RED}${DISTRO}${COLOR_DEBUG} release."