[systemd-commits] 5 commits - TODO configure.ac man/systemd.link.xml units/container-getty at .service.m4.in units/systemd-resolved.service.in

Lennart Poettering lennart at kemper.freedesktop.org
Tue Jan 27 09:30:16 PST 2015


 TODO                                 |    6 +++++-
 configure.ac                         |    8 +++++---
 man/systemd.link.xml                 |   16 +++++++++++-----
 units/container-getty at .service.m4.in |    4 ++--
 units/systemd-resolved.service.in    |    1 +
 5 files changed, 24 insertions(+), 11 deletions(-)

New commits:
commit e611755d98ac6b213f39426359c3a94defc6a029
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Jan 27 18:29:33 2015 +0100

    man: mention that 99-default.link is shipped by default, and users hence need to install a lexically earlier .link file for it to be honoured

diff --git a/man/systemd.link.xml b/man/systemd.link.xml
index bb3f908..ecf7954 100644
--- a/man/systemd.link.xml
+++ b/man/systemd.link.xml
@@ -71,11 +71,17 @@
                 <filename>/usr/lib</filename>, pointing to <filename>/dev/null</filename>,
                 disables the link file entirely.</para>
 
-                <para>The link file contains a <literal>[Match]</literal> section, which
-                determines if a given link file may be applied to a given device; and a
-                <literal>[Link]</literal> section specifying how the device should be
-                configured. The first (in lexical order) of the link files that matches
-                a given device is applied.</para>
+                <para>The link file contains a
+                <literal>[Match]</literal> section, which determines
+                if a given link file may be applied to a given device,
+                as well as a <literal>[Link]</literal> section specifying how
+                the device should be configured. The first (in lexical
+                order) of the link files that matches a given device
+                is applied. Note that a default file
+                <filename>99-default.link</filename> is shipped by the
+                system, any user-supplied <filename>.link</filename>
+                should hence have a lexically earlier name to be
+                considered at all.</para>
         </refsect1>
 
         <refsect1>

commit 2bc39683c0cada86c9dc39e5f3d0ea475cf12e57
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Jan 27 14:31:29 2015 +0100

    update TODO

diff --git a/TODO b/TODO
index 62f673b..c99905f 100644
--- a/TODO
+++ b/TODO
@@ -31,13 +31,17 @@ External:
 
 Features:
 
+* networkd/udev: implement SR_IOV configuration in .link files:
+  http://lists.freedesktop.org/archives/systemd-devel/2015-January/027451.html
+
 * When RLIMIT_NPROC is set from a unit file it currently always is set
   for root, not for the user set in User=, which makes it
   useless. After fixing this, set RLIMIT_NPROC for
   systemd-journal-xyz, and all other of our services that run under
   their own user ids, and use User= (but only in a world where userns
   is ubiquitous since otherwise we cannot invoke those daemons on the
-  host AND in a container anymore).
+  host AND in a container anymore). Also, if LimitNPROC= is used
+  without User= we should warn and refuse operation.
 
 * logind: maybe allow configuration of the StopTimeout for session scopes
 

commit 831f18cbf3f250207fcde15ea736639898317d77
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Jan 27 17:24:11 2015 +0100

    build-sys: make bzip2 really optional

diff --git a/configure.ac b/configure.ac
index cf19681..d576e04 100644
--- a/configure.ac
+++ b/configure.ac
@@ -580,11 +580,13 @@ AM_CONDITIONAL(HAVE_ZLIB, [test "$have_zlib" = "yes"])
 
 # ------------------------------------------------------------------------------
 have_bzip2=no
-AC_ARG_ENABLE(bzip2, AS_HELP_STRING([--enable-bzip2], [Enable optional BZIP2 support]))
+AC_ARG_ENABLE(bzip2, AS_HELP_STRING([--enable-bzip2], [Disable optional BZIP2 support]))
 AS_IF([test "x$enable_bzip2" != "xno"], [
         AC_CHECK_HEADERS(bzlib.h,
-               [AC_DEFINE(HAVE_BZIP2, 1, [Define in BZIP2 is available]) have_bzip2=yes],
-               [AC_MSG_ERROR([*** BZIP2 support requested but headers not found])])
+                [AC_DEFINE(HAVE_BZIP2, 1, [Define in BZIP2 is available])
+                 have_bzip2=yes],
+                [AS_IF([test "x$have_bzip2" = xyes], [AC_MSG_ERROR([*** BZIP2 support requested but headers not found])])
+        ])
 ])
 AM_CONDITIONAL(HAVE_BZIP2, [test "$have_bzip2" = "yes"])
 

commit 0ef403877a2257199ef22af5e217831d03eae8af
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Jan 27 14:30:52 2015 +0100

    units: turn on watchdog for resolved

diff --git a/units/systemd-resolved.service.in b/units/systemd-resolved.service.in
index e068684..b643da9 100644
--- a/units/systemd-resolved.service.in
+++ b/units/systemd-resolved.service.in
@@ -23,6 +23,7 @@ ExecStart=@rootlibexecdir@/systemd-resolved
 CapabilityBoundingSet=CAP_SETUID CAP_SETGID CAP_SETPCAP CAP_CHOWN CAP_DAC_OVERRIDE CAP_FOWNER
 ProtectSystem=full
 ProtectHome=yes
+WatchdogSec=1min
 
 [Install]
 WantedBy=multi-user.target

commit e87bc3ef67a892e2b3dba753190675e5f9b592b5
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Jan 27 14:28:45 2015 +0100

    units: fix all TTY paths for container gettys
    
    Spotted by Christian Seiler:
    
    http://lists.freedesktop.org/archives/systemd-devel/2015-January/027441.html

diff --git a/units/container-getty at .service.m4.in b/units/container-getty at .service.m4.in
index 5120466..e126f3a 100644
--- a/units/container-getty at .service.m4.in
+++ b/units/container-getty at .service.m4.in
@@ -21,8 +21,8 @@ ExecStart=-/sbin/agetty --noclear --keep-baud pts/%I 115200,38400,9600 $TERM
 Type=idle
 Restart=always
 RestartSec=0
-UtmpIdentifier=%I
-TTYPath=/dev/%I
+UtmpIdentifier=pts/%I
+TTYPath=/dev/pts/%I
 TTYReset=yes
 TTYVHangup=yes
 KillMode=process



More information about the systemd-commits mailing list