diff --git a/0001-cloud-init-anolis-user.patch b/0001-cloud-init-anolis-user.patch new file mode 100644 index 0000000000000000000000000000000000000000..6118d3f744cc15bfd7aa4680b28d64c7dd3e85ad --- /dev/null +++ b/0001-cloud-init-anolis-user.patch @@ -0,0 +1,12 @@ +diff -uNrp cloud-init-19.4.orig/rhel/cloud.cfg cloud-init-19.4/rhel/cloud.cfg +--- cloud-init-19.4.orig/rhel/cloud.cfg 2020-10-13 14:40:36.353779891 +0000 ++++ cloud-init-19.4/rhel/cloud.cfg 2020-10-13 14:42:10.121982459 +0000 +@@ -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] diff --git a/cloud-init.spec b/cloud-init.spec index e3734e89b3ad9ce38b68e91f12f776aecd4d1cb8..f9f5fa9f9893bb1c475777a68878233bfcafa628 100644 --- a/cloud-init.spec +++ b/cloud-init.spec @@ -1,3 +1,5 @@ +%define anolis_release .0.1 + %if %{rhel} >= 8 %global __python %{__python3} %else @@ -13,7 +15,7 @@ Name: cloud-init Version: 19.4 -Release: 7%{?dist}.5 +Release: 7%{anolis_release}%{?dist}.5 Summary: Cloud instance init scripts Group: System Environment/Base @@ -67,6 +69,10 @@ Patch25: ci-DataSourceAzure-update-password-for-defuser-if-exist.patch # For bz#1897616 - [rhel-7]cloud-final.service fails if NetworkManager not installed. Patch26: ci-Fix-unit-failure-of-cloud-final.service-if-NetworkMa.patch +#Add by Anolis +Patch9999: 0001-cloud-init-anolis-user.patch +#end + # Deal with noarch -> arch # https://bugzilla.redhat.com/show_bug.cgi?id=1067089 Obsoletes: cloud-init < 0.7.5-3 @@ -236,6 +242,10 @@ fi %config(noreplace) %{_sysconfdir}/rsyslog.d/21-cloudinit.conf %changelog +* Thu Jan 06 2022 Jacob Wang - 19.4-7.0.1.5 +- Rebrand to Anolis OS +- Cherry-pick [6b3f611] + * Tue Jun 29 2021 Miroslav Rezanina - 19.4-7.el7_9.5 - ci-Fix-unit-failure-of-cloud-final.service-if-NetworkMa.patch [bz#1897616] - Resolves: bz#1897616