Control: reassign -1 ifupdown 0.8.5 Control: tag -1 patch Martin Pitt [2016-01-03 16:02 +0100]: > Michael Biebl [2015-12-18 14:55 +0100]: > Am 18.12.2015 um 11:12 schrieb > Martin Pitt: > > I agree that this sounds like an upstream bug. If there is not explicit > > Conflicts=shutdown.target, I don't see why the instance should be > > stopped. That would be very inconsistent and unexpected behaviour. > > For the record, I sent an upstream fix for this last week: > > https://github.com/systemd/systemd/pull/2235
Upstream replied there. This PR was not accepted, and I sympathize with the reasoning. Instead, Lennart proposed a different solution for this special case, by just avoiding to run ifup@.service in its own slice; we don't actually need that, so running it in in the standard system.slice fixes both this bug and saves a few cycles by not creating the sub-slice. Reassigning to ifupdown, as ifup@.service moved there in the meantime. git am patch attached. Guus, do you want to review those before committing, or do you want Michael and me to commit updates to the systemd units directly? (I don't actually think it'll happen that often, though.) Thanks, Martin -- Martin Pitt | http://www.piware.de Ubuntu Developer (www.ubuntu.com) | Debian Developer (www.debian.org)
From 745c1938872c8097cbe0b3cee667e97484a1fad8 Mon Sep 17 00:00:00 2001
From: Martin Pitt <martin.p...@ubuntu.com>
Date: Tue, 12 Jan 2016 21:31:38 +0100
Subject: [PATCH] ifup@.service: Avoid stopping on shutdown via stopping
system-ifup.slice
This is a small behaviour change in systemd 228, as instantiated units now
Require= their parent slice instead of just Wants= it.
We don't need resource control on the group of ifup@ units, so just let them
run in the normal system.slice; this avoids stopping them on shutdown, as this
interferes with NFS root and isn't necessary as networking.service already
takes care of shutting down interfaces.
Closes: #761909
LP: #1492546
---
debian/changelog | 2 ++
debian/ifup@.service | 2 ++
2 files changed, 4 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 1db3cfd..b994004 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ ifupdown (0.8.8) UNRELEASED; urgency=medium
* Fix ifquery crash if interface state file does not exist yet.
(Closes: #810779, LP: #1532722)
+ * ifup@.service: Avoid stopping on shutdown via stopping system-ifup.slice
+ (changed behaviour in systemd 228). (Closes: #761909, LP: #1492546)
-- Martin Pitt <mp...@debian.org> Tue, 12 Jan 2016 08:07:23 +0100
diff --git a/debian/ifup@.service b/debian/ifup@.service
index a46a591..7de416c 100644
--- a/debian/ifup@.service
+++ b/debian/ifup@.service
@@ -7,6 +7,8 @@ DefaultDependencies=no
IgnoreOnIsolate=yes
[Service]
+# avoid stopping on shutdown via stopping system-ifup.slice
+Slice=system.slice
ExecStart=/bin/sh -ec 'ifup --allow=hotplug %I; ifquery --state %I'
ExecStop=/sbin/ifdown %I
RemainAfterExit=true
--
2.7.0.rc3
signature.asc
Description: Digital signature
_______________________________________________ Pkg-systemd-maintainers mailing list Pkg-systemd-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-systemd-maintainers
