diff --git a/SOURCES/cloud-init-add-centos-os.patch b/SOURCES/cloud-init-add-centos-os.patch new file mode 100644 index 0000000..977c156 --- /dev/null +++ b/SOURCES/cloud-init-add-centos-os.patch @@ -0,0 +1,43 @@ +diff --git a/cloudinit/distros/__init__.py b/cloudinit/distros/__init__.py +index f56c0cf..1fd48a7 100755 +--- a/cloudinit/distros/__init__.py ++++ b/cloudinit/distros/__init__.py +@@ -32,7 +32,7 @@ from cloudinit.distros.parsers import hosts + + OSFAMILIES = { + 'debian': ['debian', 'ubuntu'], +- 'redhat': ['fedora', 'rhel'], ++ 'redhat': ['centos', 'fedora', 'rhel'], + 'gentoo': ['gentoo'], + 'freebsd': ['freebsd'], + 'suse': ['sles'], +diff --git a/cloudinit/distros/centos.py b/cloudinit/distros/centos.py +new file mode 100644 +index 0000000..4b803d2 +--- /dev/null ++++ b/cloudinit/distros/centos.py +@@ -0,0 +1,12 @@ ++# This file is part of cloud-init. See LICENSE file for license information. ++ ++from cloudinit.distros import rhel ++from cloudinit import log as logging ++ ++LOG = logging.getLogger(__name__) ++ ++ ++class Distro(rhel.Distro): ++ pass ++ ++# vi: ts=4 expandtab +diff -uNr cloud-init-0.7.9__orig/rhel/cloud.cfg cloud-init-0.7.9/rhel/cloud.cfg +--- cloud-init-0.7.9__orig/rhel/cloud.cfg 2017-09-05 22:20:14.302075947 +0100 ++++ cloud-init-0.7.9/rhel/cloud.cfg 2017-09-05 22:20:37.912076373 +0100 +@@ -52,7 +52,7 @@ + + system_info: + default_user: +- name: cloud-user ++ name: centos + lock_passwd: true + gecos: Cloud User + groups: [wheel, adm, systemd-journal] diff --git a/SOURCES/cloud-init-rhel.cfg b/SOURCES/cloud-init-rhel.cfg index 986f241..675df1c 100644 --- a/SOURCES/cloud-init-rhel.cfg +++ b/SOURCES/cloud-init-rhel.cfg @@ -51,7 +51,7 @@ cloud_final_modules: system_info: default_user: - name: cloud-user + name: centos lock_passwd: true gecos: Cloud User groups: [wheel, adm, systemd-journal] diff --git a/SPECS/cloud-init.spec b/SPECS/cloud-init.spec index ab88b70..390ed96 100644 --- a/SPECS/cloud-init.spec +++ b/SPECS/cloud-init.spec @@ -69,6 +69,8 @@ Patch41: ci-DataSourceAzure.py-use-hostnamectl-to-set-hostname.patch # For bz#1578702 - cloud-init-0.7.9-9.el7_4.6 breaks IPv4/IPv6 dual-stack EC2 instances in AWS [rhel-7.5.z] Patch42: ci-sysconfig-Don-t-disable-IPV6_AUTOCONF.patch +Patch9999: cloud-init-add-centos-os.patch + # Deal with noarch -> arch # https://bugzilla.redhat.com/show_bug.cgi?id=1067089 Obsoletes: cloud-init < 0.7.5-3 @@ -217,6 +219,9 @@ fi %config(noreplace) %{_sysconfdir}/rsyslog.d/21-cloudinit.conf %changelog +* Tue Jun 25 2018 Johnny Hughes - 0.7.9-24.el7_5.1 +- Manual CentOS Debranding + * Thu May 17 2018 Miroslav Rezanina - 0.7.9-24.el7_5.1 - ci-Revert-azure-Fix-publishing-of-hostname.patch [bz#1568717] - ci-DataSourceAzure.py-use-hostnamectl-to-set-hostname.patch [bz#1568717]