[systemd-commits] 2 commits - configure.ac Makefile.am tmpfiles.d/etc.conf tmpfiles.d/etc.conf.m4 tmpfiles.d/.gitignore TODO

Wed Aug 27 09:17:22 PDT 2014

Makefile.am            |   15 +++++++++++++--
 TODO                   |   15 ---------------
 configure.ac           |    1 +
 tmpfiles.d/.gitignore  |    1 +
 tmpfiles.d/etc.conf    |   15 ---------------
 tmpfiles.d/etc.conf.m4 |   17 +++++++++++++++++
 6 files changed, 32 insertions(+), 32 deletions(-)

New commits:
commit 285e8c126b1607188249c42e74c172cb69cc99a6
Author: Tom Gundersen <teg at jklm.no>
Date:   Wed Aug 27 17:46:00 2014 +0200

    TODO

diff --git a/TODO b/TODO
index 372825e..a00c13d 100644
--- a/TODO
+++ b/TODO
@@ -61,11 +61,6 @@ Features:
 * systemd.show_status= should probably have a mode where only failed
   units are shown.
 
-* sd-event:
-  - make it possible to embedd our event loop into foreign event loops
-    by passing out the epoll fd and providing three functions that fit
-    into GSource nicely.
-
 * networkd:
   - add LLDP client side support
   - ipv4ll with multiple interfaces doesn't work when both dhcp and
@@ -74,18 +69,10 @@ Features:
   - dhcp and ipv4ll should probably be skipped for "lo" devices, even
     if the user has a catchall .network file installed, that might
     theoretically match it.
-  - we probably should introduce a new operational state that
-    indicates that we are trying to acquire some configuration for a
-    link but haven't acquired any yet. Just to inform the admin that
-    networkd cares about an interface, but is still in progress..
   - the DHCP lease data (such as NTP/DNS) is still made available when
     a carrier is lost on a link. It should be removed instantly.
   - .network setting that allows overriding of the hostname to send to the dhcp server
     http://lists.freedesktop.org/archives/systemd-devel/2014-July/021550.html
-  - add per-network Domains= settings, with a special syntax Domains=*
-    for routing all non-otherwise routed traffic to this link
-  - add UseDomains= setting to [DHCP] to add dhcp supplied domains to
-    per-interface Domains= list.
   - expose in the API the following bits:
         - option 15, domain name and/or option 119, search list
         - option 12, host name and/or option 81, fqdn

commit aeb50ff0bd4bbbca74c4695072232348351d512d
Author: Tom Gundersen <teg at jklm.no>
Date:   Wed Aug 27 17:45:41 2014 +0200

    tmpfiles: make resolv.conf entry conditional on resolved support

diff --git a/Makefile.am b/Makefile.am
index cbdf551..70faed4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1940,14 +1940,16 @@ nodist_systemunit_DATA += \
 	units/systemd-tmpfiles-setup.service \
 	units/systemd-tmpfiles-clean.service
 
+nodist_tmpfiles_DATA = \
+	tmpfiles.d/etc.conf
+
 dist_tmpfiles_DATA = \
 	tmpfiles.d/systemd.conf \
 	tmpfiles.d/systemd-nologin.conf \
 	tmpfiles.d/systemd-remote.conf \
 	tmpfiles.d/tmp.conf \
 	tmpfiles.d/x11.conf \
-	tmpfiles.d/var.conf \
-	tmpfiles.d/etc.conf
+	tmpfiles.d/var.conf
 
 if HAVE_SYSV_COMPAT
 dist_tmpfiles_DATA += \
@@ -1970,10 +1972,14 @@ INSTALL_DIRS += \
 endif
 
 EXTRA_DIST += \
+	tmpfiles.d/etc.conf.m4 \
 	units/systemd-tmpfiles-setup-dev.service.in \
 	units/systemd-tmpfiles-setup.service.in \
 	units/systemd-tmpfiles-clean.service.in
 
+CLEANFILES += \
+	tmpfiles.d/etc.conf
+
 # ------------------------------------------------------------------------------
 if ENABLE_SYSUSERS
 systemd_sysusers_SOURCES = \
@@ -5708,6 +5714,11 @@ src/%: src/%.m4
 	$(AM_V_at)$(MKDIR_P) $(dir $@)
 	$(AM_V_M4)$(M4) -P $(M4_DEFINES) < $< > $@
 
+tmpfiles.d/%: tmpfiles.d/%.m4
+	$(AM_V_at)$(MKDIR_P) $(dir $@)
+	$(AM_V_M4)$(M4) -P $(M4_DEFINES) < $< > $@
+
+
 units/%: units/%.m4
 	$(AM_V_at)$(MKDIR_P) $(dir $@)
 	$(AM_V_M4)$(M4) -P $(M4_DEFINES) -DFOR_SYSTEM=1 < $< > $@
diff --git a/TODO b/TODO
index 09f82d3..372825e 100644
--- a/TODO
+++ b/TODO
@@ -120,8 +120,6 @@ Features:
 
 * Allow multiple ExecStart= for all Type= settings, so that we can cover rescue.service nicely
 
-* the resolv.conf tmpfiles line should be covered by ENABLE_NETWORKD...
-
 * Add a new verb "systemctl top"
 
 * logind: allow users to kill or lock their own sessions
diff --git a/configure.ac b/configure.ac
index 18b7198..08a8a10 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1023,6 +1023,7 @@ have_resolved=no
 AC_ARG_ENABLE(resolved, AS_HELP_STRING([--disable-resolved], [disable resolve daemon]))
 if test "x$enable_resolved" != "xno"; then
         have_resolved=yes
+        M4_DEFINES="$M4_DEFINES -DENABLE_RESOLVED"
 fi
 AM_CONDITIONAL(ENABLE_RESOLVED, [test "$have_resolved" = "yes"])
 
diff --git a/tmpfiles.d/.gitignore b/tmpfiles.d/.gitignore
new file mode 100644
index 0000000..eb32315
--- /dev/null
+++ b/tmpfiles.d/.gitignore
@@ -0,0 +1 @@
+etc.conf
diff --git a/tmpfiles.d/etc.conf b/tmpfiles.d/etc.conf
deleted file mode 100644
index b23272c..0000000
--- a/tmpfiles.d/etc.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-#  This file is part of systemd.
-#
-#  systemd is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU Lesser General Public License as published by
-#  the Free Software Foundation; either version 2.1 of the License, or
-#  (at your option) any later version.
-
-# See tmpfiles.d(5) for details
-
-L /etc/os-release - - - - ../usr/lib/os-release
-L /etc/localtime - - - - ../usr/share/zoneinfo/UTC
-L+ /etc/mtab - - - - ../proc/self/mounts
-L /etc/resolv.conf - - - - ../run/systemd/resolve/resolv.conf
-C /etc/nsswitch.conf - - - -
-C /etc/pam.d - - - -
diff --git a/tmpfiles.d/etc.conf.m4 b/tmpfiles.d/etc.conf.m4
new file mode 100644
index 0000000..f567c8d
--- /dev/null
+++ b/tmpfiles.d/etc.conf.m4
@@ -0,0 +1,17 @@
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+
+# See tmpfiles.d(5) for details
+
+L /etc/os-release - - - - ../usr/lib/os-release
+L /etc/localtime - - - - ../usr/share/zoneinfo/UTC
+L+ /etc/mtab - - - - ../proc/self/mounts
+m4_ifdef(`ENABLE_RESOLVED',
+L /etc/resolv.conf - - - - ../run/systemd/resolve/resolv.conf
+)
+C /etc/nsswitch.conf - - - -
+C /etc/pam.d - - - -

