From b81f0e8f45f09d48fd51f1052fbaa50d4d4e9ed4 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 29 Jan 2016 21:05:06 +0100 Subject: [PATCH] Only ship *.link files as part of the udev package The *.network files are solely used by systemd-networkd and should therefor be shipped by the systemd package. Closes: #808237 --- debian/changelog | 3 +++ debian/control | 2 ++ debian/udev.install | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 5062d3405..ba1c4f2bb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -29,6 +29,9 @@ systemd (228-5) UNRELEASED; urgency=medium * Retrigger cleanup of org.freedesktop.machine1.conf and hwclock-save.service now that dpkg has been fixed to correctly pass the old version to postinst on upgrade. (Closes: #802545) + * Only ship *.link files as part of the udev package. The *.network files + are solely used by systemd-networkd and should therefor be shipped by the + systemd package. (Closes: #808237) -- Martin Pitt Mon, 11 Jan 2016 14:00:11 +0100 diff --git a/debian/control b/debian/control index f50c4cfdf..480e08490 100644 --- a/debian/control +++ b/debian/control @@ -71,6 +71,8 @@ Breaks: lvm2 (<< 2.02.104-1), apparmor (<< 2.9.2-1), systemd-shim (<< 8-2), ifupdown (<< 0.8.5~), + systemd (<< 228-5), +Replaces: systemd (<< 228-5), Conflicts: klogd Description: system and service manager systemd is a system and service manager for Linux. It provides aggressive diff --git a/debian/udev.install b/debian/udev.install index 04677157a..2958a92af 100644 --- a/debian/udev.install +++ b/debian/udev.install @@ -1,6 +1,6 @@ etc/udev/ lib/udev/* -lib/systemd/network +lib/systemd/network/*.link lib/systemd/system/systemd-udev* lib/systemd/system/systemd-hwdb* lib/systemd/system/*.target.wants/systemd-udev*