From 430602e416cf98c727576cd59abc239963a5ef98 Mon Sep 17 00:00:00 2001 From: pangqing Date: Thu, 21 Apr 2022 15:27:53 +0800 Subject: [PATCH] rebrand: init anolis user Signed-off-by: Liwei Ge --- cloud-init-anolis-user.patch | 25 +++++++++++++++++++++++++ cloud-init.spec | 7 ++++++- 2 files changed, 31 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..f8937f4 --- /dev/null +++ b/cloud-init-anolis-user.patch @@ -0,0 +1,25 @@ +From 6bc781889769414e715317de72b2d558afe0e270 Mon Sep 17 00:00:00 2001 +From: Chunmei Xu +Date: Wed, 20 Apr 2022 04:02:19 -0400 +Subject: [PATCH] cloud-init anolis user + +--- + rhel/cloud.cfg | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/rhel/cloud.cfg b/rhel/cloud.cfg +index cbee197..d6133fb 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.27.0 + diff --git a/cloud-init.spec b/cloud-init.spec index 33b0b70..2f1c040 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: 21.1 -Release: 14%{?dist} +Release: 14%{anolis_release}%{?dist} Summary: Cloud instance init scripts Group: System Environment/Base @@ -69,6 +70,7 @@ Patch30: ci-Azure-adding-support-for-consuming-userdata-from-IMD.patch Patch31: ci-Fix-IPv6-netmask-format-for-sysconfig-1215.patch # For bz#2026587 - [cloud-init][RHEL8] Support for cloud-init datasource 'cloud-init-vmware-guestinfo' +Patch9999: cloud-init-anolis-user.patch BuildArch: noarch @@ -264,6 +266,9 @@ fi %config(noreplace) %{_sysconfdir}/rsyslog.d/21-cloudinit.conf %changelog +* Wed Apr 20 2022 Liwei Ge - 21.1-14.0.1 +- Rebrand to Anolis OS + * Fri Feb 25 2022 Jon Maloy - 21.1-14 - ci-Fix-IPv6-netmask-format-for-sysconfig-1215.patch [bz#2046540] - Resolves: bz#2046540 -- Gitee