From 5f2ba83e131c5a67f979abb909fecb59651c44ac Mon Sep 17 00:00:00 2001 From: Raul Benencia Date: Wed, 1 Apr 2020 10:09:26 -0700 Subject: Support config subdirectories --- configs/data-dir/preseed/common.preseed.slc | 2 +- configs/data-dir/preseed/debian.preseed.slc | 6 +++--- configs/data-dir/preseed/storage.preseed.slc | 4 ++-- configs/data-dir/preseed/ubuntu-minimal.preseed.slc | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'configs/data-dir/preseed') diff --git a/configs/data-dir/preseed/common.preseed.slc b/configs/data-dir/preseed/common.preseed.slc index bcbf98b..8abd284 100644 --- a/configs/data-dir/preseed/common.preseed.slc +++ b/configs/data-dir/preseed/common.preseed.slc @@ -1,4 +1,4 @@ -{{define "common.preseed"}} +{{define "preseeds/common"}} d-i auto-install/enable boolean true d-i debian-installer/locale string en_US d-i console-setup/ask_detect boolean false diff --git a/configs/data-dir/preseed/debian.preseed.slc b/configs/data-dir/preseed/debian.preseed.slc index 0915fe3..ab37afc 100644 --- a/configs/data-dir/preseed/debian.preseed.slc +++ b/configs/data-dir/preseed/debian.preseed.slc @@ -1,5 +1,5 @@ -{{define "debian.preseed" -}} -{{template "common.preseed"}} +{{define "preseeds/debian" -}} +{{template "preseeds/common"}} d-i partman-auto/method string regular d-i partman-lvm/device_remove_lvm boolean true @@ -15,7 +15,7 @@ d-i partman/choose_partition select finish d-i partman/confirm boolean true d-i partman/confirm_nooverwrite boolean true -d-i user-setup/encrypt-home boolean false +d-i user-setup/encrypt-home boolean {{.encrypt_home}} d-i base-installer/install-recommends boolean true diff --git a/configs/data-dir/preseed/storage.preseed.slc b/configs/data-dir/preseed/storage.preseed.slc index 982b41b..ca2aadc 100644 --- a/configs/data-dir/preseed/storage.preseed.slc +++ b/configs/data-dir/preseed/storage.preseed.slc @@ -1,5 +1,5 @@ -{{define "storage.preseed" -}} -{{template "common.preseed"}} +{{define "preseeds/storage" -}} +{{template "preseeds/common"}} # The method should be set to "raid". d-i partman-auto/method string raid diff --git a/configs/data-dir/preseed/ubuntu-minimal.preseed.slc b/configs/data-dir/preseed/ubuntu-minimal.preseed.slc index 2138764..08013ff 100644 --- a/configs/data-dir/preseed/ubuntu-minimal.preseed.slc +++ b/configs/data-dir/preseed/ubuntu-minimal.preseed.slc @@ -1,5 +1,5 @@ -{{define "ubuntu-minimal.preseed" -}} -{{template "common.preseed"}} +{{define "preseeds/ubuntu-minimal" -}} +{{template "preseeds/common"}} d-i partman-auto/method string regular d-i partman-lvm/device_remove_lvm boolean true -- cgit v1.2.3