X-Git-Url: https://git.realraum.at/?p=noc.git;a=blobdiff_plain;f=ansible%2Froles%2Fpreseed%2Ftemplates%2Fpreseed_ubuntu-xenial.cfg.j2;h=0252853bf48bb7b77235eab2984fc9b90a1acb20;hp=73daa33ee6bb93294e7e97c36033f59279833f8d;hb=47ef375e1d90888299fef2a60c5cd12d3c388a72;hpb=2097e18a6ec7a78431f21bc6261b5df169e67b54

diff --git a/ansible/roles/preseed/templates/preseed_ubuntu-xenial.cfg.j2 b/ansible/roles/preseed/templates/preseed_ubuntu-xenial.cfg.j2
index 73daa33..0252853 100644
--- a/ansible/roles/preseed/templates/preseed_ubuntu-xenial.cfg.j2
+++ b/ansible/roles/preseed/templates/preseed_ubuntu-xenial.cfg.j2
@@ -46,7 +46,14 @@ d-i time/zone string Europe/Vienna
 d-i clock-setup/ntp boolean false
 
 
-d-i partman-auto/disk string /dev/{{ hostvars[hostname].install_cooked.disks.primary }}
+d-i partman/early_command string \
+    debconf-set partman-auto/disk "$(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
 d-i partman-auto-lvm/new_vg_name string {{ hostname }}
@@ -58,35 +65,34 @@ d-i partman-md/device_remove_md boolean true
 d-i partman-lvm/confirm boolean true
 d-i partman-lvm/confirm_nooverwrite boolean true
 
-d-i partman-auto/expert_recipe string                                   \
-      boot-root ::                                                      \
-              1000 10000 -1 ext4                                        \
-                      $defaultignore{ } $primary{ } $bootable{ }        \
-                      method{ lvm } vg_name{ {{ hostname }} }           \
-              .                                                         \
-              2048 10000 2560 ext4                                      \
-                      $lvmok{ } in_vg{ {{ hostname }} }                 \
-                      method{ format } format{ }                        \
-                      use_filesystem{ } filesystem{ ext4 }              \
-                      mountpoint{ / }                                   \
-              .                                                         \
-              1024 11000 1280 ext4                                      \
-                      $lvmok{ } in_vg{ {{ hostname }} }                 \
-                      method{ format } format{ }                        \
-                      use_filesystem{ } filesystem{ ext4 }              \
-                      mountpoint{ /var }                                \
-              .                                                         \
-              768 10000 768 ext4                                        \
-                      $lvmok{ } in_vg{ {{ hostname }} }                 \
-                      method{ format } format{ }                        \
-                      use_filesystem{ } filesystem{ ext4 }              \
-                      mountpoint{ /var/log }                            \
-                      options/nodev{ nodev } options/noatime{ noatime } \
-                      options/noexec{ noexec }                          \
-              .                                                         \
-              16 20000 -1 ext4                                          \
-                      $lvmok{ } in_vg{ {{ hostname }} }                 \
-                      method( keep } lv_name{ dummy }                   \
+d-i partman-auto/expert_recipe string                                    \
+      boot-root ::                                                       \
+              1000 10000 -1 ext4                                         \
+                      $defaultignore{ } $primary{ } $bootable{ }         \
+                      method{ lvm } vg_name{ {{ hostname }} }            \
+              .                                                          \
+              2048 10000 2560 ext4                                       \
+                      $lvmok{ } in_vg{ {{ hostname }} }                  \
+                      method{ format } format{ }                         \
+                      use_filesystem{ } filesystem{ ext4 }               \
+                      mountpoint{ / }                                    \
+              .                                                          \
+              1024 11000 1280 ext4                                       \
+                      $lvmok{ } in_vg{ {{ hostname }} }                  \
+                      method{ format } format{ }                         \
+                      use_filesystem{ } filesystem{ ext4 }               \
+                      mountpoint{ /var }                                 \
+              .                                                          \
+              768 10000 768 ext4                                         \
+                      $lvmok{ } in_vg{ {{ hostname }} }                  \
+                      method{ format } format{ }                         \
+                      use_filesystem{ } filesystem{ ext4 }               \
+                      mountpoint{ /var/log }                             \
+                      options/nodev{ nodev } options/noatime{ noatime }  \
+                      options/noexec{ noexec }                           \
+              .                                                          \
+              16 20000 -1 ext4                                           \
+                      $lvmok{ } in_vg{ {{ hostname }} } lv_name{ dummy } \
               .
 
 d-i partman-auto-lvm/no_boot boolean true
@@ -101,13 +107,12 @@ d-i base-installer/install-recommends boolean false
 d-i apt-setup/security_host string debian.ffgraz.net
 
 tasksel tasksel/first multiselect
-d-i pkgsel/include string openssh-server python
+d-i pkgsel/include string openssh-server python python-apt
 d-i pkgsel/upgrade select safe-upgrade
 popularity-contest popularity-contest/participate boolean false
 d-i pkgsel/update-policy select none
 d-i base-installer/kernel/override-image string linux-generic-hwe-16.04
 
-d-i grub-installer/choose_bootdev string /dev/{{ hostvars[hostname].install_cooked.disks.primary }}
 d-i grub-installer/only_debian boolean true
 d-i grub-installer/with_other_os boolean false
 
@@ -119,8 +124,14 @@ d-i preseed/late_command string \
     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 preseed_force_net_ifnames_policy is defined %}
+    mkdir -p /target/etc/systemd/network; \
+    in-target bash -c "echo '[Link]' > /etc/systemd/network/90-namepolicy.link"; \
+    in-target bash -c "echo 'NamePolicy={{ preseed_force_net_ifnames_policy }}' >> /etc/systemd/network/90-namepolicy.link"; \
+    in-target bash -c "update-initramfs -u"; \
+{% endif %}
 {% if hostvars[hostname].ansible_port is defined %}
-    in-target bash -c "sed -e 's/^\(\s*#*\s*Port.*\)/Port {{ hostvars[hostname].ansible_port }}/' -i /etc/ssh/sshd_config"
+    in-target bash -c "sed -e 's/^\(\s*#*\s*Port.*\)/Port {{ hostvars[hostname].ansible_port }}/' -i /etc/ssh/sshd_config"; \
 {% endif %}
+    mkdir -p -m 0700 /target/root/.ssh; \
+    cp /authorized_keys /target/root/.ssh/