diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2010-12-30 22:52:51 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-12-30 22:52:51 +0100 |
commit | 58d31896056e604185acf3606b99257cea519dd1 (patch) | |
tree | 3a0fb34da5dbe8dc12326fcd7fbf0c3916028f41 /package/base-files/src/etc/init.d/rcK | |
parent | 220a96f9926788ed531717f78e44fdf1e7ab3b34 (diff) | |
parent | 845317b460ee99ad633534cad4de72404af7e30b (diff) |
resolve merge conflicts
Diffstat (limited to 'package/base-files/src/etc/init.d/rcK')
-rwxr-xr-x | package/base-files/src/etc/init.d/rcK | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/package/base-files/src/etc/init.d/rcK b/package/base-files/src/etc/init.d/rcK index 20c47f5db..9d0e06440 100755 --- a/package/base-files/src/etc/init.d/rcK +++ b/package/base-files/src/etc/init.d/rcK @@ -1,7 +1,6 @@ #!/bin/sh export PATH=/bin:/sbin:/usr/bin:/usr/sbin { - test -e /etc/rc.shutdown && (/bin/sh /etc/rc.shutdown) 2>&1 grep '^#INIT ' /etc/init.d/* | \ sort -rnk2 | \ while read line; do @@ -15,4 +14,5 @@ export PATH=/bin:/sbin:/usr/bin:/usr/sbin esac ${shebang:-/bin/sh} ${line%%:*} autostop 2>&1 done + test -e /etc/rc.shutdown && (/bin/sh /etc/rc.shutdown) 2>&1 } | logger -s -p 6 -t '' |