[systemd-commits] 2 commits - src/manager.c units/dev-hugepages.automount units/dev-hugepages.mount units/dev-mqueue.automount units/dev-mqueue.mount units/proc-sys-fs-binfmt_misc.automount units/proc-sys-fs-binfmt_misc.mount units/sys-kernel-debug.automount units/sys-kernel-debug.mount units/var-run.mount

[Lennart Poettering]

 src/manager.c                           |    5 +++++
 units/dev-hugepages.automount           |    2 +-
 units/dev-hugepages.mount               |    2 +-
 units/dev-mqueue.automount              |    2 +-
 units/dev-mqueue.mount                  |    2 +-
 units/proc-sys-fs-binfmt_misc.automount |    2 +-
 units/proc-sys-fs-binfmt_misc.mount     |    2 +-
 units/sys-kernel-debug.automount        |    2 +-
 units/sys-kernel-debug.mount            |    2 +-
 units/var-run.mount                     |    2 +-
 10 files changed, 14 insertions(+), 9 deletions(-)

New commits:
commit 710bd1434709402e557b03a684eb905b619477dc
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue May 18 04:17:05 2010 +0200

    units: fix syntax of mount unit files

diff --git a/units/dev-hugepages.automount b/units/dev-hugepages.automount
index f17b19d..bcc4009 100644
--- a/units/dev-hugepages.automount
+++ b/units/dev-hugepages.automount
@@ -16,7 +16,7 @@
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
 
 [Unit]
-Name=Huge Pages File System Automount Point
+Description=Huge Pages File System Automount Point
 Before=basic.target
 
 [Automount]
diff --git a/units/dev-hugepages.mount b/units/dev-hugepages.mount
index 8ffff36..c7458b5 100644
--- a/units/dev-hugepages.mount
+++ b/units/dev-hugepages.mount
@@ -16,7 +16,7 @@
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
 
 [Unit]
-Name=Huge Pages File System
+Description=Huge Pages File System
 
 [Mount]
 What=hugetlbfs
diff --git a/units/dev-mqueue.automount b/units/dev-mqueue.automount
index 4e343ac..3cb408d 100644
--- a/units/dev-mqueue.automount
+++ b/units/dev-mqueue.automount
@@ -16,7 +16,7 @@
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
 
 [Unit]
-Name=POSIX Message Queue File System Automount Point
+Description=POSIX Message Queue File System Automount Point
 Before=basic.target
 
 [Automount]
diff --git a/units/dev-mqueue.mount b/units/dev-mqueue.mount
index f0cb5f7..0a246fb 100644
--- a/units/dev-mqueue.mount
+++ b/units/dev-mqueue.mount
@@ -16,7 +16,7 @@
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
 
 [Unit]
-Name=POSIX Message Queue File System
+Description=POSIX Message Queue File System
 
 [Mount]
 What=mqueue
diff --git a/units/proc-sys-fs-binfmt_misc.automount b/units/proc-sys-fs-binfmt_misc.automount
index 4466ced..41325f3 100644
--- a/units/proc-sys-fs-binfmt_misc.automount
+++ b/units/proc-sys-fs-binfmt_misc.automount
@@ -16,7 +16,7 @@
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
 
 [Unit]
-Name=Arbitrary Executable File Formats File System Automount Point
+Description=Arbitrary Executable File Formats File System Automount Point
 Before=basic.target
 
 [Automount]
diff --git a/units/proc-sys-fs-binfmt_misc.mount b/units/proc-sys-fs-binfmt_misc.mount
index af8e200..ea162e5 100644
--- a/units/proc-sys-fs-binfmt_misc.mount
+++ b/units/proc-sys-fs-binfmt_misc.mount
@@ -16,7 +16,7 @@
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
 
 [Unit]
-Name=Arbitrary Executable File Formats File System
+Description=Arbitrary Executable File Formats File System
 
 [Mount]
 What=binfmt_misc
diff --git a/units/sys-kernel-debug.automount b/units/sys-kernel-debug.automount
index b573be9..e6444b0 100644
--- a/units/sys-kernel-debug.automount
+++ b/units/sys-kernel-debug.automount
@@ -16,7 +16,7 @@
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
 
 [Unit]
-Name=Debug File System Automount Point
+Description=Debug File System Automount Point
 Before=basic.target
 
 [Automount]
diff --git a/units/sys-kernel-debug.mount b/units/sys-kernel-debug.mount
index 7badf80..1fc4bdd 100644
--- a/units/sys-kernel-debug.mount
+++ b/units/sys-kernel-debug.mount
@@ -16,7 +16,7 @@
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
 
 [Unit]
-Name=Debug File System
+Description=Debug File System
 
 [Mount]
 What=debugfs
diff --git a/units/var-run.mount b/units/var-run.mount
index aaa1580..a9ad3bd 100644
--- a/units/var-run.mount
+++ b/units/var-run.mount
@@ -16,7 +16,7 @@
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
 
 [Unit]
-Name=Runtime Directory
+Description=Runtime Directory
 Before=local-fs.target
 
 [Mount]
commit a4312405f209ff19fa071b15bda843f4e68ffbbc
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue May 18 04:16:33 2010 +0200

    manager: before entering loop dispatch queued up SIGCHLDs

diff --git a/src/manager.c b/src/manager.c
index 688d9fa..f6f205f 100644
--- a/src/manager.c
+++ b/src/manager.c
@@ -1939,6 +1939,11 @@ int manager_loop(Manager *m) {
         assert(m);
         m->exit_code = MANAGER_RUNNING;
 
+        /* There might still be some zombies hanging around from
+         * before we were exec()'ed. Leat's reap them */
+        if ((r = manager_dispatch_sigchld(m)) < 0)
+                return r;
+
         while (m->exit_code == MANAGER_RUNNING) {
                 struct epoll_event event;
                 int n;