From 98dbeb8e9f13ca3aea1821246caf8db6c6fdb298 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gardais=20J=C3=A9r=C3=A9my?= Date: Wed, 30 Nov 2022 14:12:02 +0100 Subject: [PATCH] Fix indentation --- preseed/debian/bullseye/preseed.cfg | 2 +- .../debian/bullseye/preseed.cinnamon.uefi.cfg | 32 ++++++++++--------- .../bullseye/preseed.cinnamon.uefi.cipher.cfg | 2 +- .../debian/bullseye/preseed.computenode.cfg | 17 ++-------- .../debian/bullseye/preseed.gnome.uefi.cfg | 2 +- .../bullseye/preseed.gnome.uefi.cipher.cfg | 2 +- 6 files changed, 24 insertions(+), 33 deletions(-) diff --git a/preseed/debian/bullseye/preseed.cfg b/preseed/debian/bullseye/preseed.cfg index d68d074..62d8a0d 100644 --- a/preseed/debian/bullseye/preseed.cfg +++ b/preseed/debian/bullseye/preseed.cfg @@ -282,7 +282,7 @@ d-i partman/confirm_nooverwrite boolean true d-i base-installer/kernel/image select linux-image-amd64 ## Drivers to include in the initrd -d-i base-installer/initramfs-tools/driver-policy select most +d-i base-installer/initramfs-tools/driver-policy select most ################################################################## ]]] ## APT configuration // Package selection [[[ diff --git a/preseed/debian/bullseye/preseed.cinnamon.uefi.cfg b/preseed/debian/bullseye/preseed.cinnamon.uefi.cfg index 340717e..01e50fd 100644 --- a/preseed/debian/bullseye/preseed.cinnamon.uefi.cfg +++ b/preseed/debian/bullseye/preseed.cinnamon.uefi.cfg @@ -41,7 +41,7 @@ d-i keyboard-configuration/xkb-keymap select French ## Auto-configure networking d-i netcfg/use_autoconfig boolean true -# Disable that annoying WEP key dialog. +## Disable that annoying WEP key dialog. d-i netcfg/wireless_wep string ## To set a different link detection timeout (default is 3 seconds). @@ -134,23 +134,22 @@ d-i clock-setup/ntp-server string 0.debian.pool.ntp. ## Disk Partitioning/Boot loader [[[ ###################################################################### -# If the system has only one disk the installer will default to using it. -# Otherwise, the device name must be given -d-i partman-auto/disk string /dev/nvme0n1 /dev/sda /dev/vda +## If the system has only one disk the installer will default to using it. +## Otherwise, the device name must be given +d-i partman-auto/disk string /dev/nvme0n1 /dev/sda /dev/vda -d-i partman-auto/init_automatically_partition select custom +d-i partman-auto/init_automatically_partition select custom -# Specify the method to use -# - regular: use the usual partition types for the architecture -# - lvm: use LVM to partition the disk -# - crypto: use LVM within an encrypted partition -#d-i partman-auto/method string regular -d-i partman-auto/method string lvm +## Specify the method to use +### - regular: use the usual partition types for the architecture +### - lvm: use LVM to partition the disk +### - crypto: use LVM within an encrypted partition +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 +## It's not ok to have /boot in the LVM +d-i partman-auto-lvm/no_boot boolean false # Remove old LVM configuration d-i partman-lvm/device_remove_lvm boolean true @@ -178,7 +177,7 @@ d-i partman/default_label string gpt # 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 \ +d-i partman-auto/expert_recipe string \ boot-root :: \ 538 538 1075 free \ $iflabel{ gpt } \ @@ -271,6 +270,9 @@ d-i partman-auto/expert_recipe string \ # Allow to not set a swap partition #d-i partman-basicfilesystems/no_swap boolean false +## Return to menu if no mount point is assigned to a filesystem +d-i partman-basicfilesystems/no_mount_point boolean false + # Automatically partition without confirmation d-i partman/confirm_write_new_label boolean true d-i partman/choose_partition select finish @@ -286,7 +288,7 @@ d-i partman/confirm_nooverwrite boolean true d-i base-installer/kernel/image select linux-image-amd64 ## Drivers to include in the initrd -d-i base-installer/initramfs-tools/driver-policy select most +d-i base-installer/initramfs-tools/driver-policy select most ################################################################## ]]] ## APT configuration // Package selection [[[ diff --git a/preseed/debian/bullseye/preseed.cinnamon.uefi.cipher.cfg b/preseed/debian/bullseye/preseed.cinnamon.uefi.cipher.cfg index 14d5984..414ab1b 100644 --- a/preseed/debian/bullseye/preseed.cinnamon.uefi.cipher.cfg +++ b/preseed/debian/bullseye/preseed.cinnamon.uefi.cipher.cfg @@ -285,7 +285,7 @@ d-i partman/confirm_nooverwrite boolean true d-i base-installer/kernel/image select linux-image-amd64 ## Drivers to include in the initrd -d-i base-installer/initramfs-tools/driver-policy select most +d-i base-installer/initramfs-tools/driver-policy select most ################################################################## ]]] ## APT configuration // Package selection [[[ diff --git a/preseed/debian/bullseye/preseed.computenode.cfg b/preseed/debian/bullseye/preseed.computenode.cfg index fcc4c82..8cc8881 100644 --- a/preseed/debian/bullseye/preseed.computenode.cfg +++ b/preseed/debian/bullseye/preseed.computenode.cfg @@ -87,18 +87,6 @@ d-i mirror/http/proxy string d-i mirror/http/mirror string deb.debian.org d-i mirror/suite string -################################################################## ]]] -## Mirror settings [[[ -###################################################################### - -## Mirror -d-i mirror/country string FR -d-i mirror/http/hostname string deb.debian.org -d-i mirror/http/directory string /debian/ -d-i mirror/http/proxy string -d-i mirror/http/mirror string deb.debian.org -d-i mirror/suite string - ################################################################## ]]] ## Account [[[ ###################################################################### @@ -174,8 +162,9 @@ d-i partman-lvm/confirm boolean true d-i partman-lvm/confirm_nooverwrite boolean true ## Volume Group/vg name -d-i partman-auto-lvm/new_vg_name string sys -### From buster, need to specify the expected size +d-i partman-auto-lvm/new_vg_name string sys + +### Specify the expected size d-i partman-auto-lvm/guided_size string max ## LVM partition diff --git a/preseed/debian/bullseye/preseed.gnome.uefi.cfg b/preseed/debian/bullseye/preseed.gnome.uefi.cfg index ca095c9..963424d 100644 --- a/preseed/debian/bullseye/preseed.gnome.uefi.cfg +++ b/preseed/debian/bullseye/preseed.gnome.uefi.cfg @@ -293,7 +293,7 @@ d-i partman/confirm_nooverwrite boolean true d-i base-installer/kernel/image select linux-image-amd64 ## Drivers to include in the initrd -d-i base-installer/initramfs-tools/driver-policy select most +d-i base-installer/initramfs-tools/driver-policy select most ################################################################## ]]] ## APT configuration // Package selection [[[ diff --git a/preseed/debian/bullseye/preseed.gnome.uefi.cipher.cfg b/preseed/debian/bullseye/preseed.gnome.uefi.cipher.cfg index c8a69b3..3048dbd 100644 --- a/preseed/debian/bullseye/preseed.gnome.uefi.cipher.cfg +++ b/preseed/debian/bullseye/preseed.gnome.uefi.cipher.cfg @@ -285,7 +285,7 @@ d-i partman/confirm_nooverwrite boolean true d-i base-installer/kernel/image select linux-image-amd64 ## Drivers to include in the initrd -d-i base-installer/initramfs-tools/driver-policy select most +d-i base-installer/initramfs-tools/driver-policy select most ################################################################## ]]] ## APT configuration // Package selection [[[