X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=ansible%2Froles%2Fpreseed%2Ftemplates%2Fpreseed_debian-stretch.cfg.j2;h=a2fb80c8381cc3c11ae22cca27122d5216eaa928;hb=76f8f3201c0f6c92978f2da4e31e0b9406e216d4;hp=f39e3f3ceda0661f726e19edc7b5127d086b086c;hpb=b1cab5f25b4691b1f19957d879f5cdf2a9b4f938;p=noc.git

diff --git a/ansible/roles/preseed/templates/preseed_debian-stretch.cfg.j2 b/ansible/roles/preseed/templates/preseed_debian-stretch.cfg.j2
index f39e3f3..a2fb80c 100644
--- a/ansible/roles/preseed/templates/preseed_debian-stretch.cfg.j2
+++ b/ansible/roles/preseed/templates/preseed_debian-stretch.cfg.j2
@@ -39,6 +39,10 @@ d-i clock-setup/ntp boolean false
 
 d-i partman-auto/disk string /dev/{{ hostvars[hostname].install_cooked.disks.primary }}
 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 {{ hostname }}
+d-i partman-auto-lvm/guided_size string max
+
 d-i partman-lvm/device_remove_lvm boolean true
 d-i partman-md/device_remove_md boolean true
 
@@ -49,22 +53,22 @@ d-i partman-auto/expert_recipe string                                   \
       boot-root ::                                                      \
               1000 10000 -1 ext4                                        \
                       $defaultignore{ } $primary{ } $bootable{ }        \
-                      method{ lvm } vg_name{ {{ hostname }} }             \
+                      method{ lvm } vg_name{ {{ hostname }} }           \
               .                                                         \
               2048 10000 2560 ext4                                      \
-                      $lvmok{ } in_vg{ {{ hostname }} }                   \
+                      $lvmok{ } in_vg{ {{ hostname }} }                 \
                       method{ format } format{ }                        \
                       use_filesystem{ } filesystem{ ext4 }              \
                       mountpoint{ / }                                   \
               .                                                         \
               1024 11000 1280 ext4                                      \
-                      $lvmok{ } in_vg{ {{ hostname }} }                   \
+                      $lvmok{ } in_vg{ {{ hostname }} }                 \
                       method{ format } format{ }                        \
                       use_filesystem{ } filesystem{ ext4 }              \
                       mountpoint{ /var }                                \
               .                                                         \
               768 10000 768 ext4                                        \
-                      $lvmok{ } in_vg{ {{ hostname }} }                   \
+                      $lvmok{ } in_vg{ {{ hostname }} }                 \
                       method{ format } format{ }                        \
                       use_filesystem{ } filesystem{ ext4 }              \
                       mountpoint{ /var/log }                            \
@@ -72,7 +76,7 @@ d-i partman-auto/expert_recipe string                                   \
                       options/noexec{ noexec }                          \
               .                                                         \
               16 20000 -1 ext4                                          \
-                      $lvmok{ } in_vg{ {{ hostname }} }                   \
+                      $lvmok{ } in_vg{ {{ hostname }} }                 \
                       method( keep } lv_name{ dummy }                   \
               .
 
@@ -103,6 +107,7 @@ d-i preseed/late_command string \
     lvremove -f {{ hostname }}/dummy; \
     in-target bash -c "apt-get update -q && apt-get full-upgrade -y -q"; \
     in-target bash -c "passwd -d root && passwd -l root"; \
+    in-target bash -c "sed -e 's/^allow-hotplug/auto/' -i /etc/network/interfaces"; \
     mkdir -p -m 0700 /target/root/.ssh; \
     cp /authorized_keys /target/root/.ssh/; \
 {% if hostvars[hostname].ansible_port is defined %}