Rewrite the core parts in C. We now provide librc so other programs can

    query runlevels, services and state without using bash. We also provide
    libeinfo so other programs can easily use our informational functions.

    As such, we have dropped the requirement of using bash as the init script
    shell. We now use /bin/sh and have strived to make the scripts as portable
    as possible. Shells that work are bash and dash. busybox works provided
    you disable s-s-d. If you have WIPE_TMP set to yes in conf.d/bootmisc you
    should disable find too.
    zsh and ksh do not work at this time.

    Networking support is currently being re-vamped also as it was heavily bash
    array based. As such, a new config format is available like so
    config_eth0="1.2.3.4/24 5.6.7.8/16"
    or like so
    config_eth0="'1.2.3.4 netmask 255.255.255.0' '5.6.7.8 netmask 255.255.0.0'"

    We will still support the old bash array format provided that /bin/sh IS
    a link it bash.

    ChangeLog for baselayout-1 can be found in our SVN repo.

svn path=/trunk/; revision=2547

1 files changed, 113 insertions, 0 deletions

diff --git a/net.Linux/bridge.sh b/net.Linux/bridge.sh
new file mode 100644
index 00000000..89d5687e
--- /dev/null
+++ b/net.Linux/bridge.sh
@@ -0,0 +1,113 @@
+# Copyright 2004-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+bridge_depend() {
+	before interface macnet
+	program /sbin/brctl
+}
+
+_config_vars="$_config_vars bridge bridge_add brctl"
+
+_is_bridge() {
+	brctl show 2>/dev/null | grep -q "^${IFACE}[[:space:]]"
+}
+
+bridge_pre_start() {
+	local ports= brif= opts= iface="${IFACE}" e= x=
+	eval $(_get_array "bridge_${IFVAR}")
+	ports="$@"
+	eval brif=\$bridge_add_${IFVAR}
+	eval $(_get_array "brctl_${IFVAR}")
+	opts="$@"
+	[ -z "${ports}" -a -z "${brif}" -a -z "${opts}" ] && return 0
+
+	[ -n "${ports}" ] && bridge_post_stop
+
+	(
+	if [ -z "${ports}" -a -n "${brif}" ] ; then
+		ports="${IFACE}"
+		IFACE="${brif}"
+	else
+		ports="${ports}"
+		metric=1000
+	fi
+
+	if ! _is_bridge ; then
+		ebegin "Creating bridge ${IFACE}"
+		if ! brctl addbr "${IFACE}" ; then
+			eend 1
+			return 1
+		fi
+
+		eval set -- ${opts}
+		for x in "$@" ; do
+			case " ${x} " in
+				*" ${IFACE} "*) ;;
+				*) x="${x} ${IFACE}" ;;
+			esac
+			brctl ${x}
+		done
+	fi
+
+	if [ -n "${ports}" ] ; then
+		einfo "Adding ports to ${IFACE}"
+		eindent
+
+		eval set -- ${ports}
+		for x in "$@" ; do
+			ebegin "${x}"
+			if ! ifconfig "${x}" promisc up && brctl addif "${IFACE}" "${x}" ; then
+				ifconfig "${x}" -promisc 2>/dev/null
+				eend 1
+				return 1
+			fi
+			eend 0
+		done
+		eoutdent
+	fi
+	)
+}
+
+bridge_post_stop() {
+	local port= ports= delete=false extra=
+
+	if _is_bridge ; then
+		ebegin "Destroying bridge ${IFACE}"
+		_down
+		ports="$( brctl show 2>/dev/null | \
+			sed -n -e '/^'"${IFACE}"'[[:space:]]/,/^\S/ { /^\('"${IFACE}"'[[:space:]]\|\t\)/s/^.*\t//p }')"
+		delete=true
+		iface=${IFACE}
+		eindent
+	else
+		# Work out if we're added to a bridge for removal or not
+		eval set -- $(brctl show 2>/dev/null | sed -e "s/'/'\\\\''/g" -e "s/$/'/g" -e "s/^/'/g")
+		local line=
+		for line in "$@" ; do
+			set -- ${line}
+			if [ "$3" = "${IFACE}" ] ; then
+				iface=$1
+				break
+			fi
+		done
+		[ -z "${iface}" ] && return 0
+		extra=" from ${iface}"
+	fi
+
+	for port in ${ports} ; do
+		ebegin "Removing port ${port}${extra}"
+		ifconfig "${port}" -promisc
+		brctl delif "${iface}" "${port}"
+		eend $?
+	done
+
+	if ${delete} ; then
+		eoutdent
+		brctl delbr "${iface}"
+		eend $?
+	fi
+	
+	return 0
+}
+
+# vim: set ts=4 :