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

- Drop the generator (bsc#1089824, boo#1093501)

Browse Source 
+ The generator spawns a script called ds-identify which in turn calls
    blkid. When the generator executes the environment may or may not be
    ready. The generator speeds up the boot process in cases where
    cloud-init is enabled but we are not in an environment where cloud-init
    should run -> Don't do that.

OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/cloud-init?expand=0&rev=112
This commit is contained in:
Robert Schweikert 2018-05-16 15:27:17 +00:00 committed by Git OBS Bridge
parent 07647c7388
commit 9ef5d09e98
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cloud-init.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Wed May 16 15:21:33 UTC 2018 - rjschwei@suse.com
- Drop the generator (bsc#1089824, boo#1093501)
+ The generator spawns a script called ds-identify which in turn calls
blkid. When the generator executes the environment may or may not be
ready. The generator speeds up the boot process in cases where
cloud-init is enabled but we are not in an environment where cloud-init
should run -> Don't do that.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri May 11 14:20:28 UTC 2018 - rjschwei@suse.com Fri May 11 14:20:28 UTC 2018 - rjschwei@suse.com

6
cloud-init.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package cloud-init # spec file for package cloud-init
# #
# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2018 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -261,6 +261,9 @@ rm %{buildroot}/%{_sysconfdir}/cloud/templates/*.debian.*
rm %{buildroot}/%{_sysconfdir}/cloud/templates/*.redhat.* rm %{buildroot}/%{_sysconfdir}/cloud/templates/*.redhat.*
rm %{buildroot}/%{_sysconfdir}/cloud/templates/*.ubuntu.* rm %{buildroot}/%{_sysconfdir}/cloud/templates/*.ubuntu.*
# Remove the systemd generator (bsc#1089824, boo#1093501)
rm -rf %{buildroot}/%{systemd_prefix}/systemd/system-generators/cloud-init-generator
# move sysvinit scripts into the "right" place # move sysvinit scripts into the "right" place
%if 0%{?suse_version} && 0%{?suse_version} <= 1210 %if 0%{?suse_version} && 0%{?suse_version} <= 1210
mkdir -p %{buildroot}/%{_initddir} mkdir -p %{buildroot}/%{_initddir}
@ -315,7 +318,6 @@ popd
%attr(0755, root, root) %{_initddir}/cloud-init-local %attr(0755, root, root) %{_initddir}/cloud-init-local
%attr(0755, root, root) %{_initddir}/cloud-final %attr(0755, root, root) %{_initddir}/cloud-final
%else %else
%{systemd_prefix}/systemd/system-generators/cloud-init-generator
%{systemd_prefix}/systemd/system/cloud-config.service %{systemd_prefix}/systemd/system/cloud-config.service
%{systemd_prefix}/systemd/system/cloud-config.target %{systemd_prefix}/systemd/system/cloud-config.target
%{systemd_prefix}/systemd/system/cloud-init-local.service %{systemd_prefix}/systemd/system/cloud-init-local.service