From 8f5f8f9a53e25c71516c4a65d4135d6dfdb143aa Mon Sep 17 00:00:00 2001 From: Gardais Jeremy Date: Thu, 3 Jan 2019 16:08:28 +0100 Subject: [PATCH] Small fix to preseed files --- preseed/debian/stretch/preseed.cinnamon.uefi.cfg | 3 +-- preseed/debian/stretch/preseed.gnome.uefi.cfg | 3 +-- preseed/debian/stretch/preseed_cinnamon.cfg | 4 ++-- preseed/debian/stretch/preseed_computenode.cfg | 1 - preseed/debian/stretch/preseed_mate.cfg | 1 - 5 files changed, 4 insertions(+), 8 deletions(-) diff --git a/preseed/debian/stretch/preseed.cinnamon.uefi.cfg b/preseed/debian/stretch/preseed.cinnamon.uefi.cfg index 99ab2b6..508dde5 100644 --- a/preseed/debian/stretch/preseed.cinnamon.uefi.cfg +++ b/preseed/debian/stretch/preseed.cinnamon.uefi.cfg @@ -371,8 +371,7 @@ d-i cdrom-detect/eject boolean false 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 /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 ; \ in-target tar xzf /tmp/latecommand.tar.gz -C /tmp/ ; \ in-target /bin/sh /tmp/latecommand/post.sh - diff --git a/preseed/debian/stretch/preseed.gnome.uefi.cfg b/preseed/debian/stretch/preseed.gnome.uefi.cfg index e3fe990..17b7c3a 100644 --- a/preseed/debian/stretch/preseed.gnome.uefi.cfg +++ b/preseed/debian/stretch/preseed.gnome.uefi.cfg @@ -371,8 +371,7 @@ d-i cdrom-detect/eject boolean false 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 /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 ; \ in-target tar xzf /tmp/latecommand.tar.gz -C /tmp/ ; \ in-target /bin/sh /tmp/latecommand/post.sh - diff --git a/preseed/debian/stretch/preseed_cinnamon.cfg b/preseed/debian/stretch/preseed_cinnamon.cfg index 9f231eb..1411ede 100644 --- a/preseed/debian/stretch/preseed_cinnamon.cfg +++ b/preseed/debian/stretch/preseed_cinnamon.cfg @@ -6,6 +6,7 @@ #label stretch # menu label Debian GNU/Linux ^Stretch 64 bits WITH PRESEED # kernel installer/debian/stretch/amd64/linux +# IPAPPEND 2 # APPEND vga=normal initrd=installer/debian/stretch/amd64/initrd_firm.gz auto=true interface=auto netcfg/dhcp_timeout=60 netcfg/choose_interface=auto priority=critical preseed/url=tftp://129.20.203.27/installer/debian/stretch/amd64/preseed.cfg @@ -346,8 +347,7 @@ d-i cdrom-detect/eject boolean false 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 /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 ; \ in-target tar xzf /tmp/latecommand.tar.gz -C /tmp/ ; \ in-target /bin/sh /tmp/latecommand/post.sh - diff --git a/preseed/debian/stretch/preseed_computenode.cfg b/preseed/debian/stretch/preseed_computenode.cfg index f8475dd..d7b2e65 100644 --- a/preseed/debian/stretch/preseed_computenode.cfg +++ b/preseed/debian/stretch/preseed_computenode.cfg @@ -237,7 +237,6 @@ d-i partman-auto/expert_recipe string \ ## Put all free space in a DataDisk logical volume - # Allow to not set a swap partition #d-i partman-basicfilesystems/no_swap boolean false diff --git a/preseed/debian/stretch/preseed_mate.cfg b/preseed/debian/stretch/preseed_mate.cfg index cbb9bf7..97acf78 100644 --- a/preseed/debian/stretch/preseed_mate.cfg +++ b/preseed/debian/stretch/preseed_mate.cfg @@ -351,4 +351,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 -