summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarko Saukko <marko.saukko@gmail.com>2011-09-21 21:38:46 +0200
committerLennart Poettering <lennart@poettering.net>2011-09-21 21:38:46 +0200
commitd418f857f87f3f381f52f6ee17f2fad6e36aca86 (patch)
tree6857b80de236514faf40f3cad8822996b88feebf
parentd3354f66c23aa29b3a15a4c5903fb2edcc8acfda (diff)
downloadsystemd-d418f857f87f3f381f52f6ee17f2fad6e36aca86.tar.gz
units: In MeeGo there was more than one ExecStart lines present that caused systemd to refuse the rescue.service
-rw-r--r--units/rescue.service.m44
1 files changed, 2 insertions, 2 deletions
diff --git a/units/rescue.service.m4 b/units/rescue.service.m4
index 5b4ab6efb6..8f29de8a15 100644
--- a/units/rescue.service.m4
+++ b/units/rescue.service.m4
@@ -25,10 +25,10 @@ ExecStart=-/bin/bash -c "exec ${SINGLE}"',
m4_ifdef(`TARGET_MANDRIVA',
`EnvironmentFile=/etc/sysconfig/init
ExecStart=-/bin/bash -c "exec ${SINGLE}"',
-`ExecStart=-/sbin/sulogin'
m4_ifdef(`TARGET_MEEGO',
`EnvironmentFile=/etc/sysconfig/init
-ExecStart=-/bin/bash -c "exec ${SINGLE}"',)))
+ExecStart=-/bin/bash -c "exec ${SINGLE}"',
+`ExecStart=-/sbin/sulogin')))
ExecStopPost=-/bin/systemctl --fail --no-block default
StandardInput=tty-force
StandardOutput=inherit