summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Meyer <james.meyer@operamail.com>2014-02-17 00:09:25 (GMT)
committerJames Meyer <james.meyer@operamail.com>2014-02-19 19:03:05 (GMT)
commit16bb1dce51851d71fc173ce662443b10222438d3 (patch)
treedbd30553e67e1d57f08581ea691dfd33da364059
parent48c7caf0470b8693b849ac13454fdac4a697e812 (diff)
downloadlinhes_pkgbuild-16bb1dce51851d71fc173ce662443b10222438d3.zip
linhes_pkgbuild-16bb1dce51851d71fc173ce662443b10222438d3.tar.gz
linhes_pkgbuild-16bb1dce51851d71fc173ce662443b10222438d3.tar.bz2
poweroff-scripts:
update binary path to /usr/bin refs #961
-rwxr-xr-x[-rw-r--r--]abs/core/poweroff-scripts/halt.script19
-rw-r--r--abs/core/poweroff-scripts/poweroff-scripts.install8
-rw-r--r--abs/core/poweroff-scripts/poweroff.script7
-rwxr-xr-x[-rw-r--r--]abs/core/poweroff-scripts/reboot.script6
4 files changed, 25 insertions, 15 deletions
diff --git a/abs/core/poweroff-scripts/halt.script b/abs/core/poweroff-scripts/halt.script
index dacf16a..51c9925 100644..100755
--- a/abs/core/poweroff-scripts/halt.script
+++ b/abs/core/poweroff-scripts/halt.script
@@ -2,16 +2,19 @@
MYTH_RUN_STATUS="1"
. /etc/profile
INIT=`ps -p 1 -o comm=`
-if [ x$1 = x-w ]
-then
- /sbin/halt.init -w
- exit 0
-fi
-chvt 1
+# if [ x$1 = x-w ]
+# then
+# /sbin/halt.init -w
+# exit 0
+# fi
+
if [ x$INIT = xrunit ]
then
- /sbin/halt-runit $@
+ echo "System whill shutdown NOW" |wall
+ chvt 1
+ runit-init 0
+
else
- /sbin/halt.init $@
+ systemctrl $@
fi
diff --git a/abs/core/poweroff-scripts/poweroff-scripts.install b/abs/core/poweroff-scripts/poweroff-scripts.install
index b066f1d..00b4a84 100644
--- a/abs/core/poweroff-scripts/poweroff-scripts.install
+++ b/abs/core/poweroff-scripts/poweroff-scripts.install
@@ -10,9 +10,11 @@ pre_upgrade () {
}
post_install () {
-
- [ -e /sbin/halt.init ] || ln -sf /sbin/halt.init /sbin/reboot.init
- [ -e /sbin/halt.init ] || ln -sf /sbin/halt.init /sbin/poweroff.init
+ rm -f /sbin/reboot.init
+ rm -f /sbin/poweroff.init
+
+ [ -e /usr/sbin/halt.init ] || ln -sf /usr/sbin/halt.init /usr/sbin/reboot.init
+ [ -e /usr/sbin/halt.init ] || ln -sf /usr/sbin/halt.init /usr/sbin/poweroff.init
}
# arg 1: the new package version
diff --git a/abs/core/poweroff-scripts/poweroff.script b/abs/core/poweroff-scripts/poweroff.script
index 99779eb..211c9ee 100644
--- a/abs/core/poweroff-scripts/poweroff.script
+++ b/abs/core/poweroff-scripts/poweroff.script
@@ -1,11 +1,14 @@
#!/bin/bash
+MYTH_RUN_STATUS="1"
. /etc/profile
INIT=`ps -p 1 -o comm=`
chvt 1
if [ x$INIT = xrunit ]
then
- /sbin/halt-runit $@
+ echo "System whill shutdown NOW" |wall
+ chvt 1
+ runit-init 0
else
- /sbin/poweroff.init $@
+ systemctl poweroff $@
fi
diff --git a/abs/core/poweroff-scripts/reboot.script b/abs/core/poweroff-scripts/reboot.script
index 47ad99e..de2651c 100644..100755
--- a/abs/core/poweroff-scripts/reboot.script
+++ b/abs/core/poweroff-scripts/reboot.script
@@ -5,8 +5,10 @@ INIT=`ps -p 1 -o comm=`
chvt 1
if [ x$INIT = xrunit ]
then
- /sbin/reboot-runit $@
+ echo "System will reboot NOW" |wall
+ chvt 1
+ runit-init 6
else
- /sbin/reboot.init $@
+ systemctl reboot $@
fi