luci-0.9: merge r5528

diff --git a/modules/freifunk/root/etc/init.d/freifunk b/modules/freifunk/root/etc/init.d/freifunk
index 8b280cd51f0d7bf1c3ed03ee32665524deec6b94..273f83285600103d9ad25cb145c8ed4cf88fc410 100755 (executable)
--- a/modules/freifunk/root/etc/init.d/freifunk
+++ b/modules/freifunk/root/etc/init.d/freifunk
@@ -27,7 +27,6 @@ boot() {
                echo "17 * * * *        /usr/sbin/ff_mapupdate" >> /etc/crontabs/root
        }
 
-       [ -f /etc/rc.local ] && . /etc/rc.local
        [ -d /etc/rc.local.d ] && {
                for file in /etc/rc.local.d/*; do
                        test -f "$file" && . "$file"

diff --git a/modules/freifunk/root/etc/rc.local b/modules/freifunk/root/etc/rc.local
deleted file mode 100644 (file)
index 58e44e4..0000000
--- a/modules/freifunk/root/etc/rc.local
+++ /dev/null
@@ -1,2 +0,0 @@
-# /etc/rc.local
-# Only executed on boot, put your custom startup commands here