[systemd-commits] 2 commits - test/TEST-01-BASIC units/systemd-ask-password-wall.service.in units/systemd-debug-shell.service.in units/systemd-journald.service.in units/systemd-logind.service.in units/systemd-udev.service.in

[Lennart Poettering]

 test/TEST-01-BASIC/test.sh                 |    3 +--
 units/systemd-ask-password-wall.service.in |    3 +--
 units/systemd-debug-shell.service.in       |    7 +++++++
 units/systemd-journald.service.in          |    1 +
 units/systemd-logind.service.in            |    1 +
 units/systemd-udev.service.in              |    2 +-
 6 files changed, 12 insertions(+), 5 deletions(-)

New commits:
commit 5fa594df8de6fed8e18146096a7b7d45b2187441
Author: Lennart Poettering <lennart at poettering.net>
Date:   Thu Jun 28 12:14:18 2012 +0200

    test: reenable nspawn, even if it fails for now

diff --git a/test/TEST-01-BASIC/test.sh b/test/TEST-01-BASIC/test.sh
index d50c835..06b80c2 100755
--- a/test/TEST-01-BASIC/test.sh
+++ b/test/TEST-01-BASIC/test.sh
@@ -56,8 +56,7 @@ test_run() {
         dwarn "can't run qemu-kvm, skipping"
     fi
     if check_nspawn; then
-#run_nspawn || return 1
-    :
+        run_nspawn || return 1
     else
         dwarn "can't run systemd-nspawn, skipping"
     fi

commit 454591be36880b0300b0448576c483a39d9cc611
Author: Lennart Poettering <lennart at poettering.net>
Date:   Thu Jun 28 12:13:52 2012 +0200

    units: automatically respawn the core services

diff --git a/units/systemd-ask-password-wall.service.in b/units/systemd-ask-password-wall.service.in
index b2ca039..0eaa274 100644
--- a/units/systemd-ask-password-wall.service.in
+++ b/units/systemd-ask-password-wall.service.in
@@ -11,6 +11,5 @@ Documentation=man:systemd-ask-password-console.service(8)
 After=systemd-user-sessions.service
 
 [Service]
-ExecStartPre=- at SYSTEMCTL@ stop systemd-ask-password-console.path systemd-ask-password-console.service
-ExecStartPre=- at SYSTEMCTL@ stop systemd-ask-password-plymouth.path systemd-ask-password-plymouth.service
+ExecStartPre=- at SYSTEMCTL@ stop systemd-ask-password-console.path systemd-ask-password-console.service systemd-ask-password-plymouth.path systemd-ask-password-plymouth.service
 ExecStart=@rootbindir@/systemd-tty-ask-password-agent --wall
diff --git a/units/systemd-debug-shell.service.in b/units/systemd-debug-shell.service.in
index 8ca25a3..2aa98d3 100644
--- a/units/systemd-debug-shell.service.in
+++ b/units/systemd-debug-shell.service.in
@@ -1,3 +1,10 @@
+#  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.
+
 [Unit]
 Description=Early root shell on tty9 FOR DEBUGGING ONLY
 Documentation=man:sushell(8)
diff --git a/units/systemd-journald.service.in b/units/systemd-journald.service.in
index 88ee68c..9552b45 100644
--- a/units/systemd-journald.service.in
+++ b/units/systemd-journald.service.in
@@ -14,6 +14,7 @@ After=systemd-journald.socket syslog.socket
 
 [Service]
 ExecStart=@rootlibexecdir@/systemd-journald
+Restart=always
 NotifyAccess=all
 StandardOutput=null
 CapabilityBoundingSet=CAP_SYS_ADMIN CAP_DAC_OVERRIDE CAP_SYS_PTRACE CAP_SYSLOG CAP_AUDIT_CONTROL CAP_CHOWN CAP_DAC_READ_SEARCH CAP_FOWNER CAP_SETUID CAP_SETGID
diff --git a/units/systemd-logind.service.in b/units/systemd-logind.service.in
index 0dd6e14..4acca63 100644
--- a/units/systemd-logind.service.in
+++ b/units/systemd-logind.service.in
@@ -13,6 +13,7 @@ After=nss-user-lookup.target
 
 [Service]
 ExecStart=@rootlibexecdir@/systemd-logind
+Restart=always
 BusName=org.freedesktop.login1
 CapabilityBoundingSet=CAP_AUDIT_CONTROL CAP_CHOWN CAP_KILL CAP_DAC_READ_SEARCH CAP_DAC_OVERRIDE CAP_FOWNER CAP_SYS_TTY_CONFIG
 
diff --git a/units/systemd-udev.service.in b/units/systemd-udev.service.in
index b444870..b689690 100644
--- a/units/systemd-udev.service.in
+++ b/units/systemd-udev.service.in
@@ -18,5 +18,5 @@ ConditionCapability=CAP_MKNOD
 Type=notify
 OOMScoreAdjust=-1000
 Sockets=systemd-udev-control.socket systemd-udev-kernel.socket
-Restart=on-failure
+Restart=always
 ExecStart=@rootlibexecdir@/systemd-udevd