From 5f2ba83e131c5a67f979abb909fecb59651c44ac Mon Sep 17 00:00:00 2001
From: Raul Benencia <rul@kalgan.cc>
Date: Wed, 1 Apr 2020 10:09:26 -0700
Subject: Support config subdirectories

---
 configs/data-dir/ipxe/debian.ipxe.slc               | 2 +-
 configs/data-dir/ipxe/storage.ipxe.slc              | 2 +-
 configs/data-dir/ipxe/ubuntu-minimal.ipxe.slc       | 2 +-
 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 ++--
 7 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'configs')

diff --git a/configs/data-dir/ipxe/debian.ipxe.slc b/configs/data-dir/ipxe/debian.ipxe.slc
index 8717d5e..6a29bbd 100644
--- a/configs/data-dir/ipxe/debian.ipxe.slc
+++ b/configs/data-dir/ipxe/debian.ipxe.slc
@@ -10,7 +10,7 @@ chain http://{{.baseURL}}/configs/linux.cfg?hostname={{.hostname}}
 
 imgfree
 
-kernel ${mirror}/linux auto=true priority=critical initrd=initrd.gz keyboard-configuration/xkb-keymap=us preseed/url=http://{{.baseURL}}/configs/debian.preseed ${linuxargs}
+kernel ${mirror}/linux auto=true priority=critical initrd=initrd.gz keyboard-configuration/xkb-keymap=us preseed/url=http://{{.baseURL}}/configs/preseeds/debian?encrypt_home={{.encrypt_home}} ${linuxargs}
 initrd ${mirror}/initrd.gz
 boot
 {{end}}
diff --git a/configs/data-dir/ipxe/storage.ipxe.slc b/configs/data-dir/ipxe/storage.ipxe.slc
index 457dad7..174949d 100644
--- a/configs/data-dir/ipxe/storage.ipxe.slc
+++ b/configs/data-dir/ipxe/storage.ipxe.slc
@@ -10,7 +10,7 @@ chain --autofree http://{{.baseURL}}/configs/linux.cfg?hostname={{.hostname}}
 
 imgfree
 
-kernel ${mirror}/linux auto=true priority=critical initrd=initrd.gz preseed/url=http://{{.baseURL}}/configs/storage.preseed ${linuxargs}
+kernel ${mirror}/linux auto=true priority=critical initrd=initrd.gz preseed/url=http://{{.baseURL}}/configs/preseeds/storage ${linuxargs}
 initrd ${mirror}/initrd.gz
 boot
 {{end}}
\ No newline at end of file
diff --git a/configs/data-dir/ipxe/ubuntu-minimal.ipxe.slc b/configs/data-dir/ipxe/ubuntu-minimal.ipxe.slc
index e52f63c..ef4e61e 100644
--- a/configs/data-dir/ipxe/ubuntu-minimal.ipxe.slc
+++ b/configs/data-dir/ipxe/ubuntu-minimal.ipxe.slc
@@ -10,7 +10,7 @@ chain http://{{.baseURL}}/configs/linux.cfg?hostname={{.hostname}}
 
 imgfree
 
-kernel ${mirror}/linux auto=true priority=critical initrd=initrd.gz preseed/url=http://{{.baseURL}}/configs/ubuntu-minimal.preseed ${linuxargs}
+kernel ${mirror}/linux auto=true priority=critical initrd=initrd.gz preseed/url=http://{{.baseURL}}/configs/preseeds/ubuntu-minimal ${linuxargs}
 initrd ${mirror}/initrd.gz
 boot
 {{end}}
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