rename default/ to files/

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@5622 3c298f89-4303-0410-b956-a3cf2f4a3e73

4 files changed, 0 insertions, 512 deletions

diff --git a/package/base-files/default/lib/config/template.awk b/package/base-files/default/lib/config/template.awk
deleted file mode 100644
index faae8b345..000000000
--- a/package/base-files/default/lib/config/template.awk
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright (C) 2006 OpenWrt.org
-
-{
-	line=$0
-	gsub(/^[ \t]*/, "")
-	gsub(/[ \t]*$/, "")
-}
-
-$1 == "@define" {
-	v[$2] = $3
-}
-
-$1 == "@ifdef" {
-	if_open = 1
-	if (v[$2] != "") noprint = 0
-	else noprint = 1
-}
-
-$1 == "@ifndef" {
-	if_open = 1
-	if (v[$2] != "") noprint = 1
-	else noprint = 0
-}
-
-$1 == "@else" {
-	if (noprint == 1) noprint = 0
-	else noprint = 1
-}
-
-($1 !~ /^@[a-zA-Z0-9_]/) && (noprint != 1) {
-	n=split(line "@@", a, /@@/)
-	for (i=1; i<=n; i++) {
-		if ((i % 2) == 1) printf "%s" a[i]
-		else printf "%s" v[a[i]]
-	}
-	print ""
-}
-
-$1 == "@endif" {
-	if_open = 0
-	noprint = 0
-}
diff --git a/package/base-files/default/lib/config/uci-update.awk b/package/base-files/default/lib/config/uci-update.awk
deleted file mode 100644
index efa875850..000000000
--- a/package/base-files/default/lib/config/uci-update.awk
+++ /dev/null
@@ -1,160 +0,0 @@
-# Configuration update functions
-#
-# Copyright (C) 2006 by Fokus Fraunhofer <carsten.tittel@fokus.fraunhofer.de>
-# Copyright (C) 2006 by Felix Fietkau <nbd@openwrt.org>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-
-function read_file(filename,  result) {
-	while ((getline <filename) == 1) {
-		result = result $0 "\n"
-	}
-	gsub(/\n*$/, "", result)
-	return result
-}
-
-function cmd2option(str,  tmp) {
-	if (match(str,"=")!=0) {
-		res = "\toption " substr(str,1,RSTART-1) "\t'" substr(str,RSTART+1) "'"
-	} else {
-		res= ""
-	}
-	return res
-}
-
-function cmd2config(atype,  aname) {
-	return "config \"" atype "\" \"" aname "\""
-}
-
-function update_config(cfg, update,  \
-  lines, line, l, n, i, i2, section, scnt, remove, tmp, aidx, rest) {
-	scnt = 1
-	linecnt=split(cfg "\n", lines, "\n")
-
-	cfg = ""
-	for (n = 1; n < linecnt; n++) {
-		# stupid parser for quoted arguments (e.g. for the type string).
-		# not to be used to gather variable values (backslash escaping doesn't work)
-		line = lines[n]
-		gsub(/^[ \t]*/, "", line)
-		gsub(/#.*$/, "", line)
-		i2 = 1
-		delete l
-		rest = line
-        	while (length(rest)) {
-			if (match(rest, /[ \t\"]+/)) {
-				if (RSTART>1) {
-					l[i2] = substr(rest,1,RSTART-1)
-					i2++
-				}
-				aidx=index(rest,"\"")
-				if (aidx>=RSTART && aidx<=RSTART+RLENGTH) {
-					rest=substr(rest,aidx+1)
-					# find the end of the string
-					match(rest,/\"/)
-					l[i2]=substr(rest,1,RSTART-1)
-					i2++
-				}
-				rest=substr(rest,RSTART+RLENGTH)
-			} else {
-				l[i2] = rest
-				i2++
-				rest = ""
-			}
-		}
-		line = lines[n]
-		
-		# when a command wants to set a config value for the current
-		# section and a blank line is encountered before an option with
-		# the same name, insert it here to maintain some coherency between
-		# manually and automatically created option lines
-		# if an option with the same name appears after this point, simply
-		# ignore it, because it is already set.
-		if ((section != "") && (l[1] != "option")) {
-			if (line ~ /^[ \t]*$/) {
-				if (update ~ "^" section "\\.") {
-					gsub("^" section ".", "", update)
-					cfg = cfg cmd2option(update) "\n"
-					gsub(/=.*$/, "", update)
-					update = "-" section "." update
-				}
-			}
-		}
-
-		if (l[1] == "config") {
-			# look for all unset values
-			if (section != "") {
-				flag=0
-				if (update ~ "^" section "\\.") {
-					flag=1
-					gsub("^" section ".", "", update)
-					cfg = cfg cmd2option(update) "\n"
-					
-					update = "-" section "." update
-				} 
-				if (flag!=0) cfg = cfg "\n"
-			}
-			
-			remove = ""
-			section = l[3]
-			if (!length(section)) {
-				section = "cfg" scnt
-			}	
-			scnt++
-			if (update == "-" section) {
-				remove = "section"
-				update = ""
-			} else if (update ~ "^@" section "=") {
-				update = ""
-			} else if (update ~ "^&" section "=") {
-				gsub("^&" section "=", "", update)
-				line = cmd2config(l[2],update) 
-				update = ""
-			}
-		}
-		if (remove == "option") remove = ""
-		if (l[1] == "option") {
-			if (update ~ "^-" section "\\." l[2] "$") remove = "option"
-			# if a supplied config value already exists, replace the whole line
-			if (match(update, "^" section "." l[2] "=")) {
-				gsub("^" section ".", "", update)
-				line = cmd2option(update)
-				update = ""
-			}
-		}
-		if (remove == "") cfg = cfg line "\n"
-	}
-	
-	# any new options for the last section??
-	if (section != "") {
-		if (update ~ "^" section "\\.") {
-			gsub("^" section ".", "", update)
-			cfg = cfg cmd2option(update) "\n"
-
-			update = "-" section "." update
-		} 
-	}
-
-	if (update ~ "^@") {
-		# new section
-		section = stype = substr(update,2)
-		gsub(/=.*$/,"",section)
-		gsub(/^.*=/,"",stype)
-		cfg = cfg "\nconfig \"" stype "\" \"" section "\"\n"
-	}
-
-	return cfg
-}
diff --git a/package/base-files/default/lib/config/uci.sh b/package/base-files/default/lib/config/uci.sh
deleted file mode 100755
index 957c1bb7c..000000000
--- a/package/base-files/default/lib/config/uci.sh
+++ /dev/null
@@ -1,139 +0,0 @@
-#!/bin/sh
-# Shell script defining macros for manipulating config files
-#
-# Copyright (C) 2006 by Fokus Fraunhofer <carsten.tittel@fokus.fraunhofer.de>
-# Copyright (C) 2006 by Felix Fietkau <nbd@openwrt.org>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-uci_load() {
-	local PACKAGE="$1"
-	config_load "$PACKAGE"
-	local PACKAGE_BASE="$(basename "$PACKAGE")"
-	[ -f "/tmp/.uci/${PACKAGE_BASE}" ] && {
-		. "/tmp/.uci/${PACKAGE_BASE}"
-		config_cb
-	}
-}
-
-uci_do_update() {
-	local FILENAME="$1"
-	local UPDATE="$2"
-	awk -f /lib/config/uci-update.awk -f - <<EOF
-BEGIN {
-	config = read_file("$FILENAME")
-	$UPDATE
-	print config
-}
-EOF
-}
-
-uci_add_update() {
-	local PACKAGE="$1"
-	local UPDATE="$2"
-	local PACKAGE_BASE="$(basename "$PACKAGE")"
-	
-	# FIXME: add locking?
-	mkdir -p "/tmp/.uci"
-	echo "$UPDATE" >> "/tmp/.uci/${PACKAGE_BASE}"
-}
-
-uci_set() {
-	local PACKAGE="$1"
-	local CONFIG="$2"
-	local OPTION="$3"
-	local VALUE="$4"
-
-	( # spawn a subshell so you don't mess up the current environment
-		uci_load "$PACKAGE"
-		config_get type "$CONFIG" TYPE
-		[ -z "$type" ]
-	) || uci_add_update "$PACKAGE" "CONFIG_SECTION='$CONFIG'${N}option '$OPTION' '$VALUE'"
-}
-
-uci_add() {
-	local PACKAGE="$1"
-	local TYPE="$2"
-	local CONFIG="$3"
-
-	uci_add_update "$PACKAGE" "config '$TYPE' '$CONFIG'"
-}
-
-uci_rename() {
-	local PACKAGE="$1"
-	local CONFIG="$2"
-	local VALUE="$3"
-
-	uci_add_update "$PACKAGE" "config_rename '$CONFIG' '$VALUE'"
-}
-
-uci_remove() {
-	local PACKAGE="$1"
-	local CONFIG="$2"
-	local OPTION="$3"
-
-	if [ -z "$OPTION" ]; then
-		uci_add_update "$PACKAGE" "config_clear '$CONFIG'"
-	else
-		uci_add_update "$PACKAGE" "config_unset '$CONFIG' '$OPTION'"
-	fi
-}
-
-uci_commit() {
-	local PACKAGE="$1"
-	local PACKAGE_BASE="$(basename "$PACKAGE")"
-	
-	mkdir -p /tmp/.uci
-	lock "/tmp/.uci/$PACKAGE_BASE.lock"
-	[ -f "/tmp/.uci/$PACKAGE_BASE" ] && (
-		updatestr=""
-		
-		# replace handlers
-		config() {
-			append updatestr "config = update_config(config, \"@$2=$1\")" "$N"
-		}
-		option() {
-			append updatestr "config = update_config(config, \"$CONFIG_SECTION.$1=$2\")" "$N"
-		}
-		config_rename() {
-			append updatestr "config = update_config(config, \"&$1=$2\")" "$N"
-		}
-		config_unset() {
-			append updatestr "config = update_config(config, \"-$1.$2\")" "$N"
-		}
-		config_clear() {
-			append updatestr "config = update_config(config, \"-$1\")" "$N"
-		}
-		
-		. "/tmp/.uci/$PACKAGE_BASE"
-
-		# completely disable handlers so that they don't get in the way
-		config() {
-			return 0
-		}
-		option() {
-			return 0
-		}
-		
-		config_load "$PACKAGE" || CONFIG_FILENAME="$ROOT/etc/config/$PACKAGE_BASE"
-		uci_do_update "$CONFIG_FILENAME" "$updatestr" > "/tmp/.uci/$PACKAGE_BASE.new" && {
-			mv -f "/tmp/.uci/$PACKAGE_BASE.new" "$CONFIG_FILENAME" && \
-			rm -f "/tmp/.uci/$PACKAGE_BASE"
-		} 
-	)
-	lock -u "/tmp/.uci/$PACKAGE_BASE.lock"
-}
-
-
diff --git a/package/base-files/default/lib/network/config.sh b/package/base-files/default/lib/network/config.sh
deleted file mode 100755
index 90f5bf742..000000000
--- a/package/base-files/default/lib/network/config.sh
+++ /dev/null
@@ -1,171 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2006 OpenWrt.org
-
-# DEBUG="echo"
-
-find_config() {
-	local iftype device iface ifaces ifn
-	for ifn in $interfaces; do
-		config_get iftype "$ifn" type
-		config_get iface "$ifn" ifname
-		case "$iftype" in
-			bridge) config_get ifaces "$ifn" ifnames;;
-		esac
-		config_get device "$ifn" device
-		for ifc in $device $iface $ifaces; do
-			[ "$ifc" = "$1" ] && {
-				echo "$ifn"
-				return 0
-			}
-		done
-	done
-
-	return 1;
-}
-
-scan_interfaces() {
-	local mode iftype iface ifname device
-	interfaces=
-	config_cb() {
-		case "$1" in
-			interface)
-				config_set "$2" auto 1
-			;;
-		esac
-		config_get iftype "$CONFIG_SECTION" TYPE
-		case "$iftype" in
-			interface)
-				config_get proto "$CONFIG_SECTION" proto
-				append interfaces "$CONFIG_SECTION"
-				config_get iftype "$CONFIG_SECTION" type
-				config_get ifname "$CONFIG_SECTION" ifname
-				config_set "$CONFIG_SECTION" device "$ifname"
-				case "$iftype" in
-					bridge)
-						config_set "$CONFIG_SECTION" ifnames "$ifname"
-						config_set "$CONFIG_SECTION" ifname br-"$CONFIG_SECTION"
-					;;
-				esac
-				( type "scan_$proto" ) >/dev/null 2>/dev/null && eval "scan_$proto '$CONFIG_SECTION'"
-			;;
-		esac
-	}
-	config_load network
-}
-
-add_vlan() {
-	local vif="${1%\.*}"
-	
-	[ "$1" = "$vif" ] || ifconfig "$1" >/dev/null 2>/dev/null || {
-		ifconfig "$vif" up 2>/dev/null >/dev/null || add_vlan "$vif"
-		$DEBUG vconfig add "$vif" "${1##*\.}"
-	}
-}
-
-setup_interface() {
-	local iface="$1"
-	local config="$2"
-	local proto
-
-	[ -n "$config" ] || {
-		config=$(find_config "$iface")
-		[ "$?" = 0 ] || return 1
-	}
-
-	proto="${3:-$(config_get "$config" proto)}"
-	config_get iftype "$config" type
-	
-	ifconfig "$iface" 2>/dev/null >/dev/null && {
-		# make sure the interface is removed from any existing bridge
-		unbridge "$iface"
-	}
-
-	# Setup VLAN interfaces
-	add_vlan "$iface"
-
-	# Setup bridging
-	case "$iftype" in
-		bridge)
-			ifconfig "$iface" up 2>/dev/null >/dev/null
-			ifconfig "br-$config" 2>/dev/null >/dev/null && {
-				$DEBUG brctl addif "br-$config" "$iface"
-				return 0
-			} || {
-				$DEBUG brctl addbr "br-$config"
-				$DEBUG brctl setfd "br-$config" 0
-				$DEBUG brctl addif "br-$config" "$iface"
-				iface="br-$config"
-			}
-		;;
-	esac
-	
-	# Interface settings
-	config_get mtu "$config" mtu
-	$DEBUG ifconfig "$iface" ${mtu:+mtu $mtu} up
-
-	pidfile="/var/run/$iface.pid"
-	case "$proto" in
-		static)
-			config_get ipaddr "$config" ipaddr
-			config_get netmask "$config" netmask
-			[ -z "$ipaddr" -o -z "$netmask" ] && return 1
-			
-			config_get ip6addr "$config" ip6addr
-			config_get gateway "$config" gateway
-			config_get dns "$config" dns
-			
-			$DEBUG ifconfig "$iface" "$ipaddr" netmask "$netmask"
-			[ -z "$gateway" ] || route add default gw "$gateway"
-			[ -z "$dns" -o -f /tmp/resolv.conf ] || {
-				for ns in $dns; do
-					echo "nameserver $ns" >> /tmp/resolv.conf
-				done
-			}
-
-			env -i ACTION="ifup" INTERFACE="$config" DEVICE="$iface" PROTO=static /sbin/hotplug "iface" &
-		;;
-		dhcp)
-			# prevent udhcpc from starting more than once
-			lock "/var/lock/dhcp-$iface"
-			pid="$(cat "$pidfile" 2>/dev/null)"
-			[ -d "/proc/$pid" ] && grep udhcpc "/proc/${pid}/cmdline" >/dev/null 2>/dev/null && {
-				lock -u "/var/lock/dhcp-$iface"
-				return 0
-			}
-
-			config_get ipaddr "$config" ipaddr
-			config_get netmask "$config" netmask
-			config_get hostname "$config" hostname
-			config_get proto1 "$config" proto
-
-			[ -z "$ipaddr" ] || \
-				$DEBUG ifconfig "$iface" "$ipaddr" ${netmask:+netmask "$netmask"}
-
-			# don't stay running in background if dhcp is not the main proto on the interface (e.g. when using pptp)
-			[ "$proto1" != "$proto" ] && dhcpopts="-n -q"
-			$DEBUG eval udhcpc -t 0 -i "$iface" ${ipaddr:+-r $ipaddr} ${hostname:+-H $hostname} -b -p "$pidfile" ${dhcpopts:- -R &}
-			lock -u "/var/lock/dhcp-$iface"
-		;;
-		*)
-			if ( eval "type setup_interface_$proto" ) >/dev/null 2>/dev/null; then
-				eval "setup_interface_$proto '$iface' '$config' '$proto'" 
-			else
-				echo "Interface type $proto not supported."
-				return 1
-			fi
-		;;
-	esac
-}
-
-unbridge() {
-	local dev="$1"
-	local brdev
-
-	brctl show | grep "$dev" >/dev/null && {
-		# interface is still part of a bridge, correct that
-
-		for brdev in $(brctl show | awk '$2 ~ /^[0-9].*\./ { print $1 }'); do
-			brctl delif "$brdev" "$dev" 2>/dev/null >/dev/null
-		done
-	}
-}