diff options
author | Andrey Borzenkov <arvidjaar@gmail.com> | 2011-03-08 19:47:29 +0100 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2011-03-08 19:47:36 +0100 |
commit | 1de4d79bf554946f486adf56ed765c5335816f15 (patch) | |
tree | 1a9959d84694b23fde107f59e74b3fab98be9e50 /units/rescue.service.m4 | |
parent | 6e25b33cddf77c90d351dee6442c51bd19e2b7a8 (diff) |
build-sys: add Mandriva distribution support
This merges several separate patches that I carry as part of
Mandriva systemd RPM. They touch those parts that are very
unlikely to be changed in near future and do not impose any
functionality change for systemd core. I also think it is
useful for troubleshooting to have real distribution name in
system logs, espicially when someone reports problem upstream.
The patch looks bigger than sum of replaced patches because
- previous patches were applied on top of distro=fedora, now
I need to add all those bits for distro=mandriva as well
- part of patch was done as spec file magic, but it seems more
logical to ship all these bits together
Diffstat (limited to 'units/rescue.service.m4')
-rw-r--r-- | units/rescue.service.m4 | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/units/rescue.service.m4 b/units/rescue.service.m4 index 2a0d3280e..8b42e9f69 100644 --- a/units/rescue.service.m4 +++ b/units/rescue.service.m4 @@ -13,6 +13,9 @@ DefaultDependencies=no Conflicts=shutdown.target After=basic.target Before=shutdown.target +m4_ifdef(`TARGET_MANDRIVA', +`# Hide SysV script +Names=single.service') [Service] Environment=HOME=/root @@ -22,7 +25,10 @@ ExecStartPre=-/bin/echo 'Welcome to rescue mode. Use "systemctl default" or ^D t m4_ifdef(`TARGET_FEDORA', `EnvironmentFile=/etc/sysconfig/init ExecStart=-/bin/bash -c "exec ${SINGLE}"', -`ExecStart=-/sbin/sulogin') +m4_ifdef(`TARGET_MANDRIVA', +`EnvironmentFile=/etc/sysconfig/init +ExecStart=-/bin/bash -c "exec ${SINGLE}"', +`ExecStart=-/sbin/sulogin')) ExecStopPost=-/bin/systemctl --fail default StandardInput=tty-force KillMode=process-group |