From 8e169bf8749f61e25a74ddba810a1d22d17cced4 Mon Sep 17 00:00:00 2001
From: Louis Abel <tucklesepk@gmail.com>
Date: Wed, 10 Jan 2024 11:19:04 -0700
Subject: [PATCH] fix patch
---
ROCKY/CFG/cloud-init.cfg | 2 +-
...cloud-user-is-applied-to-Rocky-Linux.patch | 26 +++++++++----------
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/ROCKY/CFG/cloud-init.cfg b/ROCKY/CFG/cloud-init.cfg
index 4fa4432..0683e21 100644
--- a/ROCKY/CFG/cloud-init.cfg
+++ b/ROCKY/CFG/cloud-init.cfg
@@ -10,7 +10,7 @@ spec_change {
}
append {
field: "Release"
- value: ".0.1"
+ value: ".0.2"
}
changelog {
author_name: "Release Engineering"
diff --git a/ROCKY/_supporting/0001-Ensure-cloud-user-is-applied-to-Rocky-Linux.patch b/ROCKY/_supporting/0001-Ensure-cloud-user-is-applied-to-Rocky-Linux.patch
index d4b7c1d..3157222 100644
--- a/ROCKY/_supporting/0001-Ensure-cloud-user-is-applied-to-Rocky-Linux.patch
+++ b/ROCKY/_supporting/0001-Ensure-cloud-user-is-applied-to-Rocky-Linux.patch
@@ -1,6 +1,6 @@
-From d9e8b21ddd0222c306a92efa56a7bad5429d8c17 Mon Sep 17 00:00:00 2001
+From 04ed6b97753d37604ee74b5862a8cd41e4e4f0f1 Mon Sep 17 00:00:00 2001
From: Louis Abel <label@rockylinux.org>
-Date: Tue, 8 Aug 2023 12:54:03 -0700
+Date: Wed, 10 Jan 2024 11:18:08 -0700
Subject: [PATCH] Ensure cloud-user is applied to Rocky Linux
---
@@ -8,18 +8,18 @@ Subject: [PATCH] Ensure cloud-user is applied to Rocky Linux
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/config/cloud.cfg.tmpl b/config/cloud.cfg.tmpl
-index 08b6efb..ed82d8d 100644
+index 7238c10..464e8bd 100644
--- a/config/cloud.cfg.tmpl
+++ b/config/cloud.cfg.tmpl
-@@ -2,7 +2,7 @@
- # The top level settings are used as module
- # and system configuration.
- {% set is_bsd = variant in ["dragonfly", "freebsd", "netbsd", "openbsd"] %}
--{% set is_rhel = variant in ["rhel", "centos"] %}
-+{% set is_rhel = variant in ["rhel", "centos", "rocky"] %}
- {% if is_bsd %}
- syslog_fix_perms: root:wheel
- {% elif variant in ["suse"] %}
+@@ -262,7 +262,7 @@ system_info:
+ name: ec2-user
+ lock_passwd: True
+ gecos: EC2 Default User
+-{% elif variant in ["rhel", "centos"] %}
++{% elif variant in ["rhel", "centos", "rocky"] %}
+ name: cloud-user
+ lock_passwd: true
+ gecos: Cloud User
--
-2.41.0
+2.43.0
--
GitLab