[systemd-commits] 3 commits - man/systemctl.xml src/mount.c TODO units/systemd-logger.service.in

[Lennart Poettering]

 TODO                            |    2 +-
 man/systemctl.xml               |   11 ++++++-----
 src/mount.c                     |    9 ++++++---
 units/systemd-logger.service.in |    2 +-
 4 files changed, 14 insertions(+), 10 deletions(-)

New commits:
commit 100fd5676c53c6709442a22db0253cc57f05c46d
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Apr 5 23:41:27 2011 +0200

    man: fix description of systemctl reload-or-try-restart

diff --git a/TODO b/TODO
index e6c2ee5..f3c9b40 100644
--- a/TODO
+++ b/TODO
@@ -24,7 +24,7 @@ F15:
 * don't trim empty cgroups
   https://bugzilla.redhat.com/show_bug.cgi?id=678555
 
-* reload-or-try-restart man page blurb uses word "fail"
+* disable most systemctl verbs in chroot()s
 
 Features:
 
diff --git a/man/systemctl.xml b/man/systemctl.xml
index 922fd2d..e9e3371 100644
--- a/man/systemctl.xml
+++ b/man/systemctl.xml
@@ -487,12 +487,13 @@
 
                                 <listitem><para>Reload one or more
                                 units if they support it. If not,
-                                restart them instead. If the units
-                                are not running yet the operation
-                                will fail. Note that for
-                                compatibility with SysV init scripts
+                                restart them instead. Do nothing if
+                                the units are not running. Note that
+                                for compatibility with SysV init
+                                scripts
                                 <command>force-reload</command> is
-                                equivalent to this command.</para></listitem>
+                                equivalent to this
+                                command.</para></listitem>
                         </varlistentry>
                         <varlistentry>
                                 <term><command>isolate [NAME]</command></term>

commit 33ff02c9fe84394c34c3a50c6dab85c1847a6fc7
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Apr 5 23:39:21 2011 +0200

    mount: block creation of mount units for API file systems

diff --git a/TODO b/TODO
index fe516c5..e6c2ee5 100644
--- a/TODO
+++ b/TODO
@@ -26,8 +26,6 @@ F15:
 
 * reload-or-try-restart man page blurb uses word "fail"
 
-* explicitly block creation of mount units for API file systems
-
 Features:
 
 * write blog stories about:
diff --git a/src/mount.c b/src/mount.c
index 2d8542d..49bfd07 100644
--- a/src/mount.c
+++ b/src/mount.c
@@ -476,6 +476,11 @@ static int mount_verify(Mount *m) {
                 return -EINVAL;
         }
 
+        if (mount_point_is_api(m->where) || mount_point_ignore(m->where)) {
+                log_error("Cannot create mount unit for API file system %s. Refusing.", m->where);
+                return -EINVAL;
+        }
+
         if (m->meta.fragment_path && !m->parameters_fragment.what) {
                 log_error("%s's What setting is missing. Refusing.", m->meta.id);
                 return -EBADMSG;
@@ -1300,9 +1305,7 @@ static int mount_add_one(
 
         /* Ignore API mount points. They should never be referenced in
          * dependencies ever. */
-        if (mount_point_is_api(where))
-                return 0;
-        if (mount_point_ignore(where))
+        if (mount_point_is_api(where) || mount_point_ignore(where))
                 return 0;
 
         if (streq(fstype, "autofs"))

commit 33bd08a97a5bf64e0a1ac72190dc3a8e1231e7f2
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Apr 5 23:22:35 2011 +0200

    units: call the logger a bridge too

diff --git a/TODO b/TODO
index c8bf229..fe516c5 100644
--- a/TODO
+++ b/TODO
@@ -24,7 +24,9 @@ F15:
 * don't trim empty cgroups
   https://bugzilla.redhat.com/show_bug.cgi?id=678555
 
-* reload-or-try-restart man page uses word "fail"
+* reload-or-try-restart man page blurb uses word "fail"
+
+* explicitly block creation of mount units for API file systems
 
 Features:
 
diff --git a/units/systemd-logger.service.in b/units/systemd-logger.service.in
index 0fb0b42..f82db15 100644
--- a/units/systemd-logger.service.in
+++ b/units/systemd-logger.service.in
@@ -8,7 +8,7 @@
 # See systemd.special(7) for details
 
 [Unit]
-Description=Stream Logging Service
+Description=Stdio Syslog Bridge
 DefaultDependencies=no
 After=syslog.socket