 -	[ "br-$config" = "$iface" -o -e "$iface" ] && return 0;
 -	
 -	ifconfig "$iface" 2>/dev/null >/dev/null && {
--		# make sure the interface is removed from any existing bridge and brought down
--		ifconfig "$iface" down
+-		# make sure the interface is removed from any existing bridge and deconfigured 
+-		ifconfig "$iface" 0.0.0.0
 -		unbridge "$iface"
 -	}
 -
 -	# Setup VLAN interfaces
--	add_vlan "$iface"
+-	add_vlan "$iface" && return 1
 -	ifconfig "$iface" 2>/dev/null >/dev/null || return 0
 -
 -	# Setup bridging

-		done
-	}
-}
diff -Naur orig-kamikaze/package/base-files/files/lib/upgrade/common.sh mod-basefiles-kamikaze/package/base-files/files/lib/upgrade/common.sh
--- orig-kamikaze/package/base-files/files/lib/upgrade/common.sh	2008-06-04 23:20:56.755507000 +0000
+++ mod-basefiles-kamikaze/package/base-files/files/lib/upgrade/common.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,151 +0,0 @@
-#!/bin/sh
-
-RAM_ROOT=/tmp/root

-start() {
-        [ -c /dev/watchdog ] && watchdog -t 5 /dev/watchdog
-}
diff -Naur a/package/base-files/files/etc/inittab b/package/base-files/files/etc/inittab
--- a/package/base-files/files/etc/inittab	2007-05-10 14:50:42.865525000 +0000
+++ b/package/base-files/files/etc/inittab	2009-02-01 09:30:27.525268168 +0000
@@ -1,5 +1,2 @@
 ::sysinit:/etc/init.d/rcS S boot
 ::shutdown:/etc/init.d/rcS K stop
-tts/0::askfirst:/bin/ash --login
-ttyS0::askfirst:/bin/ash --login
-tty1::askfirst:/bin/ash --login
diff -Naur a/package/base-files/files/etc/preinit b/package/base-files/files/etc/preinit
--- a/package/base-files/files/etc/preinit	2008-08-14 22:21:35.073308000 +0000
+++ b/package/base-files/files/etc/preinit	2009-02-01 09:43:52.954824264 +0000
@@ -1,88 +1,198 @@
 #!/bin/sh
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2008-2009  The Tor Project, Inc.
+# See LICENSE file for rights and terms.
+#
+# NOTE: This file is a full replacement of the original
+# OpenWRT preinit boot script.  This may not be apparent
+# when viewing the diff between these implementations.
+
 export PATH=/bin:/sbin:/usr/bin:/usr/sbin
-. /etc/diag.sh
