From 2822cb946ef0037363e6a8508256d96408551aa4 Mon Sep 17 00:00:00 2001
From: Beth Parker <ejparker@actcur.com>
Date: Sun, 23 Mar 2025 06:28:47 -0500
Subject: [PATCH] fixed base_files
---
base_files/{kickstart.cfg2 => kickstart.cfg} | 16 +++-------------
...guration.json.bak => user_configuration.json} | 11 -----------
2 files changed, 3 insertions(+), 24 deletions(-)
rename base_files/{kickstart.cfg2 => kickstart.cfg} (67%)
rename base_files/{user_configuration.json.bak => user_configuration.json} (91%)
diff --git a/base_files/kickstart.cfg2 b/base_files/kickstart.cfg
similarity index 67%
rename from base_files/kickstart.cfg2
rename to base_files/kickstart.cfg
index 2ace4bf..0a5a6f0 100644
--- a/base_files/kickstart.cfg2
+++ b/base_files/kickstart.cfg
@@ -39,20 +39,10 @@ part / --fstype="ext4" --ondisk=sda --grow --size=5000
# System timezone
timezone America/Chicago --utc
-#Root password
+# Add root ssh key to allow install script to run ansible
rootpw --lock
sshkey --username=root "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILG56T1k766Cru14kyXI8WXSJwlO2sVhmH6JeRWy+mfe root@host.actcur.com"
-user --groups=wheel --name=no --password=$6$pZnQonMmlKoyuv8c$E7THwTYjb4E65r0dRReXV/jKHuKXQSULhpf/DPyQJZkap5KPXKOAiaO2iVF2dHDxnYQDwqpysPnHQ6sh4AJBg0 --iscrypted --gecos="no"
-%post
-#Add root ssh for completing build
-mkdir /root/.ssh/
-cat <<EOF >/root/.ssh/authorized_keys
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILG56T1k766Cru14kyXI8WXSJwlO2sVhmH6JeRWy+mfe root@host.actcur.com
-EOF
+# Reboot at end
+reboot
-chmod 0700 /root/.ssh/
-chmod 0600 /root/.ssh/authorized_keys
-
-restorecon -R /root/.ssh/
-%end
diff --git a/base_files/user_configuration.json.bak b/base_files/user_configuration.json
similarity index 91%
rename from base_files/user_configuration.json.bak
rename to base_files/user_configuration.json
index 0631b4c..3bf57e8 100644
--- a/base_files/user_configuration.json.bak
+++ b/base_files/user_configuration.json
@@ -75,17 +75,6 @@
"kernels": [
"linux"
],
- "mirror_config": {
- "custom_mirrors": [
- {
- "name": "aur-local",
- "sign_check": "Never",
- "sign_option": "TrustAll",
- "url": "https://pkg.actcur.com/repo/archlinux/$repo/os/$arch"
- }
- ],
- "mirror_regions": {}
- },
"locale_config": {
"kb_layout": "us",
"sys_enc": "UTF-8",