From 6349f8393e86a89b71ecb06d9d7eeb5d6a1870e7 Mon Sep 17 00:00:00 2001 From: Gardais Jeremy Date: Tue, 2 Jan 2018 11:51:18 +0100 Subject: [PATCH] Gnome preseed is now only available with UEFI (see #20). --- CHANGELOG.md | 1 + config/debian/menu.cfg | 6 ++-- ...eseed_gnome.cfg => preseed.gnome.uefi.cfg} | 30 +++++++++++++++++-- 3 files changed, 31 insertions(+), 6 deletions(-) rename preseed/debian/stretch/{preseed_gnome.cfg => preseed.gnome.uefi.cfg} (92%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 28ca7d2..90507f8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ * task-french and task-english are removed (see #18). * Ensure to have minimal documentation available on the system. * Do not use wireless interface for installation (see #19). +* Gnome preseed is now only available with UEFI (see #20). ### Fix * Leave standard task in peace to be able to have a X session for user's nodes… (see #17). diff --git a/config/debian/menu.cfg b/config/debian/menu.cfg index 475b413..23cbb50 100644 --- a/config/debian/menu.cfg +++ b/config/debian/menu.cfg @@ -34,10 +34,10 @@ label stableUefiCinnamon menu label Debian stretch ^Cinnamon amd64 + UEFI PRESEED kernel installer/debian/stretch/amd64/linux 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/preseed/debian/stretch/preseed.cinnamon.uefi.cfg IPAPPEND 2 -label stableGnome - menu label Debian stretch ^Gnome amd64 PRESEED +label stableUefiGnome + menu label Debian stretch ^Gnome amd64 + UEFI PRESEED kernel installer/debian/stretch/amd64/linux - 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/preseed/debian/stretch/preseed_gnome.cfg 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/preseed/debian/stretch/preseed.gnome.uefi.cfg IPAPPEND 2 label stableComputeNode menu label Debian stretch amd64 for compute node PRESEED kernel installer/debian/stretch/amd64/linux diff --git a/preseed/debian/stretch/preseed_gnome.cfg b/preseed/debian/stretch/preseed.gnome.uefi.cfg similarity index 92% rename from preseed/debian/stretch/preseed_gnome.cfg rename to preseed/debian/stretch/preseed.gnome.uefi.cfg index 4cb7fc6..51a3af4 100644 --- a/preseed/debian/stretch/preseed_gnome.cfg +++ b/preseed/debian/stretch/preseed.gnome.uefi.cfg @@ -147,6 +147,8 @@ d-i partman-auto/init_automatically_partition select custom #d-i partman-auto/method string regular d-i partman-auto/method string lvm +d-i partman-lvm/device_remove_lvm boolean true + # It's ok to have /boot in the LVM d-i partman-auto-lvm/no_boot boolean false @@ -160,16 +162,34 @@ d-i partman-auto/purge_lvm_from_device boolean true d-i partman-lvm/confirm boolean true d-i partman-lvm/confirm_nooverwrite boolean true +# Keep that one set to true so we end up with a UEFI enabled +# system. If set to false, /var/lib/partman/uefi_ignore will be touched +d-i partman-efi/non_efi_system boolean true + +# enforce usage of GPT - a must have to use EFI! +d-i partman-basicfilesystems/choose_label string gpt +d-i partman-basicfilesystems/default_label string gpt +d-i partman-partitioning/choose_label string gpt +d-i partman-partitioning/default_label string gpt +d-i partman/choose_label string gpt +d-i partman/default_label string gpt + # LVM partition # This recipe need almost 30Gb free space it's add all # sda2 (16Gb), lv_* (~14Gb) then it should not count it because # all logical volume are on sda2 ... d-i partman-auto/expert_recipe string \ boot-root :: \ - 200 200000 250 ext3 \ + 538 538 1075 free \ + $iflabel{ gpt } \ + $reusemethod{ } \ + method{ efi } \ + format{ } \ + . \ + 200 200000 250 ext2 \ $primary{ } $bootable{ } \ method{ format } format{ } \ - use_filesystem{ } filesystem{ ext3 } \ + use_filesystem{ } filesystem{ ext2 } \ label{ boot } \ mountpoint{ /boot } \ . \ @@ -248,9 +268,13 @@ d-i partman-auto/expert_recipe string \ ## Need to put all free space in a temp logical volume/partition # Otherwise it's the last partition which get all free space +# Allow to not set a swap partition +#d-i partman-basicfilesystems/no_swap boolean false + # Automatically partition without confirmation d-i partman/confirm_write_new_label boolean true d-i partman/choose_partition select finish +d-i partman-md/confirm boolean true d-i partman/confirm boolean true d-i partman/confirm_nooverwrite boolean true @@ -339,7 +363,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\).*/\2 yes/g' /etc/ssh/sshd_config ; \ +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 ; \ in-target tar xzf /tmp/latecommand.tar.gz -C /tmp/ ; \ in-target /bin/sh /tmp/latecommand/post.sh