From 7ecf9d8255c73c397e75f411e5d82a2d6d8bc3b3 Mon Sep 17 00:00:00 2001 From: Johnny Hughes Date: Jan 25 2018 16:26:55 +0000 Subject: Manual CentOS Debranding --- 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 055443b..aca51a1 100644 --- a/SPECS/cloud-init.spec +++ b/SPECS/cloud-init.spec @@ -49,6 +49,7 @@ Patch0024: 0024-Identify-Brightbox-as-an-Ec2-datasource-user.patch Patch0025: 0025-AliYun-Enable-platform-identification-and-enable-by-.patch Patch0026: 0026-Fix-alibaba-cloud-unit-tests-to-work-with-0.7.9.patch Patch0027: 0027-systemd-create-run-cloud-init-enabled.patch +Patch9999: cloud-init-add-centos-os.patch # Deal with noarch -> arch # https://bugzilla.redhat.com/show_bug.cgi?id=1067089 @@ -184,6 +185,9 @@ fi %config(noreplace) %{_sysconfdir}/rsyslog.d/21-cloudinit.conf %changelog +* Thu Jan 25 2018 Johnny Hughes 0.7.9-9.2 +- Manual CentOS Debranding + * Thu Dec 21 2017 Ryan McCabe 0.7.9-9.2 - Prevent Azure NM and dhclient hooks from running when cloud-init is disabled (rhbz#1530127)