Control: tags -1 - moreinfo Am Donnerstag, den 20.06.2019, 13:45 +0200 schrieb Paul Gevers: > Control: tags -1 moreinfo > > Hi Benjamin > > On 20-06-2019 12:52, Benjamin Drung wrote: > > ionit runs too late for /etc/network/interfaces (RC bug #919690). > > This > > is fixed in 0.3.2-1. The debdiff is attached. > > Please, pretty please. At this moment of the release only targeted > fixes > [1]. Revert the other upstream changes and upload a version which > targets the bug only (e.g. with a +really version). Your fix has to > go > through unstable, not testing-proposed-updates.
Okay. I prepared a version with just the fixes for the ionit.service (debdiff attached). Why not going through testing-proposed-updates? If not, the version number will be 0.3.2+really0.2.1-2 instead of 0.2.1-2. -- Benjamin Drung System Developer Debian & Ubuntu Developer 1&1 IONOS Cloud GmbH | Greifswalder Str. 207 | 10405 Berlin | Germany E-mail: benjamin.dr...@cloud.ionos.com | Web: www.ionos.de Head Office: Berlin, Germany District Court Berlin Charlottenburg, Registration number: HRB 125506 B Executive Management: Christoph Steffens, Matthias Steinberg, Achim Weiss Member of United Internet
diff -Nru ionit-0.2.1/debian/changelog ionit-0.2.1/debian/changelog --- ionit-0.2.1/debian/changelog 2019-01-07 14:22:30.000000000 +0100 +++ ionit-0.2.1/debian/changelog 2019-06-20 13:55:12.000000000 +0200 @@ -1,3 +1,10 @@ +ionit (0.2.1-2) testing-proposed-updates; urgency=medium + + * Run ionit.service before systemd-modules-load.service + * Run ionit.service before systemd-udev-trigger.service (Closes: #919690) + + -- Benjamin Drung <benjamin.dr...@cloud.ionos.com> Thu, 20 Jun 2019 13:55:12 +0200 + ionit (0.2.1-1) unstable; urgency=medium * New upstream release. diff -Nru ionit-0.2.1/debian/patches/Run-ionit.service-before-systemd-modules-load.service.patch ionit-0.2.1/debian/patches/Run-ionit.service-before-systemd-modules-load.service.patch --- ionit-0.2.1/debian/patches/Run-ionit.service-before-systemd-modules-load.service.patch 1970-01-01 01:00:00.000000000 +0100 +++ ionit-0.2.1/debian/patches/Run-ionit.service-before-systemd-modules-load.service.patch 2019-06-20 13:51:57.000000000 +0200 @@ -0,0 +1,33 @@ +From f56792f9b2d618d38207170d61f420bf58e26603 Mon Sep 17 00:00:00 2001 +From: Benjamin Drung <benjamin.dr...@cloud.ionos.com> +Date: Wed, 10 Apr 2019 13:30:47 +0200 +Subject: [PATCH] Run ionit.service before systemd-modules-load.service + +In case you want to render modprobe configuration files, the ionit +service needs to run before systemd-modules-load.service (which runs +also before sysinit.target and races with ionit.service). + +Therefore let ionit.service run explicitly before +systemd-modules-load.service. + +Signed-off-by: Benjamin Drung <benjamin.dr...@cloud.ionos.com> +--- + ionit.service | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ionit.service b/ionit.service +index 1e23862..a67cc88 100644 +--- a/ionit.service ++++ b/ionit.service +@@ -3,7 +3,7 @@ Description=Render configuration files from Jinja templates + Documentation=man:ionit(1) + DefaultDependencies=no + After=local-fs.target +-Before=ferm.service network-pre.target openibd.service shutdown.target sysinit.target ++Before=ferm.service network-pre.target openibd.service shutdown.target sysinit.target systemd-modules-load.service + Wants=network-pre.target + RequiresMountsFor=/usr + +-- +2.20.1 + diff -Nru ionit-0.2.1/debian/patches/Run-ionit.service-before-systemd-udev-trigger.service.patch ionit-0.2.1/debian/patches/Run-ionit.service-before-systemd-udev-trigger.service.patch --- ionit-0.2.1/debian/patches/Run-ionit.service-before-systemd-udev-trigger.service.patch 1970-01-01 01:00:00.000000000 +0100 +++ ionit-0.2.1/debian/patches/Run-ionit.service-before-systemd-udev-trigger.service.patch 2019-06-20 13:52:07.000000000 +0200 @@ -0,0 +1,40 @@ +From 11b6dbab36c0b1d983179d10e3a079e0f31102bc Mon Sep 17 00:00:00 2001 +From: Benjamin Drung <benjamin.dr...@cloud.ionos.com> +Date: Thu, 20 Jun 2019 12:14:42 +0200 +Subject: [PATCH] Run ionit.service before systemd-udev-trigger.service + +live-boot creates a `/etc/network/interfaces` file that contains an +`allow-hotplug` entry for the network boot device `eth0`. +`systemd-udev-trigger.service` executes +`/lib/udev/rules.d/80-ifupdown.rules` which calls +`/lib/udev/ifupdown-hotplug`. This scripts starts `ifup@eth0.service`. +Afterwards `ionit` runs and might replace `allow-hotplug` by `auto` if a +template `/etc/network/interfaces.jinja` is provided. Then +`networking.service` and `ifup@eth0.service` will start at the same time +and race. + +Therefore let `ionit.service` run before `systemd-udev-trigger.service` +to support generating `/etc/network/interfaces`. + +Bug-Debian: https://bugs.debian.org/919690 +Signed-off-by: Benjamin Drung <benjamin.dr...@cloud.ionos.com> +--- + ionit.service | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ionit.service b/ionit.service +index a67cc88..8f56106 100644 +--- a/ionit.service ++++ b/ionit.service +@@ -3,7 +3,7 @@ Description=Render configuration files from Jinja templates + Documentation=man:ionit(1) + DefaultDependencies=no + After=local-fs.target +-Before=ferm.service network-pre.target openibd.service shutdown.target sysinit.target systemd-modules-load.service ++Before=ferm.service network-pre.target openibd.service shutdown.target sysinit.target systemd-modules-load.service systemd-udev-trigger.service + Wants=network-pre.target + RequiresMountsFor=/usr + +-- +2.20.1 + diff -Nru ionit-0.2.1/debian/patches/series ionit-0.2.1/debian/patches/series --- ionit-0.2.1/debian/patches/series 1970-01-01 01:00:00.000000000 +0100 +++ ionit-0.2.1/debian/patches/series 2019-06-20 13:54:04.000000000 +0200 @@ -0,0 +1,2 @@ +Run-ionit.service-before-systemd-modules-load.service.patch +Run-ionit.service-before-systemd-udev-trigger.service.patch
