diff --git a/cloud-init-anolis-user.patch b/cloud-init-anolis-user.patch new file mode 100644 index 0000000000000000000000000000000000000000..df6a3472626d458fd734e238000e6255fa778d93 --- /dev/null +++ b/cloud-init-anolis-user.patch @@ -0,0 +1,26 @@ +From 5ce7f2df5bd6399332f22d11e884957ddfb4fa82 Mon Sep 17 00:00:00 2001 +From: Chunmei Xu +Date: Fri, 24 Apr 2020 11:00:38 -0400 +Subject: [PATCH] cloud-init anolis user + +Signed-off-by: Chunmei Xu +--- + 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 7c05c55be8f48788bc86f239cef4672a1898254d..41f66f3a9ce968a758a70063c33646a60b07e234 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 - 20.3-10.0.1.7 +- Rebrand to Anolis OS + * Wed Dec 08 2021 Jon Maloy - 20.3-10.el8_4.7 - ci-cloudinit-net-handle-two-different-routes-for-the-sa.patch [bz#2028755] - Resolves: bz#2028755