From 2046c09bf47e56b174845e5e8677968be8ea023b Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Mon, 10 Apr 2017 14:08:36 +0200
Subject: [ubuntu] support root password via ROOTPW env

---
 http/ubuntu-16.04/preseed.cfg | 34 ++++++++++++++++------------------
 1 file changed, 16 insertions(+), 18 deletions(-)

(limited to 'http')

diff --git a/http/ubuntu-16.04/preseed.cfg b/http/ubuntu-16.04/preseed.cfg
index 598790b..55dab8d 100644
--- a/http/ubuntu-16.04/preseed.cfg
+++ b/http/ubuntu-16.04/preseed.cfg
@@ -1,6 +1,5 @@
 d-i debian-installer/locale string en_US
 d-i time/zone string UTC
-
 d-i keyboard-configuration/xkb-keymap select de
 
 d-i partman-basicfilesystems/choose_label string gpt
@@ -12,21 +11,21 @@ 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{ ext4 }    \
-		label{ SLX_SYS }    \
-                mountpoint{ / } .
+  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
@@ -35,10 +34,9 @@ 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 passwd/root-password-crypted password $6$6yzbOJJy5auuBh9$XUAtAt/ErLkz6.1t8J4UpyZPPUbKjGO1uATaZaxmG02IhJbOwnJMqI6MTJw.SzbBvy8THCmmoia1tVMfXhGVJ1
 d-i user-setup/allow-password-weak boolean true
 
-d-i pkgsel/include string curl openssh-server sudo ansible
+d-i pkgsel/include string curl openssh-server ansible
 d-i pkgsel/language-packs multiselect
 
 d-i finish-install/reboot_in_progress note
-- 
cgit v1.2.3-55-g7522