diff options
| author | John Klug <john.klug@multitech.com> | 2019-12-04 14:13:30 -0600 |
|---|---|---|
| committer | John Klug <john.klug@multitech.com> | 2019-12-04 14:13:30 -0600 |
| commit | 76b5dfb8142e7c8afde7c3664a6dfc755bae3484 (patch) | |
| tree | e2a9cbac5ec596913424022f06243af9e93fcb80 | |
| parent | 3422816ad067fa6156d56332c98ceeb2c3ec1996 (diff) | |
| download | commissioning-76b5dfb8142e7c8afde7c3664a6dfc755bae3484.tar.gz commissioning-76b5dfb8142e7c8afde7c3664a6dfc755bae3484.tar.bz2 commissioning-76b5dfb8142e7c8afde7c3664a6dfc755bae3484.zip | |
Change commissioning to commission in most cases
| -rw-r--r-- | commissioning.bb | 6 | ||||
| -rwxr-xr-x | etc/init.d/commission (renamed from etc/init.d/commissioning) | 2 | ||||
| -rwxr-xr-x | etc/init.d/commission-php-fpm (renamed from etc/init.d/php-fpm-commission) | 4 | ||||
| -rwxr-xr-x | usr/libexec/commission/off.sh (renamed from usr/libexec/commissioning/off.sh) | 2 |
4 files changed, 4 insertions, 10 deletions
diff --git a/commissioning.bb b/commissioning.bb deleted file mode 100644 index 415945c..0000000 --- a/commissioning.bb +++ /dev/null @@ -1,6 +0,0 @@ -# also needed for php-fpm-commission -inherit update-rc.d - -INITSCRIPT_PARAMS_${PN}-autostart = "update-rc.d commissioning start 2 3 4 5 . " - -# update-rc.d commissioning start 2 3 4 5 . diff --git a/etc/init.d/commissioning b/etc/init.d/commission index 82bda67..03bec24 100755 --- a/etc/init.d/commissioning +++ b/etc/init.d/commission @@ -3,7 +3,7 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin DAEMON=/usr/sbin/lighttpd DAEMONNAME="lighttpd" -NAME=commissioning +NAME=commission DESC="Lighttpd Web Server" OPTS="-f /etc/lighttpd-commission.conf" PIDFILE=/var/run/lighttpd-commission.pid diff --git a/etc/init.d/php-fpm-commission b/etc/init.d/commission-php-fpm index cd86ab5..95de811 100755 --- a/etc/init.d/php-fpm-commission +++ b/etc/init.d/commission-php-fpm @@ -22,7 +22,7 @@ php_fpm_PID="/var/run/${NAME}.pid" php_opts="-R --fpm-config $php_fpm_CONF --pid $php_fpm_PID" ENABLED=yes -[ -f "/etc/default/commissioning" ] && . "/etc/default/commissioning" +[ -f "/etc/default/commission" ] && . "/etc/default/commission" wait_for_pid () { try=0 @@ -55,7 +55,7 @@ wait_for_pid () { case "$1" in start) - [[ -f /etc/default/commissioning ]] && . /etc/default/commissioning + [[ -f /etc/default/commission ]] && . /etc/default/commission if [[ $ENABLED != "yes" ]]; then echo "$NAME: disabled in /etc/default" exit diff --git a/usr/libexec/commissioning/off.sh b/usr/libexec/commission/off.sh index 5be4eb4..4911c47 100755 --- a/usr/libexec/commissioning/off.sh +++ b/usr/libexec/commission/off.sh @@ -1,4 +1,4 @@ #!/bin/bash sleep 30 -/etc/init.d/commissioning stop 2>&1 | logger -p local0.crit +/etc/init.d/commission stop 2>&1 | logger -p local0.crit /etc/init.d/php-fpm-commission stop 2>&1 | logger -p local0.crit |