From 037718e293715c5de6774b1a067db713fb2b3c04 Mon Sep 17 00:00:00 2001
From: Chunmei Xu <xuchunmei@openanolis.org>
Date: Fri, 24 Apr 2020 15:06:44 +0800
Subject: [PATCH] rebrand: init anolis user

Signed-off-by: Chunmei Xu <xuchunmei@@openanolis.org>
Signed-off-by: Liwei Ge <geliwei@openanolis.org>
---
 cloud-init-anolis-user.patch | 26 ++++++++++++++++++++++++++
 cloud-init.spec              |  8 +++++++-
 2 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 cloud-init-anolis-user.patch

diff --git a/cloud-init-anolis-user.patch b/cloud-init-anolis-user.patch
new file mode 100644
index 0000000..df6a347
--- /dev/null
+++ b/cloud-init-anolis-user.patch
@@ -0,0 +1,26 @@
+From 5ce7f2df5bd6399332f22d11e884957ddfb4fa82 Mon Sep 17 00:00:00 2001
+From: Chunmei Xu <xuchunmei@openanolis.org>
+Date: Fri, 24 Apr 2020 11:00:38 -0400
+Subject: [PATCH] cloud-init anolis user
+
+Signed-off-by: Chunmei Xu <xuchunmei@openanolis.org>
+---
+ rhel/cloud.cfg | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/rhel/cloud.cfg b/rhel/cloud.cfg
+index f0db3c1..5351805 100644
+--- a/rhel/cloud.cfg
++++ b/rhel/cloud.cfg
+@@ -54,7 +54,7 @@ cloud_final_modules:
+ 
+ system_info:
+   default_user:
+-    name: cloud-user
++    name: anolis
+     lock_passwd: true
+     gecos: Cloud User
+     groups: [adm, systemd-journal]
+-- 
+2.18.1
+
diff --git a/cloud-init.spec b/cloud-init.spec
index 7c05c55..41f66f3 100644
--- a/cloud-init.spec
+++ b/cloud-init.spec
@@ -1,3 +1,4 @@
+%define anolis_release .0.1
 %{!?license: %global license %%doc}
 
 # The only reason we are archful is because dmidecode is ExclusiveArch
@@ -6,7 +7,7 @@
 
 Name:           cloud-init
 Version:        20.3
-Release:        10%{?dist}.7
+Release:        10%{anolis_release}%{?dist}.7
 Summary:        Cloud instance init scripts
 
 Group:          System Environment/Base
@@ -55,6 +56,8 @@ Patch23: ci-cc_ssh.py-fix-private-key-group-owner-and-permission.patch
 # For bz#2028755 - [RHEL-8] Above 19.2 of cloud-init fails to configure routes when configuring static and default routes to the same destination IP [rhel-8.4.0.z]
 Patch24: ci-cloudinit-net-handle-two-different-routes-for-the-sa.patch
 
+Patch9999: cloud-init-anolis-user.patch
+
 BuildArch:      noarch
 
 BuildRequires:  pkgconfig(systemd)
@@ -244,6 +247,9 @@ fi
 %config(noreplace) %{_sysconfdir}/rsyslog.d/21-cloudinit.conf
 
 %changelog
+* Wed Dec 15 2021 Liwei Ge <geliwei@openanolis.org> - 20.3-10.0.1.7
+- Rebrand to Anolis OS
+
 * Wed Dec 08 2021 Jon Maloy <jmaloy@redhat.com> - 20.3-10.el8_4.7
 - ci-cloudinit-net-handle-two-different-routes-for-the-sa.patch [bz#2028755]
 - Resolves: bz#2028755
-- 
Gitee