From 6d28c12b7feecc65808e14ad7748d7f0396ab72d Mon Sep 17 00:00:00 2001 From: Gardais Jeremy Date: Wed, 6 Sep 2017 16:08:44 +0200 Subject: [PATCH] Standard task is no longer install for Debian Stretch with preseed (see #14). --- CHANGELOG.md | 8 ++++++-- README.md | 27 ++++++++++++++------------- preseed/debian/stretch/preseed.cfg | 5 ++--- 3 files changed, 22 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1080ee2..bc31f08 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ +## Release 0.4.x +### Improvement +* Standard task is no longer install for Debian Stretch with preseed (see #14). + ## Release 0.4.0 -#### Features +### Features * Delete the extra partition for free space with the Debian's preseed (#2). * Add some backgrounds (#4). * Update Clonezilla and Gparted to their latest version. @@ -8,7 +12,7 @@ * Add an entry to install Debian Stable with Mate environnment for i386 computers. * New logrotate configuration for Debian Stretch (#12). -#### Fixes +### Fixes * Use the new IP address. * Use shellcheck to ensure POSIX compatibility. * Add information about update netboot installer after each point release (#5). diff --git a/README.md b/README.md index bf48d67..d00dee8 100644 --- a/README.md +++ b/README.md @@ -49,26 +49,26 @@ 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 Jessie (Stable) amd64. - * Debian Jessie (Stable) amd64 with additionnals firmwares (see [make_debian_initrd_with_firmware.sh][debian initrd with firmware script] script). - * Debian Jessie (Stable) amd64 with additionnals firmwares and preseed file. + * Debian Jessie (Stable) amd64 with additional firmwares (see [make_debian_initrd_with_firmware.sh][debian initrd with firmware script] script). + * Debian Jessie (Stable) amd64 with additional firmwares and preseed file. * Debian Jessie (Stable) amd64 for minions with preseed (Mate as default GUI). * Debian Jessie (Stable) amd64 for minions with preseed (Cinnamon as default GUI). * Debian Jessie (Stable) amd64 for minions with preseed (Gnome 3 as default GUI). * Debian Jessie (Stable) i386. * Debian Jessie (Stable) i386 with Mate as default GUI (for old manipulation computers). - * Debian Stretch (Testing) amd64 with additionnals firmwares (see [make_debian_initrd_with_firmware.sh][debian initrd with firmware script] script). - * Debian Stretch (Testing) amd64 with additionnals firmwares and preseed file. + * Debian Stretch (Testing) amd64 with additional firmwares (see [make_debian_initrd_with_firmware.sh][debian initrd with firmware script] script). + * Debian Stretch (Testing) amd64 with additional firmwares and preseed file. * Debian Stretch (Testing) amd64 for minions with preseed (Mate as default GUI). * Debian Stretch (Testing) amd64 for minions with preseed (Cinnamon as default GUI). * Debian Stretch (Testing) amd64 for minions with preseed (Gnome 3 as default GUI). * Debian Stretch (Testing) i386. - * Debian Wheezy (oldStable) amd64 with additionnals firmwares (see [make_debian_initrd_with_firmware.sh][debian initrd with firmware script] script). - * Debian Wheezy (oldStable) amd64 with additionnals firmwares and preseed file. - * Debian Wheezy (oldStable) amd64 with additionnals firmwares and preseed file for Cluster node. + * Debian Wheezy (oldStable) amd64 with additional firmwares (see [make_debian_initrd_with_firmware.sh][debian initrd with firmware script] script). + * Debian Wheezy (oldStable) amd64 with additional firmwares and preseed file. + * Debian Wheezy (oldStable) amd64 with additional firmwares and preseed file for Cluster node. * Debian Wheezy (oldStable) amd64 with preseed (Gnome 3 as default GUI). * Debian Wheezy (oldStable) i386. * Debian Sid (unstable) amd64. - * Debian Sid (unstable) amd64 with additionnals firmwares (see [make_debian_initrd_with_firmware.sh][debian initrd with firmware script] script). + * Debian Sid (unstable) amd64 with additional firmwares (see [make_debian_initrd_with_firmware.sh][debian initrd with firmware script] script). * Debian Sid (unstable) i386. 2. If you want to use with your own TFTPD server, you need te set your IP server ! Replace all occurrences of *129.20.203.27* by the IP of your TFTPD server to be able to load the preseed files ! @@ -91,7 +91,7 @@ Preseeding provides a way to set answers to questions asked by the Debian-Instal * Keyboard : fr-latin9 (French) * Hardware : * Network configuration (IP, hostname, domain) : automatic (from DHCP server) - * Load additionnals firmwares if availables. + * Load additional firmwares if availables. * Account : * Create a root account. * root password : SHA-256 hash of the password @@ -120,7 +120,7 @@ Preseeding provides a way to set answers to questions asked by the Debian-Instal * APT : * Installation from internet (repository : ftp.fr.debian.org) * Select **ssh-server** and **standard** in _tasksel_ for installation. - * Add additionnals packages : **tmux**, **zsh** and **tftp-hpa** (to be able to download the [latecommand archive from the PXE server][debian latecommand howto]). + * Add additional packages : **tftp-hpa** (to be able to download the [latecommand archive from the PXE server][debian latecommand howto]). * Bootloader : * Install Grub on the MBR of the first disk. * late_command @@ -130,8 +130,9 @@ Preseeding provides a way to set answers to questions asked by the Debian-Instal * 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 additionnal package : **puppet** + * Add additional packages : **puppet**, **tmux**, **zsh** and **tftp-hpa** (to be able to download the [latecommand archive from the PXE server][debian latecommand howto]). ------ @@ -172,7 +173,7 @@ See the [scripts's README.md][scripts readme.md] file for more informations. * In scripts to generate examples configuration files with the right IP address : `sudo find scripts/ -iname "*.sh" -type f -exec sed -i "s/129.20.203.27/111.222.333.444/g" {} \;` * Run scripts to download needed PXE files (see the [scripts's README.md][scripts readme.md] for more informations) : * Debian : `sudo ./scripts/download_debian.sh` - * Debian's initrd with additionnals firmwares : `sudo ./scripts/make_debian_initrd_with_firmware.sh` + * Debian's initrd with additional firmwares : `sudo ./scripts/make_debian_initrd_with_firmware.sh` * Ubuntu : `sudo ./scripts/download_ubuntu.sh` * Diagnostic tools (Memtest86+, GParted Live,…) : `sudo ./scripts/download_diag_tools.sh` * Clonezilla : `sudo ./scripts/download_clonezilla.sh` @@ -185,7 +186,7 @@ See the [scripts's README.md][scripts readme.md] file for more informations. [preseed jessie]: ./preseed/debian/jessie/preseed.cfg "Debian Jessie preseed" [preseed wheezy]: ./preseed/debian/wheezy/preseed.cfg "Debian Wheezy 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 additionnals firmwares" +[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" [debian latecommand howto]: ./scripts/README.md#how-to-use-it "how-to use the Debian's late_command" [debian latecommand post.sh script]: ./scripts/latecommand/post.sh diff --git a/preseed/debian/stretch/preseed.cfg b/preseed/debian/stretch/preseed.cfg index d93426a..3892c9b 100644 --- a/preseed/debian/stretch/preseed.cfg +++ b/preseed/debian/stretch/preseed.cfg @@ -284,11 +284,11 @@ d-i apt-setup/contrib boolean true ## Choose packages -tasksel tasksel/first multiselect ssh-server standard +tasksel tasksel/first multiselect ssh-server ## Individual additional packages to install # tftp-hpa to download an archive (see preseed/late_command at the end of this file) -d-i pkgsel/include string aptitude tmux zsh tftp-hpa +d-i pkgsel/include string aptitude tftp-hpa # Whether to upgrade packages after debootstrap. # Allowed values: none, safe-upgrade, full-upgrade d-i pkgsel/upgrade select full-upgrade @@ -349,4 +349,3 @@ in-target /bin/sed -i 's/\(^\|^\#\)\(PermitRootLogin\).*/\2 yes/g' /etc/ssh/sshd in-target /usr/bin/tftp 129.20.203.27 -c get scripts/latecommand.tar.gz /tmp/latecommand.tar.gz ; \ in-target tar xzf /tmp/latecommand.tar.gz -C /tmp/ ; \ in-target /bin/sh /tmp/latecommand/post.sh -