From 8d7f0cbbcbb8e39e35eba3a46425eb0baec002100338fce0d71350e3f0039bce Mon Sep 17 00:00:00 2001 From: Robert Schweikert Date: Thu, 5 Jul 2018 18:00:50 +0000 Subject: [PATCH] - The distribution inidcator is set to suse during template expansion, we do not replace anything set to ubuntu - Do not run cloud-init after network-online, this breaks functionality in cloud-init. Certain parts of the code running in this phase expect to run before the network is on-line. This "re-introduces" boo#1097388. But the changes made are not generic enough. - Root should not be enabled by default. For image builders/users that want root access by default they should provide an appropriate configuration file during image build or image setup OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/cloud-init?expand=0&rev=117 --- cloud-init.changes | 13 +++++++++++++ cloud-init.spec | 7 ++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/cloud-init.changes b/cloud-init.changes index bdd0481..0dab50e 100644 --- a/cloud-init.changes +++ b/cloud-init.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Thu Jul 5 17:59:12 UTC 2018 - rjschwei@suse.com + +- The distribution inidcator is set to suse during template expansion, + we do not replace anything set to ubuntu +- Do not run cloud-init after network-online, this breaks functionality in + cloud-init. Certain parts of the code running in this phase expect to run + before the network is on-line. This "re-introduces" boo#1097388. But the + changes made are not generic enough. +- Root should not be enabled by default. For image builders/users that want + root access by default they should provide an appropriate configuration + file during image build or image setup + ------------------------------------------------------------------- Wed Jun 27 15:42:34 UTC 2018 - bwiedemann@suse.com diff --git a/cloud-init.spec b/cloud-init.spec index b63bbf9..a226256 100644 --- a/cloud-init.spec +++ b/cloud-init.spec @@ -59,7 +59,7 @@ Patch43: cloud-init-no-trace-empt-sect.patch # FIXME cloud-init-setpath-gen.patch (boo#1093501) # Merged upstream remove for 18.3 Patch44: cloud-init-setpath-dsitentify.patch -Patch45: cloud-init-network-online.patch +#Patch45: cloud-init-network-online.patch BuildRequires: fdupes BuildRequires: filesystem # pkg-config is needed to find correct systemd unit dir @@ -207,7 +207,7 @@ Documentation and examples for cloud-init tools %patch42 %patch43 %patch44 -%patch45 -p1 +#%patch45 -p1 %build %if 0%{?suse_version} && 0%{?suse_version} <= 1315 @@ -247,10 +247,7 @@ mkdir -p %{buildroot}%{_defaultdocdir} mv %{buildroot}%{_datadir}/doc/%{name} %{buildroot}%{docdir} # copy the LICENSE cp LICENSE %{buildroot}%{docdir} -sed -i -e 's,disable_root: .*,disable_root: false,' %{buildroot}/%{_sysconfdir}/cloud/cloud.cfg # Set the distribution indicator -%if 0%{?suse_version} -sed -i s/ubuntu/suse/ %{buildroot}/%{_sysconfdir}/cloud/cloud.cfg %if 0%{?is_opensuse} sed -i s/suse/opensuse/ %{buildroot}/%{_sysconfdir}/cloud/cloud.cfg %else