From fd16e45734232215b0d0e5804fb89e171c169f4d Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Tue, 8 Jan 2019 22:59:01 +0100 Subject: preseed install disk detection works now --- roles/preseed/templates/preseed_debian-stretch.cfg.j2 | 6 +++++- roles/preseed/templates/preseed_ubuntu-bionic.cfg.j2 | 6 +----- roles/preseed/templates/preseed_ubuntu-xenial.cfg.j2 | 6 +++++- 3 files changed, 11 insertions(+), 7 deletions(-) (limited to 'roles') diff --git a/roles/preseed/templates/preseed_debian-stretch.cfg.j2 b/roles/preseed/templates/preseed_debian-stretch.cfg.j2 index e96a663b..63a0d957 100644 --- a/roles/preseed/templates/preseed_debian-stretch.cfg.j2 +++ b/roles/preseed/templates/preseed_debian-stretch.cfg.j2 @@ -43,7 +43,11 @@ d-i clock-setup/ntp boolean false d-i partman/early_command string \ 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 string manual +d-i grub-installer/bootdev 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-bionic.cfg.j2 b/roles/preseed/templates/preseed_ubuntu-bionic.cfg.j2 index e923d9c8..93dd55b5 100644 --- a/roles/preseed/templates/preseed_ubuntu-bionic.cfg.j2 +++ b/roles/preseed/templates/preseed_ubuntu-bionic.cfg.j2 @@ -48,16 +48,12 @@ d-i clock-setup/ntp boolean false d-i partman/early_command string \ 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/choose_bootdev string manual 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 d-i partman-auto-lvm/new_vg_name string {{ hostvars[hostname].host_name }} diff --git a/roles/preseed/templates/preseed_ubuntu-xenial.cfg.j2 b/roles/preseed/templates/preseed_ubuntu-xenial.cfg.j2 index bf680966..ebd38a47 100644 --- a/roles/preseed/templates/preseed_ubuntu-xenial.cfg.j2 +++ b/roles/preseed/templates/preseed_ubuntu-xenial.cfg.j2 @@ -48,7 +48,11 @@ d-i clock-setup/ntp boolean false d-i partman/early_command string \ 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 string manual +d-i grub-installer/bootdev seen true d-i partman-auto/method string lvm d-i partman-auto/purge_lvm_from_device boolean true -- cgit v1.2.3