From b4f7e65a273bd3079a0dba629956353cb26a5e93 Mon Sep 17 00:00:00 2001 From: Gardais Jeremy Date: Wed, 6 Dec 2017 15:27:20 +0100 Subject: [PATCH] No longer define zsh as default shell for root. --- CHANGELOG.md | 1 + README.md | 1 - preseed/debian/jessie/preseed.cfg | 4 ++-- preseed/debian/jessie/preseed_cinnamon.cfg | 4 ++-- preseed/debian/jessie/preseed_gnome.cfg | 4 ++-- preseed/debian/jessie/preseed_mate.cfg | 4 ++-- preseed/debian/stretch/preseed.cfg | 4 ++-- preseed/debian/stretch/preseed.cinnamon.uefi.cfg | 4 ++-- preseed/debian/stretch/preseed_cinnamon.cfg | 4 ++-- preseed/debian/stretch/preseed_computenode.cfg | 4 ++-- preseed/debian/stretch/preseed_gnome.cfg | 4 ++-- preseed/debian/stretch/preseed_mate.cfg | 4 ++-- 12 files changed, 21 insertions(+), 21 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a5c1ef7..5ff211f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ ### Fix * Leave standart task in peace to be able to have a X session for user's nodes… (see #17). * Update doc about Debian distribution name and remove useless entries (oldStable). +* No longer define zsh as default shell for root. ## Release 0.4.1 ### Improvement diff --git a/README.md b/README.md index 3b77766..92dfd92 100644 --- a/README.md +++ b/README.md @@ -120,7 +120,6 @@ Preseeding provides a way to set answers to questions asked by the Debian-Instal * Bootloader : * Install Grub on the MBR of the first disk. * late_command - * Define ZSH as the default shell. * Permit root login via SSH with it's password. * Download and extract a _latecommand_ archive from [this repository][debian latecommand description]. * Run the script from this archive. diff --git a/preseed/debian/jessie/preseed.cfg b/preseed/debian/jessie/preseed.cfg index 0222826..8ac696f 100644 --- a/preseed/debian/jessie/preseed.cfg +++ b/preseed/debian/jessie/preseed.cfg @@ -352,8 +352,8 @@ d-i cdrom-detect/eject boolean false #d-i debian-installer/exit/poweroff boolean true #in-target wget -O /tmp/latecommand.tar.gz "https://wiki.101010.fr/lib/exe/fetch.php?media=documentation:administration_systeme:latecommand.tar.gz" --no-check-certificate ; \ -d-i preseed/late_command string in-target chsh -s /bin/zsh ; \ -umount /dev/sys/lv_free ; lvremove -f /dev/sys/lv_free ; \ +d-i preseed/late_command string in-target umount /dev/sys/lv_free ; \ +lvremove -f /dev/sys/lv_free ; \ in-target /bin/rmdir /mnt/free ; in-target /bin/sed -i '/lv_free/d' /etc/fstab ; \ in-target /bin/sed -i 's/without-password/yes/g' /etc/ssh/sshd_config ; \ in-target /usr/bin/tftp 129.20.203.27 -c get scripts/latecommand.tar.gz /tmp/latecommand.tar.gz ; \ diff --git a/preseed/debian/jessie/preseed_cinnamon.cfg b/preseed/debian/jessie/preseed_cinnamon.cfg index 2b31ce2..ae5f4bf 100644 --- a/preseed/debian/jessie/preseed_cinnamon.cfg +++ b/preseed/debian/jessie/preseed_cinnamon.cfg @@ -343,8 +343,8 @@ d-i cdrom-detect/eject boolean false #d-i debian-installer/exit/poweroff boolean true #in-target wget -O /tmp/latecommand.tar.gz "https://wiki.101010.fr/lib/exe/fetch.php?media=documentation:administration_systeme:latecommand.tar.gz" --no-check-certificate ; \ -d-i preseed/late_command string in-target chsh -s /bin/zsh ; \ -umount /dev/sys/lv_free ; lvremove -f /dev/sys/lv_free ; \ +d-i preseed/late_command string in-target umount /dev/sys/lv_free ; \ +lvremove -f /dev/sys/lv_free ; \ in-target /bin/rmdir /mnt/free ; in-target /bin/sed -i '/lv_free/d' /etc/fstab ; \ in-target /bin/sed -i 's/without-password/yes/g' /etc/ssh/sshd_config ; \ in-target /usr/bin/tftp 129.20.203.27 -c get scripts/latecommand.tar.gz /tmp/latecommand.tar.gz ; \ diff --git a/preseed/debian/jessie/preseed_gnome.cfg b/preseed/debian/jessie/preseed_gnome.cfg index 9a0cc99..caa7710 100644 --- a/preseed/debian/jessie/preseed_gnome.cfg +++ b/preseed/debian/jessie/preseed_gnome.cfg @@ -343,8 +343,8 @@ d-i cdrom-detect/eject boolean false #d-i debian-installer/exit/poweroff boolean true #in-target wget -O /tmp/latecommand.tar.gz "https://wiki.101010.fr/lib/exe/fetch.php?media=documentation:administration_systeme:latecommand.tar.gz" --no-check-certificate ; \ -d-i preseed/late_command string in-target chsh -s /bin/zsh ; \ -umount /dev/sys/lv_free ; lvremove -f /dev/sys/lv_free ; \ +d-i preseed/late_command string in-target umount /dev/sys/lv_free ; \ +lvremove -f /dev/sys/lv_free ; \ in-target /bin/rmdir /mnt/free ; in-target /bin/sed -i '/lv_free/d' /etc/fstab ; \ in-target /bin/sed -i 's/without-password/yes/g' /etc/ssh/sshd_config ; \ in-target /usr/bin/tftp 129.20.203.27 -c get scripts/latecommand.tar.gz /tmp/latecommand.tar.gz ; \ diff --git a/preseed/debian/jessie/preseed_mate.cfg b/preseed/debian/jessie/preseed_mate.cfg index ff5ca47..04cbcd4 100644 --- a/preseed/debian/jessie/preseed_mate.cfg +++ b/preseed/debian/jessie/preseed_mate.cfg @@ -343,8 +343,8 @@ d-i cdrom-detect/eject boolean false #d-i debian-installer/exit/poweroff boolean true #in-target wget -O /tmp/latecommand.tar.gz "https://wiki.101010.fr/lib/exe/fetch.php?media=documentation:administration_systeme:latecommand.tar.gz" --no-check-certificate ; \ -d-i preseed/late_command string in-target chsh -s /bin/zsh ; \ -umount /dev/sys/lv_free ; lvremove -f /dev/sys/lv_free ; \ +d-i preseed/late_command string in-target umount /dev/sys/lv_free ; \ +lvremove -f /dev/sys/lv_free ; \ in-target /bin/rmdir /mnt/free ; in-target /bin/sed -i '/lv_free/d' /etc/fstab ; \ in-target /bin/sed -i 's/without-password/yes/g' /etc/ssh/sshd_config ; \ in-target /usr/bin/tftp 129.20.203.27 -c get scripts/latecommand.tar.gz /tmp/latecommand.tar.gz ; \ diff --git a/preseed/debian/stretch/preseed.cfg b/preseed/debian/stretch/preseed.cfg index 1ff4868..04e80d1 100644 --- a/preseed/debian/stretch/preseed.cfg +++ b/preseed/debian/stretch/preseed.cfg @@ -345,8 +345,8 @@ d-i cdrom-detect/eject boolean false #d-i debian-installer/exit/poweroff boolean true #in-target wget -O /tmp/latecommand.tar.gz "https://wiki.101010.fr/lib/exe/fetch.php?media=documentation:administration_systeme:latecommand.tar.gz" --no-check-certificate ; \ -d-i preseed/late_command string in-target chsh -s /bin/zsh ; \ -umount /dev/sys/lv_free ; lvremove -f /dev/sys/lv_free ; \ +d-i preseed/late_command string in-target umount /dev/sys/lv_free ; \ +lvremove -f /dev/sys/lv_free ; \ in-target /bin/rmdir /mnt/free ; in-target /bin/sed -i '/lv_free/d' /etc/fstab ; \ in-target /bin/sed -i 's/\(^\|^\#\)\(PermitRootLogin\).*/\2 yes/g' /etc/ssh/sshd_config ; \ in-target /usr/bin/tftp 129.20.203.27 -c get scripts/latecommand.tar.gz /tmp/latecommand.tar.gz ; \ diff --git a/preseed/debian/stretch/preseed.cinnamon.uefi.cfg b/preseed/debian/stretch/preseed.cinnamon.uefi.cfg index 2a9dd30..9d7fb96 100644 --- a/preseed/debian/stretch/preseed.cinnamon.uefi.cfg +++ b/preseed/debian/stretch/preseed.cinnamon.uefi.cfg @@ -357,8 +357,8 @@ d-i cdrom-detect/eject boolean false #d-i debian-installer/exit/poweroff boolean true #in-target wget -O /tmp/latecommand.tar.gz "https://wiki.101010.fr/lib/exe/fetch.php?media=documentation:administration_systeme:latecommand.tar.gz" --no-check-certificate ; \ -d-i preseed/late_command string in-target chsh -s /bin/zsh ; \ -umount /dev/sys/lv_free ; lvremove -f /dev/sys/lv_free ; \ +d-i preseed/late_command string in-target umount /dev/sys/lv_free ; \ +lvremove -f /dev/sys/lv_free ; \ in-target /bin/rmdir /mnt/free ; in-target /bin/sed -i '/lv_free/d' /etc/fstab ; \ in-target /bin/sed -i 's/.*\(PermitRootLogin\).*/\1 yes/g' /etc/ssh/sshd_config ; \ in-target /usr/bin/tftp 129.20.203.27 -c get scripts/latecommand.tar.gz /tmp/latecommand.tar.gz ; \ diff --git a/preseed/debian/stretch/preseed_cinnamon.cfg b/preseed/debian/stretch/preseed_cinnamon.cfg index 67b8dc7..115e03f 100644 --- a/preseed/debian/stretch/preseed_cinnamon.cfg +++ b/preseed/debian/stretch/preseed_cinnamon.cfg @@ -333,8 +333,8 @@ d-i cdrom-detect/eject boolean false #d-i debian-installer/exit/poweroff boolean true #in-target wget -O /tmp/latecommand.tar.gz "https://wiki.101010.fr/lib/exe/fetch.php?media=documentation:administration_systeme:latecommand.tar.gz" --no-check-certificate ; \ -d-i preseed/late_command string in-target chsh -s /bin/zsh ; \ -umount /dev/sys/lv_free ; lvremove -f /dev/sys/lv_free ; \ +d-i preseed/late_command string in-target umount /dev/sys/lv_free ; \ +lvremove -f /dev/sys/lv_free ; \ in-target /bin/rmdir /mnt/free ; in-target /bin/sed -i '/lv_free/d' /etc/fstab ; \ in-target /bin/sed -i 's/.*\(PermitRootLogin\).*/\1 yes/g' /etc/ssh/sshd_config ; \ in-target /usr/bin/tftp 129.20.203.27 -c get scripts/latecommand.tar.gz /tmp/latecommand.tar.gz ; \ diff --git a/preseed/debian/stretch/preseed_computenode.cfg b/preseed/debian/stretch/preseed_computenode.cfg index 0533526..68edf13 100644 --- a/preseed/debian/stretch/preseed_computenode.cfg +++ b/preseed/debian/stretch/preseed_computenode.cfg @@ -328,8 +328,8 @@ d-i cdrom-detect/eject boolean false #d-i debian-installer/exit/poweroff boolean true #in-target wget -O /tmp/latecommand.tar.gz "https://wiki.101010.fr/lib/exe/fetch.php?media=documentation:administration_systeme:latecommand.tar.gz" --no-check-certificate ; \ -d-i preseed/late_command string in-target chsh -s /bin/zsh ; \ -umount /dev/sys/lv_free ; lvremove -f /dev/sys/lv_free ; \ +d-i preseed/late_command string in-target umount /dev/sys/lv_free ; \ +lvremove -f /dev/sys/lv_free ; \ in-target /bin/rmdir /mnt/free ; in-target /bin/sed -i '/lv_free/d' /etc/fstab ; \ in-target /bin/sed -i 's/\(^\|^\#\)\(PermitRootLogin\).*/\2 yes/g' /etc/ssh/sshd_config ; \ in-target /usr/bin/tftp 129.20.203.27 -c get scripts/latecommand.tar.gz /tmp/latecommand.tar.gz ; \ diff --git a/preseed/debian/stretch/preseed_gnome.cfg b/preseed/debian/stretch/preseed_gnome.cfg index 6a467cd..f91f79c 100644 --- a/preseed/debian/stretch/preseed_gnome.cfg +++ b/preseed/debian/stretch/preseed_gnome.cfg @@ -333,8 +333,8 @@ d-i cdrom-detect/eject boolean false #d-i debian-installer/exit/poweroff boolean true #in-target wget -O /tmp/latecommand.tar.gz "https://wiki.101010.fr/lib/exe/fetch.php?media=documentation:administration_systeme:latecommand.tar.gz" --no-check-certificate ; \ -d-i preseed/late_command string in-target chsh -s /bin/zsh ; \ -umount /dev/sys/lv_free ; lvremove -f /dev/sys/lv_free ; \ +d-i preseed/late_command string in-target umount /dev/sys/lv_free ; \ +lvremove -f /dev/sys/lv_free ; \ in-target /bin/rmdir /mnt/free ; in-target /bin/sed -i '/lv_free/d' /etc/fstab ; \ in-target /bin/sed -i 's/\(^\|^\#\)\(PermitRootLogin\).*/\2 yes/g' /etc/ssh/sshd_config ; \ in-target /usr/bin/tftp 129.20.203.27 -c get scripts/latecommand.tar.gz /tmp/latecommand.tar.gz ; \ diff --git a/preseed/debian/stretch/preseed_mate.cfg b/preseed/debian/stretch/preseed_mate.cfg index 73990b1..8767be0 100644 --- a/preseed/debian/stretch/preseed_mate.cfg +++ b/preseed/debian/stretch/preseed_mate.cfg @@ -333,8 +333,8 @@ d-i cdrom-detect/eject boolean false #d-i debian-installer/exit/poweroff boolean true #in-target wget -O /tmp/latecommand.tar.gz "https://wiki.101010.fr/lib/exe/fetch.php?media=documentation:administration_systeme:latecommand.tar.gz" --no-check-certificate ; \ -d-i preseed/late_command string in-target chsh -s /bin/zsh ; \ -umount /dev/sys/lv_free ; lvremove -f /dev/sys/lv_free ; \ +d-i preseed/late_command string in-target umount /dev/sys/lv_free ; \ +lvremove -f /dev/sys/lv_free ; \ in-target /bin/rmdir /mnt/free ; in-target /bin/sed -i '/lv_free/d' /etc/fstab ; \ in-target /bin/sed -i 's/\(^\|^\#\)\(PermitRootLogin\).*/\2 yes/g' /etc/ssh/sshd_config ; \ in-target /usr/bin/tftp 129.20.203.27 -c get scripts/latecommand.tar.gz /tmp/latecommand.tar.gz ; \