Control: reassign -1 netcfg 1.125 Andrew Shadura <and...@shadura.me> (2014-11-27): > On 27 November 2014 at 16:28, Cyril Brulebois <k...@debian.org> wrote: > >> source /etc/network/interfaces.d/* > > > This would probably be safer at this point of the release cycle indeed. > > We can think about switching it early during the stretch release cycle. > > > That means the current documentation will still be slightly off though. > > I will update the documentation on my side in the upload I'm going to > do this weekend. I need to fix systemd interaction and loopback > interface anyway. > > > Please tell us whether you want us to go ahead for a "source ../*" > > addition and a doc update on your side. > > Yes please. Also, I think at this moment specifying an absolute path > is safer as the ifupdown version in wheezy had a bug which led to an > incorrect relative path interpretation in some cases.
I have the attached patch pending locally; not pushing right now to avoid an accidental upload while I haven't got around to requesting a few unblock/unblock-udeb (one of which is about netcfg). Mraw, KiBi.
From 648976eb4168abe27671ef5ccf38682d98ed535f Mon Sep 17 00:00:00 2001
From: Cyril Brulebois <k...@debian.org>
Date: Thu, 27 Nov 2014 16:45:40 +0100
Subject: [PATCH] Add support for /etc/network/interfaces.d/ by adding a
"source" directive (Closes: #770078).
It can be replaced with a "source-directory" one during the next release cycle.
---
debian/changelog | 8 ++++++++
write_interface.c | 1 +
2 files changed, 9 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index fa68873..459ee42 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+netcfg (1.126) UNRELEASED; urgency=medium
+
+ * Add support for /etc/network/interfaces.d/ by adding a "source"
+ directive (Closes: #770078). It can be replaced with a
+ "source-directory" one during the next release cycle.
+
+ -- Cyril Brulebois <k...@debian.org> Thu, 27 Nov 2014 16:41:41 +0100
+
netcfg (1.125) unstable; urgency=medium
* Re-upload without stray files.
diff --git a/write_interface.c b/write_interface.c
index 1aa331a..2ab1a34 100644
--- a/write_interface.c
+++ b/write_interface.c
@@ -30,6 +30,7 @@ static int nc_wi_header(FILE *fd)
{
fprintf(fd, "# This file describes the network interfaces available on your system\n");
fprintf(fd, "# and how to activate them. For more information, see interfaces(5).\n");
+ fprintf(fd, "\nsource /etc/network/interfaces.d/*\n");
return 1;
}
--
2.1.3
signature.asc
Description: Digital signature
