diff options
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/preseed/templates/preseed_debian-stretch.cfg.j2 | 4 | ||||
| -rw-r--r-- | roles/preseed/templates/preseed_ubuntu-bionic.cfg.j2 | 12 | ||||
| -rw-r--r-- | roles/preseed/templates/preseed_ubuntu-xenial.cfg.j2 | 4 |
3 files changed, 14 insertions, 6 deletions
diff --git a/roles/preseed/templates/preseed_debian-stretch.cfg.j2 b/roles/preseed/templates/preseed_debian-stretch.cfg.j2 index ec19e835..e96a663b 100644 --- a/roles/preseed/templates/preseed_debian-stretch.cfg.j2 +++ b/roles/preseed/templates/preseed_debian-stretch.cfg.j2 @@ -42,8 +42,8 @@ d-i clock-setup/ntp boolean false d-i partman/early_command string \ - debconf-set partman-auto/disk "$(readlink -e {{ hostvars[hostname].install_cooked.disks.primary }})"; \ - debconf-set grub-installer/choose_bootdev "$(readlink -e {{ hostvars[hostname].install_cooked.disks.primary }})" + debconf-set partman-auto/disk "$(readlink -f {{ hostvars[hostname].install_cooked.disks.primary }})"; \ + debconf-set grub-installer/choose_bootdev "$(readlink -f {{ hostvars[hostname].install_cooked.disks.primary }})" d-i partman-auto/method string lvm d-i partman-auto/purge_lvm_from_device boolean true diff --git a/roles/preseed/templates/preseed_ubuntu-bionic.cfg.j2 b/roles/preseed/templates/preseed_ubuntu-bionic.cfg.j2 index fa99ce72..e923d9c8 100644 --- a/roles/preseed/templates/preseed_ubuntu-bionic.cfg.j2 +++ b/roles/preseed/templates/preseed_ubuntu-bionic.cfg.j2 @@ -47,8 +47,16 @@ d-i clock-setup/ntp boolean false d-i partman/early_command string \ - debconf-set partman-auto/disk "$(readlink -e {{ hostvars[hostname].install_cooked.disks.primary }})"; \ - debconf-set grub-installer/choose_bootdev "$(readlink -e {{ hostvars[hostname].install_cooked.disks.primary }})" + debconf-set partman-auto/disk "$(readlink -f {{ hostvars[hostname].install_cooked.disks.primary }})"; \ + debconf-set grub-installer/choose_bootdev "$(readlink -f {{ hostvars[hostname].install_cooked.disks.primary }})"; \ + debconf-set grub-installer/bootdev "$(readlink -f {{ hostvars[hostname].install_cooked.disks.primary }})"; \ + umount -l /media || true + +d-i grub-installer/choose_bootdev seen true +d-i grub-installer/bootdev seen true + +d-i partman/unmount_active boolean true +d-i partman/unmount_active seen true d-i partman-auto/method string lvm d-i partman-auto/purge_lvm_from_device boolean true diff --git a/roles/preseed/templates/preseed_ubuntu-xenial.cfg.j2 b/roles/preseed/templates/preseed_ubuntu-xenial.cfg.j2 index bb327d69..bf680966 100644 --- a/roles/preseed/templates/preseed_ubuntu-xenial.cfg.j2 +++ b/roles/preseed/templates/preseed_ubuntu-xenial.cfg.j2 @@ -47,8 +47,8 @@ d-i clock-setup/ntp boolean false d-i partman/early_command string \ - debconf-set partman-auto/disk "$(readlink -e {{ hostvars[hostname].install_cooked.disks.primary }})"; \ - debconf-set grub-installer/choose_bootdev "$(readlink -e {{ hostvars[hostname].install_cooked.disks.primary }})" + debconf-set partman-auto/disk "$(readlink -f {{ hostvars[hostname].install_cooked.disks.primary }})"; \ + debconf-set grub-installer/choose_bootdev "$(readlink -f {{ hostvars[hostname].install_cooked.disks.primary }})" d-i partman-auto/method string lvm d-i partman-auto/purge_lvm_from_device boolean true |