diff options
12 files changed, 111 insertions, 65 deletions
diff --git a/applications/luci-asterisk/root/etc/uci-defaults/luci-asterisk b/applications/luci-asterisk/root/etc/uci-defaults/luci-asterisk index 612d7a8f2..e45819f60 100644..100755 --- a/applications/luci-asterisk/root/etc/uci-defaults/luci-asterisk +++ b/applications/luci-asterisk/root/etc/uci-defaults/luci-asterisk @@ -1,7 +1,11 @@ #!/bin/sh -uci batch <<-EOF +uci -q batch <<-EOF >/dev/null + delete ucitrack.@asterisk[-1] add ucitrack asterisk set ucitrack.@asterisk[-1].init=asterisk commit ucitrack EOF + +rm -f /tmp/luci-indexcache +exit 0 diff --git a/applications/luci-ffwizard/root/etc/uci-defaults/device-defaults b/applications/luci-ffwizard/root/etc/uci-defaults/device-defaults index d9ef3d9ad..bbad46ea2 100644..100755 --- a/applications/luci-ffwizard/root/etc/uci-defaults/device-defaults +++ b/applications/luci-ffwizard/root/etc/uci-defaults/device-defaults @@ -6,56 +6,62 @@ set_default_config() config_get type "$cfg" "type" case $type in atheros) - uci set freifunk.wifi_device.channel=1 - uci set freifunk.wifi_device.diversity=0 - uci set freifunk.wifi_device.txantenna=1 - uci set freifunk.wifi_device.rxantenna=1 - uci set freifunk.wifi_device.disabled=0 - uci set freifunk.wifi_device.txpower="" - uci set freifunk.wifi_device.country=276 - uci set freifunk.wifi_device.regdomain="0x37" - uci set freifunk.wifi_device.outdoor="1" - uci set freifunk.wifi_device.hwmode=11g - uci set freifunk.wifi_device.distance=1000 - uci set freifunk.wifi_iface=defaults - uci set freifunk.wifi_iface.mode=adhoc - uci set freifunk.wifi_iface.bssid="02:CA:FF:EE:BA:BE" - uci set freifunk.wifi_iface.sw_merge=1 - uci set freifunk.wifi_iface.mcast_rate=5500 - uci set freifunk.wifi_iface.probereq=1 - uci commit freifunk + uci -q batch <<-EOF + set freifunk.wifi_device.channel=1 + set freifunk.wifi_device.diversity=0 + set freifunk.wifi_device.txantenna=1 + set freifunk.wifi_device.rxantenna=1 + set freifunk.wifi_device.disabled=0 + set freifunk.wifi_device.txpower="" + set freifunk.wifi_device.country=276 + set freifunk.wifi_device.regdomain="0x37" + set freifunk.wifi_device.outdoor="1" + set freifunk.wifi_device.hwmode=11g + set freifunk.wifi_device.distance=1000 + set freifunk.wifi_iface=defaults + set freifunk.wifi_iface.mode=adhoc + set freifunk.wifi_iface.bssid="02:CA:FF:EE:BA:BE" + set freifunk.wifi_iface.sw_merge=1 + set freifunk.wifi_iface.mcast_rate=5500 + set freifunk.wifi_iface.probereq=1 + commit freifunk + EOF ;; mac80211) - uci set freifunk.wifi_device.channel=1 - uci set freifunk.wifi_device.diversity="" - uci set freifunk.wifi_device.disabled=0 - uci set freifunk.wifi_device.txpower="" - uci set freifunk.wifi_device.country=DE - uci set freifunk.wifi_device.distance=1000 - uci set freifunk.wifi_device.htmode='HT40-' - uci set freifunk.wifi_device.hwmode=11ng - uci set freifunk.wifi_iface=defaults - uci set freifunk.wifi_iface.mode=adhoc - uci set freifunk.wifi_iface.bssid="02:CA:FF:EE:BA:BE" - uci set freifunk.wifi_iface.sw_merge="" - uci commit freifunk + uci -q batch <<-EOF + set freifunk.wifi_device.channel=1 + set freifunk.wifi_device.diversity="" + set freifunk.wifi_device.disabled=0 + set freifunk.wifi_device.txpower="" + set freifunk.wifi_device.country=DE + set freifunk.wifi_device.distance=1000 + set freifunk.wifi_device.htmode='HT40-' + set freifunk.wifi_device.hwmode=11ng + set freifunk.wifi_iface=defaults + set freifunk.wifi_iface.mode=adhoc + set freifunk.wifi_iface.bssid="02:CA:FF:EE:BA:BE" + set freifunk.wifi_iface.sw_merge="" + commit freifunk + EOF ;; broadcom) - uci set freifunk.wifi_device.channel=1 - uci set freifunk.wifi_device.diversity="" - uci set freifunk.wifi_device.disabled=0 - uci set freifunk.wifi_device.txpower="" - uci set freifunk.wifi_device.country=DE - uci set freifunk.wifi_device.txantenna=0 - uci set freifunk.wifi_device.rxantenna=0 - uci set freifunk.wifi_device.hwmode=11g - uci set freifunk.wifi_device.distance=1000 - uci set freifunk.wifi_iface=defaults - uci set freifunk.wifi_iface.encryption=none - uci set freifunk.wifi_iface.mode=adhoc - uci set freifunk.wifi_iface.bssid="02:CA:FF:EE:BA:BE" - uci set freifunk.wifi_iface.sw_merge="" - uci commit freifunk + uci -q batch <<-EOF + set freifunk.wifi_device.channel=1 + set freifunk.wifi_device.diversity="" + set freifunk.wifi_device.disabled=0 + set freifunk.wifi_device.txpower="" + set freifunk.wifi_device.country=DE + set freifunk.wifi_device.txantenna=0 + set freifunk.wifi_device.rxantenna=0 + set freifunk.wifi_device.hwmode=11g + set freifunk.wifi_device.distance=1000 + set freifunk.wifi_iface=defaults + set freifunk.wifi_iface.encryption=none + set freifunk.wifi_iface.mode=adhoc + set freifunk.wifi_iface.bssid="02:CA:FF:EE:BA:BE" + set freifunk.wifi_iface.sw_merge="" + commit freifunk + EOF ;; esac } diff --git a/applications/luci-hd-idle/root/etc/uci-defaults/luci-hd_idle b/applications/luci-hd-idle/root/etc/uci-defaults/luci-hd_idle index 6a37176a3..92f435636 100644..100755 --- a/applications/luci-hd-idle/root/etc/uci-defaults/luci-hd_idle +++ b/applications/luci-hd-idle/root/etc/uci-defaults/luci-hd_idle @@ -1,7 +1,11 @@ #!/bin/sh -uci batch <<-EOF - add ucitrack hd-idle - set ucitrack.@hd-idle[-1].init=hd-idle - commit ucitrack +uci -q batch <<-EOF >/dev/null + delete ucitrack.@hd-idle[-1] + add ucitrack hd-idle + set ucitrack.@hd-idle[-1].init=hd-idle + commit ucitrack EOF + +rm -f /tmp/luci-indexcache +exit 0 diff --git a/applications/luci-mmc-over-gpio/root/etc/uci-defaults/luci-mmc_over_gpio b/applications/luci-mmc-over-gpio/root/etc/uci-defaults/luci-mmc-over-gpio index 3dd22ec62..c6e79e60d 100644..100755 --- a/applications/luci-mmc-over-gpio/root/etc/uci-defaults/luci-mmc_over_gpio +++ b/applications/luci-mmc-over-gpio/root/etc/uci-defaults/luci-mmc-over-gpio @@ -1,7 +1,11 @@ #!/bin/sh -uci batch <<-EOF +uci -q batch <<-EOF >/dev/null + delete ucitrack.@mmc_over_gpio[-1] add ucitrack mmc_over_gpio set ucitrack.@mmc_over_gpio[-1].init=mmc_over_gpio commit ucitrack EOF + +rm -f /tmp/luci-indexcache +exit 0 diff --git a/applications/luci-olsr/root/etc/uci-defaults/luci-olsr b/applications/luci-olsr/root/etc/uci-defaults/luci-olsr index 2c38098a5..bbb707ee1 100644..100755 --- a/applications/luci-olsr/root/etc/uci-defaults/luci-olsr +++ b/applications/luci-olsr/root/etc/uci-defaults/luci-olsr @@ -1,7 +1,11 @@ #!/bin/sh -uci batch <<-EOF +uci -q batch <<-EOF >/dev/null + delete ucitrack.@olsrd[-1] add ucitrack olsrd set ucitrack.@olsrd[-1].init=olsrd commit ucitrack EOF + +rm -f /tmp/luci-indexcache +exit 0 diff --git a/applications/luci-p2pblock/root/etc/uci-defaults/luci-p2pblock b/applications/luci-p2pblock/root/etc/uci-defaults/luci-p2pblock index 3367c7165..030ebbed1 100644..100755 --- a/applications/luci-p2pblock/root/etc/uci-defaults/luci-p2pblock +++ b/applications/luci-p2pblock/root/etc/uci-defaults/luci-p2pblock @@ -1,9 +1,11 @@ #!/bin/sh -uci batch <<-EOF 2>/dev/null +uci -q batch <<-EOF >/dev/null + delete citrack.@freifunk_p2pblock[-1] add ucitrack freifunk_p2pblock set ucitrack.@freifunk_p2pblock[-1].init=freifunk-p2pblock commit ucitrack EOF +rm -f /tmp/luci-indexcache exit 0 diff --git a/applications/luci-p910nd/root/etc/uci-defaults/luci-p910nd b/applications/luci-p910nd/root/etc/uci-defaults/luci-p910nd index b37952e4d..80f6d62fa 100644..100755 --- a/applications/luci-p910nd/root/etc/uci-defaults/luci-p910nd +++ b/applications/luci-p910nd/root/etc/uci-defaults/luci-p910nd @@ -1,7 +1,11 @@ #!/bin/sh -uci batch <<-EOF +uci -q batch <<-EOF >/dev/null + delete ucitrack.@p910nd[-1] add ucitrack p910nd set ucitrack.@p910nd[-1].init=p910nd commit ucitrack EOF + +rm -f /tmp/luci-indexcache +exit 0 diff --git a/applications/luci-polipo/root/etc/uci-defaults/luci-polipo b/applications/luci-polipo/root/etc/uci-defaults/luci-polipo index 8a033f8c3..0c570630d 100644..100755 --- a/applications/luci-polipo/root/etc/uci-defaults/luci-polipo +++ b/applications/luci-polipo/root/etc/uci-defaults/luci-polipo @@ -1,7 +1,11 @@ #!/bin/sh -uci batch <<-EOF +uci -q batch <<-EOF >/dev/null + delete ucitrack.@polipo[-1] add ucitrack polipo set ucitrack.@polipo[-1].init=polipo commit ucitrack EOF + +rm -f /tmp/luci-indexcache +exit 0 diff --git a/applications/luci-radvd/root/etc/uci-defaults/luci-radvd b/applications/luci-radvd/root/etc/uci-defaults/luci-radvd index ba4822141..c1f3b7546 100644..100755 --- a/applications/luci-radvd/root/etc/uci-defaults/luci-radvd +++ b/applications/luci-radvd/root/etc/uci-defaults/luci-radvd @@ -1,8 +1,11 @@ #!/bin/sh -uci batch <<-EOF +uci -q batch <<-EOF >/dev/null delete ucitrack.@radvd[-1] add ucitrack radvd set ucitrack.@radvd[-1].init=radvd commit ucitrack EOF + +rm -f /tmp/luci-indexcache +exit 0 diff --git a/applications/luci-statistics/root/etc/uci-defaults/luci-statistics b/applications/luci-statistics/root/etc/uci-defaults/luci-statistics index 9453dc1d0..e94a8637c 100644..100755 --- a/applications/luci-statistics/root/etc/uci-defaults/luci-statistics +++ b/applications/luci-statistics/root/etc/uci-defaults/luci-statistics @@ -1,9 +1,8 @@ #!/bin/sh # register commit handler -[ -f /etc/config/ucitrack ] && \ -[ "$(uci get ucitrack.@luci_statistics[0] 2>/dev/null)" != "luci_statistics" ] && \ -uci batch <<-EOF >/dev/null 2>/dev/null +uci -q batch <<-EOF >/dev/null + delete ucitrack.@luci_statistics[-1] add ucitrack luci_statistics set ucitrack.@luci_statistics[-1].init=luci_statistics commit ucitrack @@ -11,8 +10,9 @@ EOF # register LuCId virtual path handler [ -f /etc/config/lucid ] && \ -[ "$(uci get lucid.statistics 2>/dev/null)" != "DirectoryPublisher" ] && \ -uci batch <<-EOF >/dev/null 2>/dev/null +uci -q batch <<-EOF >/dev/null + delete lucid.statistics + set lucid.statistics=DirectoryPublisher set lucid.statistics.name='RRDTool Image Cache' set lucid.statistics.physical=/tmp/rrdimg @@ -32,4 +32,5 @@ EOF # restart LuCId service [ -x /etc/init.d/lucid ] && /etc/init.d/lucid enabled && /etc/init.d/lucid restart +rm -f /tmp/luci-indexcache exit 0 diff --git a/applications/luci-upnp/root/etc/uci-defaults/luci-upnp b/applications/luci-upnp/root/etc/uci-defaults/luci-upnp index 3165b07b9..fe22a3e3c 100755 --- a/applications/luci-upnp/root/etc/uci-defaults/luci-upnp +++ b/applications/luci-upnp/root/etc/uci-defaults/luci-upnp @@ -1,3 +1,9 @@ #!/bin/sh -/etc/init.d/miniupnpd stop -/etc/init.d/miniupnpd disable + +/etc/init.d/miniupnpd enabled && { + /etc/init.d/miniupnpd stop + /etc/init.d/miniupnpd disable +} + +rm -f /tmp/luci-indexcache +exit 0 diff --git a/applications/luci-ushare/root/etc/uci-defaults/luci-ushare b/applications/luci-ushare/root/etc/uci-defaults/luci-ushare index 262420eba..8bcb6e411 100644..100755 --- a/applications/luci-ushare/root/etc/uci-defaults/luci-ushare +++ b/applications/luci-ushare/root/etc/uci-defaults/luci-ushare @@ -1,7 +1,11 @@ #!/bin/sh -uci batch <<-EOF +uci -q batch <<-EOF >/dev/null + delete ucitrack.@ushare[-1] add ucitrack ushare set ucitrack.@ushare[-1].init=ushare commit ucitrack EOF + +rm -f /tmp/luci-indexcache +exit 0 |