From 93737f6ca0857f200fe2d3b660be095125231b10 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Wed, 21 Feb 2018 18:07:08 +0100
Subject: [ubuntu-16.04] move ubuntu-16.04 preseed to generic ubuntu folder and
 symlink ubuntu-16.04 to it

---
 http/ubuntu-16.04             |  1 +
 http/ubuntu-16.04/preseed.cfg | 54 -------------------------------------------
 http/ubuntu/preseed.cfg       | 54 +++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 55 insertions(+), 54 deletions(-)
 create mode 120000 http/ubuntu-16.04
 delete mode 100644 http/ubuntu-16.04/preseed.cfg
 create mode 100644 http/ubuntu/preseed.cfg

(limited to 'http')

diff --git a/http/ubuntu-16.04 b/http/ubuntu-16.04
new file mode 120000
index 0000000..7d13753
--- /dev/null
+++ b/http/ubuntu-16.04
@@ -0,0 +1 @@
+ubuntu
\ No newline at end of file
diff --git a/http/ubuntu-16.04/preseed.cfg b/http/ubuntu-16.04/preseed.cfg
deleted file mode 100644
index 72e0ea4..0000000
--- a/http/ubuntu-16.04/preseed.cfg
+++ /dev/null
@@ -1,54 +0,0 @@
-d-i debian-installer/locale string en_US
-d-i time/zone string UTC
-d-i keyboard-configuration/xkb-keymap select de
-
-d-i mirror/country string de
-
-d-i partman-basicfilesystems/choose_label string gpt
-d-i partman-basicfilesystems/default_label string gpt
-d-i partman-basicfilesystems/no_swap boolean false
-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
-d-i partman-auto/method string regular
-d-i partman-auto/expert_recipe string \
-  scheme ::                           \
-    32 32 32 free                     \
-      $gptonly{ }                     \
-      $primary{ }                     \
-      $bios_boot{ }                   \
-      method{ biosgrub } .            \
-    1 0 -1 ext4                       \
-      $gptonly{ }                     \
-      $primary{ }                     \
-      method{ format }                \
-      format{ }                       \
-      use_filesystem{ }               \
-      filesystem{ xfs }               \
-      label{ SLX_SYS }                \
-      mountpoint{ / } .
-d-i partman-partitioning/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
-
-d-i base-installer/excludes string laptop-detect
-d-i passwd/make-user boolean false
-d-i passwd/root-login boolean true
-d-i user-setup/allow-password-weak boolean true
-
-## install base packages ##
-d-i pkgsel/include string curl openssh-server ansible
-d-i pkgsel/language-packs multiselect de, en
-d-i preseed/early_command string                                                                                                                \
-        mkdir -p /usr/lib/post-base-installer.d &&                                                                                              \
-        echo "sed -i -e 's/^in-target.*tasksel.*/#\\0/' /var/lib/dpkg/info/pkgsel.postinst" > /usr/lib/post-base-installer.d/90skip-tasksel &&  \
-        chmod +x /usr/lib/post-base-installer.d/90skip-tasksel
-
-d-i preseed/late_command string \
-	in-target sed -i 's,^[# \t]*PermitRootLogin.*,PermitRootLogin yes,' /etc/ssh/sshd_config ; \
-	in-target apt-get update ; \
-	in-target apt-get -y upgrade
-
-d-i finish-install/reboot_in_progress note
diff --git a/http/ubuntu/preseed.cfg b/http/ubuntu/preseed.cfg
new file mode 100644
index 0000000..72e0ea4
--- /dev/null
+++ b/http/ubuntu/preseed.cfg
@@ -0,0 +1,54 @@
+d-i debian-installer/locale string en_US
+d-i time/zone string UTC
+d-i keyboard-configuration/xkb-keymap select de
+
+d-i mirror/country string de
+
+d-i partman-basicfilesystems/choose_label string gpt
+d-i partman-basicfilesystems/default_label string gpt
+d-i partman-basicfilesystems/no_swap boolean false
+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
+d-i partman-auto/method string regular
+d-i partman-auto/expert_recipe string \
+  scheme ::                           \
+    32 32 32 free                     \
+      $gptonly{ }                     \
+      $primary{ }                     \
+      $bios_boot{ }                   \
+      method{ biosgrub } .            \
+    1 0 -1 ext4                       \
+      $gptonly{ }                     \
+      $primary{ }                     \
+      method{ format }                \
+      format{ }                       \
+      use_filesystem{ }               \
+      filesystem{ xfs }               \
+      label{ SLX_SYS }                \
+      mountpoint{ / } .
+d-i partman-partitioning/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
+
+d-i base-installer/excludes string laptop-detect
+d-i passwd/make-user boolean false
+d-i passwd/root-login boolean true
+d-i user-setup/allow-password-weak boolean true
+
+## install base packages ##
+d-i pkgsel/include string curl openssh-server ansible
+d-i pkgsel/language-packs multiselect de, en
+d-i preseed/early_command string                                                                                                                \
+        mkdir -p /usr/lib/post-base-installer.d &&                                                                                              \
+        echo "sed -i -e 's/^in-target.*tasksel.*/#\\0/' /var/lib/dpkg/info/pkgsel.postinst" > /usr/lib/post-base-installer.d/90skip-tasksel &&  \
+        chmod +x /usr/lib/post-base-installer.d/90skip-tasksel
+
+d-i preseed/late_command string \
+	in-target sed -i 's,^[# \t]*PermitRootLogin.*,PermitRootLogin yes,' /etc/ssh/sshd_config ; \
+	in-target apt-get update ; \
+	in-target apt-get -y upgrade
+
+d-i finish-install/reboot_in_progress note
-- 
cgit v1.2.3-55-g7522