Attachment 918549 Details for Bug 850058 – Don't enable by default, use new systemd macros

[patch] Don't enable by default, use new systemd macros

0001-Don-t-enable-by-default.patch (text/plain), 2.27 KB, created by Colin Walters on 2014-07-16 22:18:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Colin Walters

Created: 2014-07-16 22:18:11 UTC

Size: 2.27 KB

patch

obsolete

>From a13ee9336e5f01de968fc3ffc1e471d7cd8fc8e2 Mon Sep 17 00:00:00 2001
>From: Colin Walters <walters@verbum.org>
>Date: Mon, 14 Jul 2014 16:55:33 -0400
>Subject: [PATCH] Don't enable by default
>
>Right now, cloud-init is only installed in the cloud images, so it's OK
>if it enables itself by default.
>
>However, for future Atomic work, we'll likely only have one tree
>that's also running on bare metal, and that will include cloud-init.
>
>This change should be safe because the Fedora Cloud kickstart in
>spin-kickstarts uses services --enabled=cloud-init.
>---
> cloud-init.spec | 25 ++++---------------------
> 1 file changed, 4 insertions(+), 21 deletions(-)
>
>diff --git a/cloud-init.spec b/cloud-init.spec
>index 206aec6..4b044a7 100644
>--- a/cloud-init.spec
>+++ b/cloud-init.spec
>@@ -7,7 +7,7 @@
> 
> Name:           cloud-init
> Version:        0.7.5
>-Release:        6%{?dist}
>+Release:        7%{?dist}
> Summary:        Cloud instance init scripts
> 
> Group:          System Environment/Base
>@@ -112,31 +112,14 @@ cp -p systemd/*  $RPM_BUILD_ROOT/%{_unitdir}
> %clean
> rm -rf $RPM_BUILD_ROOT
> 
>-
> %post
>-if [ $1 -eq 1 ] ; then
>-    # Initial installation
>-    # Enabled by default per "runs once then goes away" exception
>-    /bin/systemctl enable cloud-config.service     >/dev/null 2>&1 || :
>-    /bin/systemctl enable cloud-final.service      >/dev/null 2>&1 || :
>-    /bin/systemctl enable cloud-init.service       >/dev/null 2>&1 || :
>-    /bin/systemctl enable cloud-init-local.service >/dev/null 2>&1 || :
>-fi
>+%systemd_post cloud-config.service cloud-final.service cloud-init.service cloud-init-local.service
> 
> %preun
>-if [ $1 -eq 0 ] ; then
>-    # Package removal, not upgrade
>-    /bin/systemctl --no-reload disable cloud-config.service >/dev/null 2>&1 || :
>-    /bin/systemctl --no-reload disable cloud-final.service  >/dev/null 2>&1 || :
>-    /bin/systemctl --no-reload disable cloud-init.service   >/dev/null 2>&1 || :
>-    /bin/systemctl --no-reload disable cloud-init-local.service >/dev/null 2>&1 || :
>-    # One-shot services -> no need to stop
>-fi
>+%systemd_preun cloud-config.service cloud-final.service cloud-init.service cloud-init-local.service
> 
> %postun
>-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
>-# One-shot services -> no need to restart
>-
>+%systemd_postun
> 
> %files
> %license LICENSE
>-- 
>1.8.3.1
>

Actions: View | Diff

Attachments on bug 850058: 918549