summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
Diffstat (limited to 'etc')
-rwxr-xr-xetc/init.d/commissioning12
-rwxr-xr-xetc/init.d/php-fpm-commission11
2 files changed, 9 insertions, 14 deletions
diff --git a/etc/init.d/commissioning b/etc/init.d/commissioning
index c04a51a..4fc7366 100755
--- a/etc/init.d/commissioning
+++ b/etc/init.d/commissioning
@@ -21,13 +21,11 @@ if [[ ENABLED == no ]] ; then
fi
fi
-# /etc/default/no-${NAME} should point at /etc/default/.no-${NAME}
-# and contain ENABLED="no".
-# This will prevent commissioning on a factory reset
-# but not on an image update for tighter security.
-# If the device is to have no password at all, this file and
-# link must be created, and ENABLED must be set to "no"
-[ -f "/etc/default/no-${NAME}" ] && . "/etc/config/no-${NAME}"
+# To disable commissioning across a factory reset (and image install):
+# echo 'ENABLED="no"' >/var/config/.no-commissioning
+# ln -sf /var/config/.no-commissioning /etc/default/no-commissioning
+
+[ -f "/etc/default/no-${NAME}" ] && . "/etc/default/no-${NAME}"
case "$1" in
diff --git a/etc/init.d/php-fpm-commission b/etc/init.d/php-fpm-commission
index d61584c..7ac0925 100755
--- a/etc/init.d/php-fpm-commission
+++ b/etc/init.d/php-fpm-commission
@@ -24,13 +24,10 @@ ENABLED=yes
[ -f "/etc/default/commissioning" ] && . "/etc/config/commisioning"
-# /etc/default/no-${NAME} should point at /etc/default/.no-${NAME}
-# and contain ENABLED="no".
-# This will prevent commissioning on a factory reset
-# but not on an image update for tighter security.
-# If the device is to have no password at all, this file and
-# link must be created, and ENABLED must be set to "no"
-[ -f "/etc/default/no-${NAME}" ] && . "/etc/config/no-${NAME}"
+# To disable commissioning across a factory reset (and image install):
+# echo 'ENABLED="no"' >/var/config/.no-commissioning
+# ln -sf /var/config/.no-commissioning /etc/default/no-commissioning
+[ -f "/etc/default/no-commissioning" ] && . "/etc/default/no-commissioning"
wait_for_pid () {
try=0