pool/cloud-init
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- The distribution inidcator is set to suse during template expansion,

Browse Source 
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
This commit is contained in:
Robert Schweikert 2018-07-05 18:00:50 +00:00 committed by Git OBS Bridge
parent 2c6cb5534d
commit 8d7f0cbbcb
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cloud-init.changes
View File

@ -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

7
cloud-init.spec
View File

@ -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