summaryrefslogtreecommitdiffstats
path: root/units/rescue.service.m4
diff options
context:
space:
mode:
authorChris E Ferron <chris.e.ferron@linux.intel.com>2011-04-19 21:37:51 +0200
committerLennart Poettering <lennart@poettering.net>2011-04-20 01:05:30 +0200
commit54e4fdef80693f7fd7893bd048bb4d9a258b03a6 (patch)
tree8aa0c70f734df309737293127b74827525a929fe /units/rescue.service.m4
parentman: fix specification of default timeouts (diff)
downloadsystemd-54e4fdef80693f7fd7893bd048bb4d9a258b03a6.tar.xz
systemd-54e4fdef80693f7fd7893bd048bb4d9a258b03a6.zip
MeeGo support
This commit consists of the initial work to include MeeGo as a ported distribution for systemd. The majority of the changes are small configuration additions to auto tools, so that MeeGo is identified as a valid distribution option. Some small deviations will be noticed between the configuration of MeeGo and other distributions. As MeeGo is a distribution striving for compliancy to support its near embedded attributes and target users, there is less user configuration options available by default. Most services will be enabled by systemd as part of the distribution requirements, and as such most links and service files will be pre-setup for the MeeGo distribution. As much of this is going to be done within the MeeGo distribution packaging this is still noteworthy to mention, as it explains why in systemd you will observe configuration differences where the MeeGo distribution removes all links in the pkgsysconfdir for instance. MeeGo will be user configurable if there is desire, but most services will be enabled by the distribution as designated by the MeeGo compliancy standards. Other changes are in source to add such areas as meego-release defined in utils, and hostname in hostname-setup, defining vconsole-setup, localizations and rescue additions as needed. As this is all ground work, MeeGo will continue to strive for complete compatibility.
Diffstat (limited to 'units/rescue.service.m4')
-rw-r--r--units/rescue.service.m45
1 files changed, 4 insertions, 1 deletions
diff --git a/units/rescue.service.m4 b/units/rescue.service.m4
index b48d085024..d2fd582e86 100644
--- a/units/rescue.service.m4
+++ b/units/rescue.service.m4
@@ -25,7 +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'))
+`ExecStart=-/sbin/sulogin'
+m4_ifdef(`TARGET_MEEGO',
+`EnvironmentFile=/etc/sysconfig/init
+ExecStart=-/bin/bash -c "exec ${SINGLE}"',)))
ExecStopPost=-/bin/systemctl --fail --no-block default
StandardInput=tty-force
KillMode=process