SHA256
1
0
forked from pool/cloud-init

- do not package any none SUSE/openSUSE templates bnc#839707

- add patch openSUSEhostsTemplate.diff to add an openSUSE hosts template

OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/cloud-init?expand=0&rev=10
This commit is contained in:
Robert Schweikert 2014-03-19 21:38:02 +00:00 committed by Git OBS Bridge
parent 9066aef710
commit 56a9174e6f
3 changed files with 43 additions and 0 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Mar 19 21:36:19 UTC 2014 - rschweikert@suse.com
- do not package any none SUSE/openSUSE templates bnc#839707
- add patch openSUSEhostsTemplate.diff to add an openSUSE hosts template
-------------------------------------------------------------------
Wed Mar 19 20:49:32 UTC 2014 - rschweikert@suse.com

View File

@ -29,6 +29,7 @@ Patch1: addopenSUSEBase.diff
Patch2: openSUSEHandler.diff
Patch3: setupSUSEsysVInit.diff
Patch4: azure_1269626.diff
Patch5: openSUSEhostsTemplate.diff
BuildRequires: fdupes
BuildRequires: filesystem
BuildRequires: python-devel
@ -98,6 +99,8 @@ Unit tests for the cloud-init tools
%patch2 -p1
%patch3 -p1
%patch4
%patch5
%if 0%{?suse_version} <= 1130
# disable ecdsa for SLE 11 (not available)
echo "ssh_genkeytypes: ['rsa', 'dsa']" >> %{SOURCE1}
@ -141,6 +144,11 @@ sed -i s/INSERT_SUSE_DISTRO/opensuse/ %{buildroot}/%{_sysconfdir}/cloud/cloud.cf
# remove debian/ubuntu specific profile.d file (bnc#779553)
rm -f %{buildroot}%{_sysconfdir}/profile.d/Z99-cloud-locale-test.sh
# Remove non-SUSE templates
rm %{buildroot}/%{_sysconfdir}/cloud/templates/*.debian.*
rm %{buildroot}/%{_sysconfdir}/cloud/templates/*.redhat.*
rm %{buildroot}/%{_sysconfdir}/cloud/templates/*.ubuntu.*
# move sysvinit scripts into the "right" place
%if 0%{?suse_version} && 0%{?suse_version} <= 1210
mkdir -p %{buildroot}/%{_initddir}

View File

@ -0,0 +1,29 @@
--- /dev/null
+++ templates/hosts.opensuse.tmpl
@@ -0,0 +1,26 @@
+*
+ This file /etc/cloud/templates/hosts.opensuse.tmpl is only utilized
+ if enabled in cloud-config. Specifically, in order to enable it
+ you need to add the following to config:
+ manage_etc_hosts: True
+*#
+# Your system has configured 'manage_etc_hosts' as True.
+# As a result, if you wish for changes to this file to persist
+# then you will need to either
+# a.) make changes to the master file in
+# /etc/cloud/templates/hosts.opensuse.tmpl
+# b.) change or remove the value of 'manage_etc_hosts' in
+# /etc/cloud/cloud.cfg or cloud-config from user-data
+#
+# The following lines are desirable for IPv4 capable hosts
+127.0.0.1 localhost
+
+# The following lines are desirable for IPv6 capable hosts
+::1 localhost ipv6-localhost ipv6-loopback
+fe00::0 ipv6-localnet
+
+ff00::0 ipv6-mcastprefix
+ff02::1 ipv6-allnodes
+ff02::2 ipv6-allrouters
+ff02::3 ipv6-allhosts
+