From 3f579aba936c12612809a0c67bbd97108c4a8afb Mon Sep 17 00:00:00 2001 From: jow Date: Tue, 5 Jun 2012 15:54:57 +0000 Subject: [PATCH] [packages] /etc/functions.sh => /lib/functions.sh git-svn-id: svn://svn.openwrt.org/openwrt/packages@32061 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- ipv6/6scripts/files/he-tun.ppp | 2 +- ipv6/tayga/files/tayga.hotplug | 2 +- ipv6/tayga/files/tayga.sh | 2 +- ipv6/wide-dhcpv6/files/dhcp6c-dnsmasq.hotplug | 2 +- ipv6/wide-dhcpv6/files/dhcp6c-state | 2 +- libs/firewall-mod-save/files/20_save.sh | 2 +- net/batman-adv/files/lib/batman-adv/config.sh | 2 +- net/batman-adv/files/usr/sbin/batman-adv | 2 +- net/dudders/files/dudders.hotplug | 2 +- net/freeswitch/files/freeswitch.hotplug | 4 ++-- net/multiwan/files/usr/bin/multiwan | 2 +- net/ntpclient/files/ntpclient.hotplug | 2 +- net/openconnect/files/openconnect.sh | 2 +- net/wshaper/files/wshaper.htb | 2 +- utils/acpid/files/acpid.hotplug | 2 +- utils/boxbackup/files/bbstoreaccounts | 2 +- 16 files changed, 17 insertions(+), 17 deletions(-) diff --git a/ipv6/6scripts/files/he-tun.ppp b/ipv6/6scripts/files/he-tun.ppp index 4cc7385a6..ab12d40da 100644 --- a/ipv6/6scripts/files/he-tun.ppp +++ b/ipv6/6scripts/files/he-tun.ppp @@ -1,6 +1,6 @@ #!/bin/sh -. /etc/functions.sh +. /lib/functions.sh ipaddr="$PPP_LOCAL" diff --git a/ipv6/tayga/files/tayga.hotplug b/ipv6/tayga/files/tayga.hotplug index 2539f0930..fb989bdbe 100644 --- a/ipv6/tayga/files/tayga.hotplug +++ b/ipv6/tayga/files/tayga.hotplug @@ -1,7 +1,7 @@ #!/bin/sh if [ "$ACTION" = ifup ]; then - . /etc/functions.sh + . /lib/functions.sh include /lib/network scan_interfaces diff --git a/ipv6/tayga/files/tayga.sh b/ipv6/tayga/files/tayga.sh index 96d132d4d..a9edb6d0b 100644 --- a/ipv6/tayga/files/tayga.sh +++ b/ipv6/tayga/files/tayga.sh @@ -36,7 +36,7 @@ tayga_add_static_mappings() { local tmpconf="$1" ( - . /etc/functions.sh + . /lib/functions.sh config_load firewall tayga_map_rule_add() { diff --git a/ipv6/wide-dhcpv6/files/dhcp6c-dnsmasq.hotplug b/ipv6/wide-dhcpv6/files/dhcp6c-dnsmasq.hotplug index 12e18a25c..61850cf3d 100644 --- a/ipv6/wide-dhcpv6/files/dhcp6c-dnsmasq.hotplug +++ b/ipv6/wide-dhcpv6/files/dhcp6c-dnsmasq.hotplug @@ -1,6 +1,6 @@ #!/bin/sh -. /etc/functions.sh +. /lib/functions.sh getoption() { local cfg=$1 diff --git a/ipv6/wide-dhcpv6/files/dhcp6c-state b/ipv6/wide-dhcpv6/files/dhcp6c-state index 689ca8826..c77772422 100644 --- a/ipv6/wide-dhcpv6/files/dhcp6c-state +++ b/ipv6/wide-dhcpv6/files/dhcp6c-state @@ -1,6 +1,6 @@ #!/bin/sh -. /etc/functions.sh +. /lib/functions.sh uci_revert_state dhcp6c state uci_set_state dhcp6c state "" dhcp6c_state diff --git a/libs/firewall-mod-save/files/20_save.sh b/libs/firewall-mod-save/files/20_save.sh index d26251863..18b352882 100644 --- a/libs/firewall-mod-save/files/20_save.sh +++ b/libs/firewall-mod-save/files/20_save.sh @@ -1,6 +1,6 @@ #!/bin/sh -. /etc/functions.sh +. /lib/functions.sh save_print_table_chain() { local table="$1" diff --git a/net/batman-adv/files/lib/batman-adv/config.sh b/net/batman-adv/files/lib/batman-adv/config.sh index b0cb4b4e6..49d63d639 100644 --- a/net/batman-adv/files/lib/batman-adv/config.sh +++ b/net/batman-adv/files/lib/batman-adv/config.sh @@ -4,7 +4,7 @@ bat_load_module() { [ -d "/sys/module/batman_adv/" ] && return - . /etc/functions.sh + . /lib/functions.sh load_modules /etc/modules.d/*-crc16 /etc/modules.d/*-batman-adv* } diff --git a/net/batman-adv/files/usr/sbin/batman-adv b/net/batman-adv/files/usr/sbin/batman-adv index 93ae1b58f..ca9e603a2 100644 --- a/net/batman-adv/files/usr/sbin/batman-adv +++ b/net/batman-adv/files/usr/sbin/batman-adv @@ -1,7 +1,7 @@ #!/bin/sh # Copyright (C) 2011 OpenWrt.org -. /etc/functions.sh +. /lib/functions.sh . /lib/batman-adv/config.sh start_mesh() { diff --git a/net/dudders/files/dudders.hotplug b/net/dudders/files/dudders.hotplug index 9a85a0149..7e3026fb9 100644 --- a/net/dudders/files/dudders.hotplug +++ b/net/dudders/files/dudders.hotplug @@ -1,6 +1,6 @@ #!/bin/sh -. /etc/functions.sh +. /lib/functions.sh config_cb() { local cfg="$CONFIG_SECTION" diff --git a/net/freeswitch/files/freeswitch.hotplug b/net/freeswitch/files/freeswitch.hotplug index 508073863..ef9656cfb 100644 --- a/net/freeswitch/files/freeswitch.hotplug +++ b/net/freeswitch/files/freeswitch.hotplug @@ -1,12 +1,12 @@ #!/bin/sh -. /etc/functions.sh +. /lib/functions.sh LOAD_STATE=1 if [ "$ACTION" = "ifup" ]; then /etc/init.d/freeswitch enabled && { local not_all_up="$(sh -c ' - . /etc/functions.sh + . /lib/functions.sh LOAD_STATE=1 local if_is_down=0 diff --git a/net/multiwan/files/usr/bin/multiwan b/net/multiwan/files/usr/bin/multiwan index 75b2a2fc8..02c84b8eb 100755 --- a/net/multiwan/files/usr/bin/multiwan +++ b/net/multiwan/files/usr/bin/multiwan @@ -1,6 +1,6 @@ #!/bin/sh -. /etc/functions.sh +. /lib/functions.sh silencer() { if [ -z "$debug" -o "$debug" == "0" ]; then diff --git a/net/ntpclient/files/ntpclient.hotplug b/net/ntpclient/files/ntpclient.hotplug index c932688c9..536f531fa 100644 --- a/net/ntpclient/files/ntpclient.hotplug +++ b/net/ntpclient/files/ntpclient.hotplug @@ -1,7 +1,7 @@ #!/bin/sh # Copyright (C) 2006 OpenWrt.org -. /etc/functions.sh +. /lib/functions.sh unset SERVER unset PORT diff --git a/net/openconnect/files/openconnect.sh b/net/openconnect/files/openconnect.sh index f99b34ea1..21100678c 100755 --- a/net/openconnect/files/openconnect.sh +++ b/net/openconnect/files/openconnect.sh @@ -1,5 +1,5 @@ #!/bin/sh -. /etc/functions.sh +. /lib/functions.sh . ../netifd-proto.sh init_proto "$@" diff --git a/net/wshaper/files/wshaper.htb b/net/wshaper/files/wshaper.htb index d8e35adb3..0729fb710 100755 --- a/net/wshaper/files/wshaper.htb +++ b/net/wshaper/files/wshaper.htb @@ -7,7 +7,7 @@ # All config needs to be done in /etc/config/wshaper -. /etc/functions.sh +. /lib/functions.sh config_load wshaper for s in downlink uplink network nopriohostdst nopriohostsrc noprioportdst noprioportsrc; do config_get $s settings $s diff --git a/utils/acpid/files/acpid.hotplug b/utils/acpid/files/acpid.hotplug index 120adab2d..6e08d01a2 100644 --- a/utils/acpid/files/acpid.hotplug +++ b/utils/acpid/files/acpid.hotplug @@ -1,6 +1,6 @@ #!/bin/sh -. /etc/functions.sh +. /lib/functions.sh if [ "$ACTION" = add ] && [ "$DEVICENAME" = event0 ]; then ( /etc/init.d/acpid/stop; sleep 3; /usr/sbin/acpid )& diff --git a/utils/boxbackup/files/bbstoreaccounts b/utils/boxbackup/files/bbstoreaccounts index 5bf2cf577..ec38fc06e 100755 --- a/utils/boxbackup/files/bbstoreaccounts +++ b/utils/boxbackup/files/bbstoreaccounts @@ -1,6 +1,6 @@ #!/bin/sh -. /etc/functions.sh +. /lib/functions.sh . /lib/functions/bbstored.sh bxbk_config_file= -- 2.11.0