Merge branch 'master' of https://git.ipr.univ-rennes1.fr/cellinfo/tftpboot

preseed/debian/bullseye/preseed.cfg

@@ -162,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

preseed/debian/bullseye/preseed.cinnamon.uefi.cipher.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).
@@ -128,7 +128,7 @@ d-i   time/zone                                   string      Europe/Paris
 
 ## Use NTP to set time
 d-i   clock-setup/ntp                             boolean     true
-d-i   clock-setup/ntp-server                      string      ntp.univ-rennes1.fr
+d-i   clock-setup/ntp-server                      string      0.debian.pool.ntp.org
 
 ################################################################## ]]]
 ## Disk Partitioning/Boot loader [[[
@@ -176,9 +176,10 @@ d-i   partman/default_label                       string      gpt
 ## Volume Group/vg
 d-i   partman-auto-lvm/new_vg_name                string      crypt
 
-### From Buster, need to specify the expected size
+### Specify the expected size
 d-i   partman-auto-lvm/guided_size                string      max
 
+## LVM partition
 d-i   partman-auto/choose_recipe                  select      root-encrypted
 d-i   partman-auto/expert_recipe                  string      \
       root-encrypted ::                                       \

preseed/debian/bullseye/preseed.gnome.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,59 +134,64 @@ 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 not ok to have /boot in the LVM
+d-i   partman-auto-lvm/no_boot                    boolean     false
 
-# It's 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
+d-i   partman-lvm/device_remove_lvm_span          boolean     true
 
-# Remove old LVM configuration
-d-i partman-lvm/device_remove_lvm               boolean true
-d-i partman-lvm/device_remove_lvm_span          boolean true
+## Remove old RAID configuration
+d-i   partman-md/device_remove_md                 boolean     true
+d-i   partman-md/confirm                          boolean     true
 
-# Remove old RAID configuration
-#d-i partman-md/device_remove_md boolean true
-# Confirm to write the LVM partitions
-d-i partman-lvm/confirm                         boolean true
-d-i partman-lvm/confirm_nooverwrite             boolean true
+## Confirm to write the LVM partitions
+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
+## 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
+## 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 <min size>
+## Volume Group/vg name
+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
+### This recipe need almost 30Gb free space.
 #   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                               \
+              538 300000 1075 free                            \
                       $iflabel{ gpt }                         \
                       $reusemethod{ }                         \
                       method{ efi }                           \
                       format{ }                               \
               .                                               \
-              200 200000 250 ext3                             \
+              200 200000 400 ext3                             \
                       $primary{ } $bootable{ }                \
                       method{ format } format{ }              \
                       use_filesystem{ } filesystem{ ext3 }    \
@@ -266,17 +271,19 @@ d-i   partman-auto/expert_recipe                    string    \
                       mountpoint{ /mnt/free }                 \
               .
 ## Need to put all free space in a temp logical volume/partition
-# Otherwise it's the last partition which get all free space
+## Otherwise it's the last partition which get all free space
 
-# Allow to not set a swap partition
+## 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
+## 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
+d-i   partman/confirm                             boolean     true
+d-i   partman/confirm_nooverwrite                 boolean     true
 
 ################################################################## ]]]
 ## Kernel [[[

preseed/debian/bullseye/preseed.gnome.uefi.cipher.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).
@@ -128,7 +128,7 @@ d-i   time/zone                                   string      Europe/Paris
 
 ## Use NTP to set time
 d-i   clock-setup/ntp                             boolean     true
-d-i   clock-setup/ntp-server                      string      ntp.univ-rennes1.fr
+d-i   clock-setup/ntp-server                      string      0.debian.pool.ntp.org
 
 ################################################################## ]]]
 ## Disk Partitioning/Boot loader [[[
@@ -176,9 +176,10 @@ d-i   partman/default_label                       string      gpt
 ## Volume Group/vg
 d-i   partman-auto-lvm/new_vg_name                string      crypt
 
-### From Buster, need to specify the expected size
+### Specify the expected size
 d-i   partman-auto-lvm/guided_size                string      max
 
+## LVM partition
 d-i   partman-auto/choose_recipe                  select      root-encrypted
 d-i   partman-auto/expert_recipe                  string      \
       root-encrypted ::                                       \