summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2010-05-20 02:05:28 +0200
committerLennart Poettering <lennart@poettering.net>2010-05-20 02:05:28 +0200
commit1afaf57346eca958ffe9e1617bb875d556f89a01 (patch)
treeaaeb800e7d8add95d659c04474f2c5b4f7ea7933
parent9949ac0cec2aa0de4159260b2817e136825dbc3c (diff)
fedora: we must call the halt script with a symlink of reboot for rebooting
-rw-r--r--Makefile.am2
-rw-r--r--units/fedora/reboot.service2
2 files changed, 3 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index 8b0aecd269..8f0fdaab2e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -477,6 +477,8 @@ if TARGET_FEDORA
( cd $(DESTDIR)$(systemunitdir) && \
rm -f local.service && \
$(LN_S) rc-local.service local.service )
+ ( cd $(DESTDIR)/etc/init.d && \
+ $(LN_S) halt reboot > /dev/null 2>&1 || true )
endif
DISTCHECK_CONFIGURE_FLAGS = \
diff --git a/units/fedora/reboot.service b/units/fedora/reboot.service
index 79c5ef41ca..20b9e9e529 100644
--- a/units/fedora/reboot.service
+++ b/units/fedora/reboot.service
@@ -14,4 +14,4 @@ After=shutdown.target killall.service
Type=finish
ValidNoProcess=yes
Environment=RUNLEVEL=6
-ExecStart=@/etc/init.d/halt reboot start
+ExecStart=/etc/init.d/reboot start