diff options
| -rw-r--r-- | recipes-core/lighttpd/lighttpd_1.4.48.bb | 2 | ||||
| -rw-r--r-- | recipes-core/multitech/commissioning_1.0.1.bb | 2 | ||||
| -rwxr-xr-x | recipes-core/multitech/reset-handler/reset-handler.sh | 5 | ||||
| -rw-r--r-- | recipes-core/multitech/reset-handler_1.1.bb (renamed from recipes-core/multitech/reset-handler_1.0.bb) | 0 |
4 files changed, 8 insertions, 1 deletions
diff --git a/recipes-core/lighttpd/lighttpd_1.4.48.bb b/recipes-core/lighttpd/lighttpd_1.4.48.bb index 0b9897a..a6b5d60 100644 --- a/recipes-core/lighttpd/lighttpd_1.4.48.bb +++ b/recipes-core/lighttpd/lighttpd_1.4.48.bb @@ -52,7 +52,7 @@ EXTRA_OECONF = " \ --disable-static \ " -inherit useradd autotools pkgconfig update-rc.d gettext systemd +inherit useradd autotools pkgconfig gettext systemd INITSCRIPT_NAME = "lighttpd" INITSCRIPT_PARAMS = "defaults 60 40" diff --git a/recipes-core/multitech/commissioning_1.0.1.bb b/recipes-core/multitech/commissioning_1.0.1.bb index 06e1904..6fb0a12 100644 --- a/recipes-core/multitech/commissioning_1.0.1.bb +++ b/recipes-core/multitech/commissioning_1.0.1.bb @@ -33,6 +33,8 @@ do_install() { cp -a ${S}/${sysconfdir}/ ${D}/ cp -a ${S}/www/ ${D}/ cp -a ${S}/${prefix} ${D}/ + cp -a ${S}/usr/ ${D}/ + chmod 755 ${D}/usr/bin/* chmod 755 ${D}/etc/init.d/* chmod 755 ${D}/${libexecdir}/commission/* chown -R root:root ${D}/ diff --git a/recipes-core/multitech/reset-handler/reset-handler.sh b/recipes-core/multitech/reset-handler/reset-handler.sh index 50a6783..43f7471 100755 --- a/recipes-core/multitech/reset-handler/reset-handler.sh +++ b/recipes-core/multitech/reset-handler/reset-handler.sh @@ -39,6 +39,11 @@ do_restore_defaults() { rm -rf /var/config/* $log "Setting restore defaults on reboot" touch /var/config/force_defaults + if [[ -x /usr/bin/rmpasswd ]] + then + $log "Resetting passwords" + source rmpasswd + fi $log "Rebooting" sleep 1 reboot diff --git a/recipes-core/multitech/reset-handler_1.0.bb b/recipes-core/multitech/reset-handler_1.1.bb index 39abaab..39abaab 100644 --- a/recipes-core/multitech/reset-handler_1.0.bb +++ b/recipes-core/multitech/reset-handler_1.1.bb |