From 1f13d2a2f3382bfa5f8d8b8b9f4873f5a4cf88d4 Mon Sep 17 00:00:00 2001
From: Don Penney <don.penney@windriver.com>
Date: Wed, 18 Sep 2019 14:32:03 -0400
Subject: [PATCH] Support custom kickstart addon for install from USB

This update provides support for a user-defined kickstart
addon, in conjunction with the update-iso.sh utility, that
allows for custom post-install configuration for initial
installation from USB.

Story: 2006595
Task: 36737
Change-Id: I9cdff82b83bf1e4824ee7583d5985d4e0997cb42
Signed-off-by: Don Penney <don.penney@windriver.com>
---
 bsp-files/centos-ks-gen.pl              |  9 ++++---
 bsp-files/kickstarts/post_usb_addon.cfg | 36 +++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 3 deletions(-)
 create mode 100644 bsp-files/kickstarts/post_usb_addon.cfg

diff --git a/bsp-files/centos-ks-gen.pl b/bsp-files/centos-ks-gen.pl
index b4efc591..32c4a2e4 100755
--- a/bsp-files/centos-ks-gen.pl
+++ b/bsp-files/centos-ks-gen.pl
@@ -46,7 +46,8 @@ write_config_file("controller",
                   "post_common.cfg",
                   "post_kernel_controller.cfg",
                   "post_lvm_pv_on_rootfs.cfg",
-                  "post_usb_controller.cfg");
+                  "post_usb_controller.cfg",
+                  "post_usb_addon.cfg");
 write_config_file("controller-worker",
                   "${output_dir}/smallsystem_ks.cfg",
                   "pre_common_head.cfg",
@@ -58,7 +59,8 @@ write_config_file("controller-worker",
                   "post_kernel_aio_and_worker.cfg",
                   "post_lvm_pv_on_rootfs.cfg",
                   "post_system_aio.cfg",
-                  "post_usb_controller.cfg");
+                  "post_usb_controller.cfg",
+                  "post_usb_addon.cfg");
 write_config_file("controller-worker-lowlatency",
                   "${output_dir}/smallsystem_lowlatency_ks.cfg",
                   "pre_common_head.cfg",
@@ -70,7 +72,8 @@ write_config_file("controller-worker-lowlatency",
                   "post_kernel_aio_and_worker.cfg",
                   "post_lvm_pv_on_rootfs.cfg",
                   "post_system_aio.cfg",
-                  "post_usb_controller.cfg");
+                  "post_usb_controller.cfg",
+                  "post_usb_addon.cfg");
 
 system("mkdir -p ${pxeboot_output_dir}");
 
diff --git a/bsp-files/kickstarts/post_usb_addon.cfg b/bsp-files/kickstarts/post_usb_addon.cfg
new file mode 100644
index 00000000..edf0244a
--- /dev/null
+++ b/bsp-files/kickstarts/post_usb_addon.cfg
@@ -0,0 +1,36 @@
+%pre --erroronfail
+if [ -d /mnt/install/source ]; then
+    srcdir=/mnt/install/source
+else
+    srcdir=/run/install/repo
+fi
+
+if [ -f ${srcdir}/ks-addon.cfg ]; then
+    cp ${srcdir}/ks-addon.cfg /tmp/
+else
+    cat <<EOF > /tmp/ks-addon.cfg
+# No custom addon included
+EOF
+fi
+%end
+
+%post --nochroot
+if [ -d /mnt/install/source ]; then
+    srcdir=/mnt/install/source
+else
+    srcdir=/run/install/repo
+fi
+
+# Store the ks-addon.cfg for debugging
+mkdir -p /mnt/sysimage/var/log/anaconda
+cp /tmp/ks-addon.cfg /mnt/sysimage/var/log/anaconda/
+%end
+
+%post --erroronfail
+
+# Source common functions
+. /tmp/ks-functions.sh
+
+%include /tmp/ks-addon.cfg
+
+%end