From bfab8e04cc515e6d2bdc6c0df3ecacb941a32cf1 Mon Sep 17 00:00:00 2001
From: Louis Abel <tucklesepk@gmail.com>
Date: Tue, 8 Aug 2023 12:54:33 -0700
Subject: [PATCH] fix patch
---
...cloud-user-is-applied-to-Rocky-Linux.patch | 26 +++++++++----------
1 file changed, 13 insertions(+), 13 deletions(-)
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 140f33d..d4b7c1d 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 0bd79b358111cc897b508131916dbc3035bcf280 Mon Sep 17 00:00:00 2001
+From d9e8b21ddd0222c306a92efa56a7bad5429d8c17 Mon Sep 17 00:00:00 2001
From: Louis Abel <label@rockylinux.org>
-Date: Tue, 25 Apr 2023 18:08:54 -0700
+Date: Tue, 8 Aug 2023 12:54:03 -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 12f32c5..c712aa4 100644
+index 08b6efb..ed82d8d 100644
--- a/config/cloud.cfg.tmpl
+++ b/config/cloud.cfg.tmpl
-@@ -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,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"] %}
--
-2.40.0
+2.41.0
--
GitLab