diff --git a/CHANGELOG.md b/CHANGELOG.md index 1191ac5..4ab95bd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,18 @@ -## Release 0.X +## Release 1.0.0 ### Removed * No longer download Wheezy release. * gpxelinux cause it is no longer available in Debian package. +* Debian Jessie entries. ### Bullseye support -* Download current Debian Testing -* Basic preseed file. +* Download new Debian Stable − Bullseye. * Set new latecommand script (update packages,…). -* Add Cinnamon preseed (UEFI + LUKS). -* Add Gnome3 preseeds (UEFI + LUKS or UEFI). +* Preseed files : + * Default preseed file. + * Add Cinnamon preseed (UEFI + LUKS). + * Add Gnome3 preseeds (UEFI + LUKS or UEFI). + * Add compute node preseed. ### Improvement * Add an UEFI entry to manage specific partitions (see #16). diff --git a/README.md b/README.md index fe0e6cd..79396c4 100644 --- a/README.md +++ b/README.md @@ -72,18 +72,20 @@ 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 Buster (Stable) amd64 with additional firmwares (see [make_debian_initrd_with_firmware.sh][debian initrd with firmware script] script). - * Debian Buster (Stable) amd64 with additional firmwares and preseed file. - * Debian Buster (Stable) amd64 + UEFI for minions with preseed (Cinnamon as default GUI). - * Debian Buster (Stable) amd64 + UEFI + LUKS for minions with preseed (Cinnamon as default GUI). - * Debian Buster (Stable) amd64 + UEFI + LUKS for minions with preseed (Gnome3 as default GUI). - * Debian Stretch (oldStable) amd64 with additional firmwares (see [make_debian_initrd_with_firmware.sh][debian initrd with firmware script] script). - * Debian Stretch (oldStable) amd64 with additional firmwares and preseed file. - * Debian Stretch (oldStable) amd64 for minions with preseed (Mate as default GUI). - * Debian Stretch (oldStable) amd64 for compute nodes with preseed. - * Debian Jessie (oldoldStable) amd64 with additional firmwares (see [make_debian_initrd_with_firmware.sh][debian initrd with firmware script] script). - * Debian Jessie (oldoldStable) amd64 with additional firmwares and preseed file. - * Debian Jessie (oldoldStable) i386. + * 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 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. @@ -145,11 +147,6 @@ Preseeding provides a way to set answers to questions asked by the Debian-Instal * Download and extract a _latecommand_ archive from [this repository][debian latecommand description]. * Run the script from this archive. -* Specific to Debian Jessie and older : - * Select **ssh-server** and **standard** in _tasksel_ for installation. - * Add a repository for Puppet (http://apt.puppetlabs.com) and the GPG key. - * Add additional packages : **tftp-hpa** (to be able to download the [latecommand archive from the PXE server][debian latecommand howto]). - ------ **lv_free - /mnt/free** @@ -157,7 +154,7 @@ Preseeding provides a way to set answers to questions asked by the Debian-Instal #### Specific configurations * You can choose a desktop environment : - * Debian Stable (aka Buster) : Cinnamon or Gnome3 + * Debian Stable (aka Bullseye) : Cinnamon or Gnome3 * Partitionning differences for Debian with a desktop environment : | Device | Mount point | Size (Min - Max) | Description | @@ -200,7 +197,6 @@ See the [scripts's README.md][scripts readme.md] file for more informations. [debian menu.cfg]: ./config/debian/menu.cfg [preseed informations]: https://wiki.debian.org/DebianInstaller/Preseed [debian sources]: https://sources.debian.org/ -[preseed jessie]: ./preseed/debian/jessie/preseed.cfg "Debian Jessie preseed" [scripts readme.md]: ./scripts/README.md "scripts's README.md for tftpboot" [debian initrd with firmware script]: ./scripts/README.md#make_debian_initrd_with_firmwaresh "informations about the Debian's initrd with additional firmwares" [debian latecommand description]: ./scripts/README.md#debian-late_command "informations about the Debian's late_command script" diff --git a/preseed/debian/jessie/preseed.cfg b/archives/preseed/debian/jessie/preseed.cfg similarity index 100% rename from preseed/debian/jessie/preseed.cfg rename to archives/preseed/debian/jessie/preseed.cfg diff --git a/preseed/debian/jessie/preseed_cinnamon.cfg b/archives/preseed/debian/jessie/preseed_cinnamon.cfg similarity index 100% rename from preseed/debian/jessie/preseed_cinnamon.cfg rename to archives/preseed/debian/jessie/preseed_cinnamon.cfg diff --git a/preseed/debian/jessie/preseed_gnome.cfg b/archives/preseed/debian/jessie/preseed_gnome.cfg similarity index 100% rename from preseed/debian/jessie/preseed_gnome.cfg rename to archives/preseed/debian/jessie/preseed_gnome.cfg diff --git a/preseed/debian/jessie/preseed_mate.cfg b/archives/preseed/debian/jessie/preseed_mate.cfg similarity index 100% rename from preseed/debian/jessie/preseed_mate.cfg rename to archives/preseed/debian/jessie/preseed_mate.cfg diff --git a/preseed/debian/wheezy/preseed.cfg b/archives/preseed/debian/wheezy/preseed.cfg similarity index 100% rename from preseed/debian/wheezy/preseed.cfg rename to archives/preseed/debian/wheezy/preseed.cfg diff --git a/scripts/latecommand/jessie/etc/logrotate.conf b/archives/scripts/latecommand/jessie/etc/logrotate.conf similarity index 100% rename from scripts/latecommand/jessie/etc/logrotate.conf rename to archives/scripts/latecommand/jessie/etc/logrotate.conf diff --git a/scripts/latecommand/jessie/etc/logrotate.d/aptitude b/archives/scripts/latecommand/jessie/etc/logrotate.d/aptitude similarity index 100% rename from scripts/latecommand/jessie/etc/logrotate.d/aptitude rename to archives/scripts/latecommand/jessie/etc/logrotate.d/aptitude diff --git a/scripts/latecommand/jessie/etc/logrotate.d/dpkg b/archives/scripts/latecommand/jessie/etc/logrotate.d/dpkg similarity index 100% rename from scripts/latecommand/jessie/etc/logrotate.d/dpkg rename to archives/scripts/latecommand/jessie/etc/logrotate.d/dpkg diff --git a/scripts/latecommand/jessie/etc/logrotate.d/rsyslog b/archives/scripts/latecommand/jessie/etc/logrotate.d/rsyslog similarity index 100% rename from scripts/latecommand/jessie/etc/logrotate.d/rsyslog rename to archives/scripts/latecommand/jessie/etc/logrotate.d/rsyslog diff --git a/scripts/latecommand/jessie/etc/rsyslog.conf b/archives/scripts/latecommand/jessie/etc/rsyslog.conf similarity index 100% rename from scripts/latecommand/jessie/etc/rsyslog.conf rename to archives/scripts/latecommand/jessie/etc/rsyslog.conf diff --git a/scripts/latecommand/jessie/etc/rsyslog.d/99syslog.conf b/archives/scripts/latecommand/jessie/etc/rsyslog.d/99syslog.conf similarity index 100% rename from scripts/latecommand/jessie/etc/rsyslog.d/99syslog.conf rename to archives/scripts/latecommand/jessie/etc/rsyslog.d/99syslog.conf diff --git a/scripts/latecommand/post.jessie.sh b/archives/scripts/latecommand/post.jessie.sh similarity index 100% rename from scripts/latecommand/post.jessie.sh rename to archives/scripts/latecommand/post.jessie.sh diff --git a/config/debian/menu.cfg b/config/debian/menu.cfg index 5c999d5..3ce1ebe 100644 --- a/config/debian/menu.cfg +++ b/config/debian/menu.cfg @@ -1,57 +1,30 @@ MENU BACKGROUND /config/debian/debian_background.jpg label stableFirmware - menu label Debian Buster amd64 ^Firmwares - kernel installer/debian/buster/amd64/linux - append vga=normal initrd=installer/debian/buster/amd64/initrd_firm.xz -- quiet -label stableAuto - menu label Debian B^uster amd64 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.cfg -label stableUefiCinnamon - menu label Debian Buster Cinnamon amd64 + UEFI 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.cfg -label stableCinnamonCrypto - 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 -label stableGnomeCrypto - menu label Debian Buster ^Gnome + 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.gnome.uefi.cipher.cfg - -label separator - menu label --- -label testingFirmware 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 testingAuto +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 testingComputeNode +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 testingGnomeCrypto +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 testingCinnamonCrypto +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 testingGnome +label stableGnome menu label Debian Bullseye Gnome3 + UEFI WITH PRESEED kernel installer/debian/bullseye/amd64/linux IPAPPEND 2 @@ -59,21 +32,45 @@ label testingGnome 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 +label oldstableAuto + menu label Debian B^uster amd64 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.cfg +label oldstableUefiCinnamon + menu label Debian Buster Cinnamon amd64 + UEFI 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.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 +label oldstableGnomeCrypto + menu label Debian Buster ^Gnome + 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.gnome.uefi.cipher.cfg + +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 oldstableAuto +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 oldstableMate - menu label Debian stretch ^Mate 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_mate.cfg -label oldstableComputeNode +label oldoldstableComputeNode menu label Debian stretch amd64 for compute node PRESEED kernel installer/debian/stretch/amd64/linux IPAPPEND 2 @@ -81,22 +78,7 @@ label oldstableComputeNode label separator menu label --- -label oldoldstableFirmware - menu label Debian jessie amd64 Firmwares - kernel installer/debian/jessie/amd64/linux - append vga=normal initrd=installer/debian/jessie/amd64/initrd_firm.xz -- quiet -label oldoldstableAuto - menu label Debian jessie amd64 PRESEED - kernel installer/debian/jessie/amd64/linux - IPAPPEND 2 - append vga=normal initrd=installer/debian/jessie/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/jessie/preseed.cfg -label oldoldstableI386 - menu label Debian jessie ^i386 - kernel installer/debian/jessie/i386/linux - append vga=normal initrd=installer/debian/jessie/i386/initrd.gz -- quiet -label separator - menu label --- label unstableAmd64 menu label Debian ^sid amd64 kernel installer/debian/sid/amd64/linux @@ -113,6 +95,7 @@ label unstableCrypt label separator menu label --- + label mainmenu menu label ^Back.. menu exit diff --git a/scripts/README.md b/scripts/README.md index 4936e0e..6ca9187 100644 --- a/scripts/README.md +++ b/scripts/README.md @@ -18,7 +18,7 @@ Set of scripts to download and generate necessary files to allow differents GNU/ ### download_debian.sh The script will provide netboot installers for all Debian (>=oldStable) for both **i386** and **amd64** : * Store the files to **/srv/tftp** (default). - * Download Debian Linux kernel and initrd files for all Debian distributions (Stable : **Stretch**; Testing : **Buster**; oldStable : **Jessie**; Unstable : **Sid**) and for **i386** and **amd64** architectures. + * Download Debian Linux kernel and initrd files for all Debian distributions (Stable : **Bullseye**; oldStable : **Buster**; oldoldStable : **Stretch**; Unstable : **Sid**) and for **i386** and **amd64** architectures. * Offer an example menu file to use with a TFTP server (default_path/installer/debian/menu.cfg.example). ### download_ubuntu.sh @@ -31,7 +31,7 @@ The script will provide netboot installers for the latest LTS and latest advance The script will provide Debian's netboot installers with **additionnals firmwares** for all Debian (>=oldStable) for **amd64** only : * Store the files to **/srv/tftp** (default). * Store temp files to **/tmp/tmp.XXXXXXXXXX** (with `mktemp`). - * Download Debian's initrd files for all Debian distributions (Stable : **Stretch**; Testing : **Buster**; oldStable : **Jessie**; Unstable : **Sid**) for **amd64** architecture only. + * Download Debian's initrd files for all Debian distributions (Stable : **Bullseye**; oldStable : **Buster**; oldoldStable : **Stretch**; Unstable : **Sid**) for **amd64** architecture only. * Download additionnals firmwares : * **bnx2** : For Broadcom NetXtremeII network adapters. * **linux-nonfree** : For Tigon network adapters. @@ -55,24 +55,11 @@ Some useful configurations after a Debian installation : * Permit root SSH login with password (no standard user…). * … -Specific to Debian Stretch : - * Add python-apt (Ansible dependencie). +Specific to Debian Bullseye : + * Add python3-apt (Ansible dependency). -Specific to Debian Jessie and older : - * Smarter rsyslog (more directories and less files in **/var/log**). - * Shorter configuration file and use more files from /etc/rsyslog.d/ - * Move log files to directory : - * _kern_ logs from /var/log/kern.log to __/var/log/kernel/kernel.log__ - * _user_ logs from /var/log/user.log to __/var/log/security/user.log__ - * _mail_ logs from /var/log/mail.… to __/var/log/mail/mail.…__ - * _daemon_ logs from /var/log/daemon.log to __/var/log/syslog/daemon.log__ - * _auth_ logs from /var/log/auth.log to __/var/log/security/auth.log__ - * _lpr_ logs from/var/log/lpr.log to __/var/log/lpr/lpr.log__ - * _cron_ logs from /var/log/cron.log to __/var/log/cron/cron.log__ - * _localX_ logs from /var/log/localX.log to __/var/log/syslog/localX.log__ - * _syslog_ logs from /var/log/syslog.log to __/var/log/syslog/syslog.log__ - * _authpriv_ logs from … to __/var/log/security/authpriv.log__ - * Add puppet package. +Specific to Debian Stretch and Buster : + * Add python-apt (Ansible dependency). #### How-to use it * First, make an archive of the script and directories : diff --git a/scripts/download_debian.sh b/scripts/download_debian.sh index 9a00ef5..33e9eca 100755 --- a/scripts/download_debian.sh +++ b/scripts/download_debian.sh @@ -1,10 +1,9 @@ #!/bin/bash # This script do the following: -# Download Debian Stable (Buster) -# Download Debian Testing (Bullseye) -# Download Debian oldStable (Stretch) -# Download Debian oldoldStable (Jessie) +# Download Debian Stable (Bullseye) +# Download Debian oldStable (Buster) +# Download Debian oldoldStable (Stretch) # Download Debian Unstable (Sid) # Make an PXE's config file (aka menu.cfg) @@ -22,7 +21,7 @@ mkdir -p "${DEBIAN_INSTALLER_DIR}" rm -f "${DEBIAN_CONFIG_PXE}" touch "${DEBIAN_CONFIG_PXE}" -for DISTRO in buster bullseye stretch jessie sid; do # For ALL Debian's version +for DISTRO in bullseye buster stretch sid; do # For ALL Debian's version for ARCH in amd64 i386; do # For all classic architecture # Create and go into directory diff --git a/scripts/latecommand.tar.gz b/scripts/latecommand.tar.gz index e2dcabf..717a5ff 100644 Binary files a/scripts/latecommand.tar.gz and b/scripts/latecommand.tar.gz differ diff --git a/scripts/make_debian_initrd_with_firmware.sh b/scripts/make_debian_initrd_with_firmware.sh index 283db9c..aa975ef 100755 --- a/scripts/make_debian_initrd_with_firmware.sh +++ b/scripts/make_debian_initrd_with_firmware.sh @@ -17,7 +17,7 @@ else TFTP_DIRECTORY="/srv/tftp" fi -for DISTRO in buster bullseye stretch jessie sid; do # For ALL Debian's version +for DISTRO in bullseye buster stretch sid; do # For ALL Debian's version TEMP_DIR=$(mktemp -d) pushd "${TEMP_DIR}" > /dev/null