From 87012b5232c5f49b1b2e5b54b9d50c65f2826d89 Mon Sep 17 00:00:00 2001 From: Karanbir Singh Date: Aug 13 2014 00:47:48 +0000 Subject: fix hostname issues --- diff --git a/SOURCES/cloud-init-centos-hostnamefix.patch b/SOURCES/cloud-init-centos-hostnamefix.patch new file mode 100644 index 0000000..495e284 --- /dev/null +++ b/SOURCES/cloud-init-centos-hostnamefix.patch @@ -0,0 +1,11 @@ +diff -uNr cloud-init-0.7.5__orig/cloudinit/distros/rhel.py cloud-init-0.7.5/cloudinit/distros/rhel.py +--- cloud-init-0.7.5__orig/cloudinit/distros/rhel.py 2014-04-01 19:26:07.000000000 +0100 ++++ cloud-init-0.7.5/cloudinit/distros/rhel.py 2014-08-13 01:45:26.485837406 +0100 +@@ -103,6 +103,7 @@ + (dist, vers) = util.system_info()['dist'][:2] + major = (int)(vers.split('.')[0]) + return ((dist.startswith('Red Hat Enterprise Linux') and major >= 7) ++ or (dist.startswith('CentOS Linux') and major >= 7) + or (dist.startswith('Fedora') and major >= 18)) + + def apply_locale(self, locale, out_fn=None): diff --git a/SPECS/cloud-init.spec b/SPECS/cloud-init.spec index 560f443..aacba62 100644 --- a/SPECS/cloud-init.spec +++ b/SPECS/cloud-init.spec @@ -7,7 +7,7 @@ Name: cloud-init Version: 0.7.5 -Release: 1%{?dist}.2 +Release: 1%{?dist}.3 Summary: Cloud instance init scripts Group: System Environment/Base @@ -27,6 +27,7 @@ Patch0003: 0003-Stopped-calling-udevadm-settle-with-quiet-since-syst.patch Patch0004: 0004-fix-typo-in-settings.py-preventing-metadata-being-fe.patch Patch1001: cloud-init-centos-opennebula.patch +Patch1002: cloud-init-centos-hostnamefix.patch # Deal with noarch -> arch # https://bugzilla.redhat.com/show_bug.cgi?id=1067089 @@ -74,6 +75,7 @@ ssh keys and to let the user run various scripts. %patch0003 -p1 %patch0004 -p1 %patch1001 -p1 +%patch1002 -p1 cp -p %{SOURCE2} README.rhel @@ -163,6 +165,9 @@ fi %changelog +* Wed Aug 13 2014 Karanbir Singh +- add a patch to fix hostname issues ( Thomas Oulevey ) + * Tue Jul 29 2014 Karanbir Singh - Upgrade the opennebula datasource