diff options
| author | Britney Fransen <brfransen@gmail.com> | 2014-04-05 19:49:18 (GMT) |
|---|---|---|
| committer | Britney Fransen <brfransen@gmail.com> | 2014-04-05 19:49:18 (GMT) |
| commit | bdefc1e81c89dbb12e7e914a9f1f220ee5ed1714 (patch) | |
| tree | f8ed2037e4dab50bf0cdb4cdcb6a8b28d5f00694 /abs/core/poweroff-scripts/halt.script | |
| parent | de6718e325ed5fdcb2b15cb567732321ecb14790 (diff) | |
| download | linhes_pkgbuild-bdefc1e81c89dbb12e7e914a9f1f220ee5ed1714.zip linhes_pkgbuild-bdefc1e81c89dbb12e7e914a9f1f220ee5ed1714.tar.gz linhes_pkgbuild-bdefc1e81c89dbb12e7e914a9f1f220ee5ed1714.tar.bz2 | |
poweroff-scripts: fix shutdown/reboot issue with /usr/bin move. refs #961
Diffstat (limited to 'abs/core/poweroff-scripts/halt.script')
| -rwxr-xr-x | abs/core/poweroff-scripts/halt.script | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/abs/core/poweroff-scripts/halt.script b/abs/core/poweroff-scripts/halt.script index b2e8170..223d3e8 100755 --- a/abs/core/poweroff-scripts/halt.script +++ b/abs/core/poweroff-scripts/halt.script @@ -2,19 +2,16 @@ 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 -if [ x$INIT = xrunit ] +#ignore -w option +if [ x$1 = x-w ] then - echo "System will shutdown NOW" |wall - chvt 1 - runit-init 0 + exit 0 +fi +if [ x$INIT = xrunit ] +then + shutdown -h else - systemctrl $@ + systemctl poweroff $@ fi - |