commit 9cb4e2c6a31953b8bbc77b452f2c0a63c1f9bced Author: Scott Moser Date: Tue Mar 17 16:05:42 2015 -0400 use tmpfiles.d to populate /run/network Instead of using 'RuntimeDirectory' in the ifup job, use tmpfiles.d/debian.conf to create /run/network. This way, if files are left over (by design) from the initramfs, they're not deleted. (LP: #1432821) diff --git a/debian/changelog b/debian/changelog index 5271baa..9cb1216 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +systemd (219-4ubuntu6) UNRELEASED; urgency=medium + + * d/extra/units/ifup@.service, d/extra/tmpfiles.d/debian.conf: + use tmpfiles.d population of /run/network rather than + 'RuntimeDirectory' in the ifup service. This way files created + in initramfs are not deleted. (LP: #1432821) + + -- Scott Moser Tue, 17 Mar 2015 16:01:19 -0400 + systemd (219-4ubuntu5) vivid; urgency=medium * Merge from experimental branch: diff --git a/debian/extra/tmpfiles.d/debian.conf b/debian/extra/tmpfiles.d/debian.conf index 83f7586..02612dc 100644 --- a/debian/extra/tmpfiles.d/debian.conf +++ b/debian/extra/tmpfiles.d/debian.conf @@ -11,3 +11,4 @@ L /run/initctl - - - - /run/systemd/initctl/fifo L /run/shm - - - - /dev/shm d /run/sendsigs.omit.d 0755 root root - +d /run/network 0755 root root - diff --git a/debian/extra/units/ifup@.service b/debian/extra/units/ifup@.service index d6dd1b0..e9b100a 100644 --- a/debian/extra/units/ifup@.service +++ b/debian/extra/units/ifup@.service @@ -7,7 +7,6 @@ DefaultDependencies=no [Service] Type=oneshot -RuntimeDirectory=network ExecStart=/sbin/ifup --allow=hotplug %I ExecStartPost=/sbin/ifup --allow=auto %I # only fail if ifupdown knows about the iface AND it's not up