 -	}
 -done
 -
--if ask_bool $SAVE_CONFIG "Keep config files over reflash"; then
+-if [ -n "$CONF_IMAGE" ]; then
+-	case "$(get_magic_word "$CONF_IMAGE")" in
+-		# .gz files
+-		1f8b) ;;
+-		*)
+-			echo "Invalid config file. Please use only .tar.gz files"
+-			exit 1
+-		;;
+-	esac
+-	get_image "$CONF_IMAGE" > "$CONF_TAR"
+-	export SAVE_CONFIG=1
+-elif ask_bool $SAVE_CONFIG "Keep config files over reflash"; then
 -	do_save_conffiles
 -	export SAVE_CONFIG=1
 -else

-	option proto	static
-	option ipaddr	192.168.1.1
-	option netmask	255.255.255.0
diff -Naur orig-kamikaze/package/base-files/files/etc/config/system mod-basefiles-kamikaze/package/base-files/files/etc/config/system
--- orig-kamikaze/package/base-files/files/etc/config/system	2008-06-11 19:59:16.494753000 +0000
+++ mod-basefiles-kamikaze/package/base-files/files/etc/config/system	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-config system
-	option hostname	OpenWrt
-	option timezone	UTC
diff -Naur orig-kamikaze/package/base-files/files/etc/device_table.txt mod-basefiles-kamikaze/package/base-files/files/etc/device_table.txt
--- orig-kamikaze/package/base-files/files/etc/device_table.txt	1970-01-01 00:00:00.000000000 +0000
+++ mod-basefiles-kamikaze/package/base-files/files/etc/device_table.txt	2008-10-03 00:31:58.161094180 +0000
@@ -0,0 +1,44 @@
+#<name>		<type>	<mode>	<uid>	<gid>	<major>	<minor>	<start>	<inc>	<count>
+#/dev		d	755	0	0	-	-	-	-	-

   $(call Config,network.lan.gateway,ip,,LAN Gateway)
   $(call Config,network.lan.dns,ip,,LAN DNS server)
 endef
diff -Naur a/package/base-files/Makefile.orig b/package/base-files/Makefile.orig
--- a/package/base-files/Makefile.orig	1970-01-01 00:00:00.000000000 +0000
+++ b/package/base-files/Makefile.orig	2009-01-26 19:46:12.339316000 +0000
@@ -0,0 +1,269 @@
+#
+# Copyright (C) 2007 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+# $Id: Makefile 14210 2009-01-26 19:46:12Z nbd $
+
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
+
+PKG_NAME:=base-files
+PKG_RELEASE:=14
+
+PKG_FILE_DEPEND:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
+
+include $(INCLUDE_DIR)/package.mk
+
+ifneq ($(DUMP),1)
+  TARGET:=-$(BOARD)
+  ifneq ($(wildcard $(PLATFORM_DIR)/base-files-$(PROFILE) $(PLATFORM_SUBDIR)/base-files-$(PROFILE)),)
+    TARGET:=$(TARGET)-$(PROFILE)
+  endif
+  LIBGCC_VERSION:=$(GCC_VERSION)
+  ifeq ($(ARCH),x86_64)
+    LIB_SUFFIX:=64
+  endif
+else
+  LIBC_VERSION:=<LIBC_VERSION>
+  LIBGCC_VERSION:=<LIBGCC_VERSION>
+endif
+
+CONFIG_PACKAGE_base-files$(TARGET):=$(CONFIG_PACKAGE_base-files)
+
+define Package/base-files$(TARGET)
+  SECTION:=base
+  CATEGORY:=Base system
+  TITLE:=Base filesystem for OpenWrt
+  URL:=http://openwrt.org/
+  VERSION:=$(PKG_RELEASE)-$(REVISION)
+  $(call Config,network.lan.proto,string,static,LAN Protocol)
+  $(call Config,network.lan.ipaddr,ip,192.168.1.1,LAN IP Address)
+  $(call Config,network.lan.netmask,netmask,255.255.255.0,LAN Network Mask)
+  $(call Config,network.lan.gateway,ip,,LAN Gateway)
+  $(call Config,network.lan.dns,ip,,LAN DNS server)
+endef
+
+define Package/base-files$(TARGET)/conffiles
+/etc/banner
+/etc/hosts
+/etc/inittab
+/etc/group
+/etc/passwd
+/etc/profile
+/etc/shells
+/etc/sysctl.conf
+$(call $(TARGET)/conffiles)
+endef
+
+define Package/base-files$(TARGET)/description
+ This package contains a base filesystem and system scripts for OpenWrt.
+endef
+
+define Package/gcc/Default
+  SECTION:=libs
+  CATEGORY:=Base system
+  DEPENDS:=@!NATIVE_TOOLCHAIN
+  URL:=http://gcc.gnu.org/
+  VERSION:=$(LIBGCC_VERSION)-$(PKG_RELEASE)
+endef
+
+define Package/libgcc
+$(call Package/gcc/Default)
+  TITLE:=GCC support library
+  DEPENDS+=@!TARGET_avr32
+endef
+
+define Package/libssp
+$(call Package/gcc/Default)
+  DEPENDS+=@SSP_SUPPORT
+  TITLE:=GCC support library
+endef
+
+define Package/libstdcpp
+$(call Package/gcc/Default)
+  NAME:=libstdc++
+  TITLE:=GNU Standard C++ Library v3
+  DEPENDS+=@INSTALL_LIBSTDCPP
+endef
+
+define Package/libc/Default
+  SECTION:=libs
+  CATEGORY:=Base system
+  DEPENDS:=@!NATIVE_TOOLCHAIN
+  VERSION:=$(LIBC_VERSION)-$(PKG_RELEASE)
+  URL:=$(LIBC_URL)
+endef
+
+define Package/libc
+$(call Package/libc/Default)
+  TITLE:=C library
+endef
+
+define Package/libpthread
+$(call Package/libc/Default)
+  TITLE:=POSIX thread library
+  DEPENDS:= +librt
+endef
+
+define Package/librt
+$(call Package/libc/Default)
+  TITLE:=POSIX.1b RealTime extension library
+endef
+
+define Package/ldd
+$(call Package/uclibc/Default)
+  TITLE:=LDD trace utility
+endef
+
+define Package/ldconfig
+$(call Package/libc/Default)
+  TITLE:=Shared library path configuration
+endef
+
+
+define Build/Prepare
+	mkdir -p $(PKG_BUILD_DIR)
+endef
+
+define Build/Compile/Default
+endef
+
+define Build/Compile
+	$(call Build/Compile/Default)
+endef
+
+define Package/base-files$(TARGET)/install
+	$(CP) ./files/* $(1)/
+	if [ -d $(GENERIC_PLATFORM_DIR)/base-files/. ]; then \
+		$(CP) $(GENERIC_PLATFORM_DIR)/base-files/* $(1)/; \
+	fi
+	if [ -d $(PLATFORM_DIR)/base-files/. ]; then \
+		$(CP) $(PLATFORM_DIR)/base-files/* $(1)/; \
+	fi
+	if [ -d $(PLATFORM_DIR)/base-files-$(PROFILE)/. ]; then \
+		$(CP) $(PLATFORM_DIR)/base-files-$(PROFILE)/* $(1)/; \
+	fi
+	$(if $(filter-out $(PLATFORM_DIR),$(PLATFORM_SUBDIR)), \
+		if [ -d $(PLATFORM_SUBDIR)/base-files/. ]; then \
+			$(CP) $(PLATFORM_SUBDIR)/base-files/* $(1)/; \
+		fi; \
+		if [ -d $(PLATFORM_SUBDIR)/base-files-$(PROFILE)/. ]; then \
+			$(CP) $(PLATFORM_SUBDIR)/base-files-$(PROFILE)/* $(1)/; \
+		fi \
+	)
+# Form valid /etc/shadow entries, by copying the user:pw pairs
+# from /etc/passwd, and adding on pw change data
+	$(if $(CONFIG_BUSYBOX_CONFIG_FEATURE_SHADOWPASSWDS), \
+		cut -d ':' -f 1-2 $(1)/etc/passwd > $(1)/etc/shadow; \
+		$(SED) 's/$$$$/:13848:0:99999:7:::/' $(1)/etc/shadow \
+	)
+	$(SED) 's,$$$$R,$(REVISION),g' $(1)/etc/banner
+	mkdir -p $(1)/CONTROL
+	mkdir -p $(1)/dev
+	mkdir -p $(1)/etc/crontabs
+	mkdir -p $(1)/jffs
+	mkdir -p $(1)/lib/firmware
+	mkdir -p $(1)/mnt
+	mkdir -p $(1)/proc
+	mkdir -p $(1)/tmp
+	mkdir -p $(1)/usr/lib
+	mkdir -p $(1)/usr/bin
+	mkdir -p $(1)/sys
+	mkdir -p $(1)/www
+	mkdir -p $(1)/root
+	ln -sf /proc/mounts $(1)/etc/mtab
+	rm -f $(1)/var
+	ln -sf /tmp $(1)/var
+	mkdir -p $(1)/etc
+	ln -sf /tmp/resolv.conf /tmp/fstab /tmp/TZ $(1)/etc/
+	$(call Package/base-files/install-target,$(1))
+	for conffile in $(1)/etc/config/*; do \
+		if [ -f "$$$$conffile" ]; then \
+			grep "$$$$conffile" $(1)/CONTROL/conffiles || \
+				echo "$$$${conffile##$(1)}" >> $(1)/CONTROL/conffiles; \
+		fi \
+	done
+endef
+
+define Package/libgcc/install
+	$(INSTALL_DIR) $(1)/lib
+	$(CP) $(TOOLCHAIN_DIR)/lib$(LIB_SUFFIX)/libgcc_s.so.* $(1)/lib/
+endef
+
+define Package/libssp/install
+	$(INSTALL_DIR) $(1)/lib
+	$(CP) $(TOOLCHAIN_DIR)/lib$(LIB_SUFFIX)/libssp.so.* $(1)/lib/
+endef
+
+define Package/libstdcpp/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(TOOLCHAIN_DIR)/usr/lib$(LIB_SUFFIX)/libstdc++.so.* $(1)/usr/lib/
+endef
+
+use_libutil=$(if $(CONFIG_USE_GLIBC)$(CONFIG_EGLIBC_OPTION_EGLIBC_UTMP),libutil)
+use_libnsl=$(if $(CONFIG_USE_GLIBC)$(CONFIG_EGLIBC_OPTION_EGLIBC_NIS),libnsl)
+use_nsswitch=$(if $(CONFIG_USE_GLIBC)$(CONFIG_EGLIBC_OPTION_EGLIBC_NSSWITCH),libnss_dns libnss_files)
+
+define Package/glibc/install
+	$(INSTALL_DIR) $(1)/lib
+	$(CP) $(TOOLCHAIN_DIR)/lib/ld*.so.* $(1)/lib/
+	$(CP) $(TOOLCHAIN_DIR)/lib/ld-$(LIBC_VERSION).so $(1)/lib/
+	for file in libanl libc libcidn libcrypt libdl libm $(use_libnsl) $(use_nsswitch) libresolv $(use_libutil); do \
+		$(CP) $(TOOLCHAIN_DIR)/lib/$$$$file.so.* $(1)/lib/; \
+		$(CP) $(TOOLCHAIN_DIR)/lib/$$$$file-$(LIBC_VERSION).so $(1)/lib/; \
+	done
+endef
+
+define Package/eglibc/install
+$(call Package/glibc/install,$1)
+endef
+
+define Package/uClibc/install
+	$(INSTALL_DIR) $(1)/lib
+	for file in ld$(LIB_SUFFIX)-uClibc libc libcrypt libdl libm libnsl libresolv libuClibc libutil; do \
+		$(CP) $(TOOLCHAIN_DIR)/lib/$$$$file.so.* $(1)/lib/; \
+		$(CP) $(TOOLCHAIN_DIR)/lib/$$$$file-$(LIBC_VERSION).so $(1)/lib/; \
+	done
+endef
+
+define Package/libc/install
+$(call Package/$(LIBC)/install,$1)
+endef
+
+define Package/libpthread/install
+	$(INSTALL_DIR) $(1)/lib
+	$(CP) $(TOOLCHAIN_DIR)/lib/libpthread.so.* $(1)/lib/
+	$(CP) $(TOOLCHAIN_DIR)/lib/libpthread-$(LIBC_VERSION).so $(1)/lib/
+endef
+
+define Package/librt/install
+	$(INSTALL_DIR) $(1)/lib
+	$(CP) $(TOOLCHAIN_DIR)/lib/librt.so.* $(1)/lib/
+	$(CP) $(TOOLCHAIN_DIR)/lib/librt-$(LIBC_VERSION).so $(1)/lib/
+endef
+
+define Package/ldd/install
+	$(INSTALL_DIR) $(1)/usr/bin/
+	$(CP) $(TOOLCHAIN_DIR)/usr/bin/ldd $(1)/usr/bin/
+endef
+
+define Package/ldconfig/install
+	$(INSTALL_DIR) $(1)/sbin/
+	$(CP) $(TOOLCHAIN_DIR)/sbin/ldconfig $(1)/sbin/
+endef
+
+ifneq ($(DUMP),1)
+  -include $(PLATFORM_DIR)/base-files.mk
+endif
+
+$(eval $(call BuildPackage,base-files$(TARGET)))
+$(eval $(call BuildPackage,libc))
+$(eval $(call BuildPackage,libgcc))
+$(eval $(call BuildPackage,libssp))
+$(eval $(call BuildPackage,libstdcpp))
+$(eval $(call BuildPackage,libpthread))
+$(eval $(call BuildPackage,librt))
+$(eval $(call BuildPackage,ldd))
+$(eval $(call BuildPackage,ldconfig))
diff -Naur a/package/base-files/Makefile.rej b/package/base-files/Makefile.rej
--- a/package/base-files/Makefile.rej	1970-01-01 00:00:00.000000000 +0000
+++ b/package/base-files/Makefile.rej	2009-02-01 09:29:53.329466720 +0000
@@ -0,0 +1,52 @@
+***************
+*** 53,59 ****
+  /etc/passwd
+  /etc/profile
+  /etc/shells
+- /etc/ipkg.conf
+  /etc/sysctl.conf
+  $(call $(TARGET)/conffiles)
+  endef
+--- 53,58 ----
+  /etc/passwd
+  /etc/profile
+  /etc/shells
+  /etc/sysctl.conf
+  $(call $(TARGET)/conffiles)
+  endef
+***************
+*** 146,164 ****
+  			$(CP) $(PLATFORM_SUBDIR)/base-files-$(PROFILE)/* $(1)/; \
+  		fi \
+  	)
+- 	$(SED) 's,$$$$R,$(REVISION),g' $(1)/etc/banner
+- 	$(SED) 's,$$$$S,$(BOARD),g' -e 's,$$$$A,$(ARCH),g' $(1)/etc/ipkg.conf
+  	mkdir -p $(1)/dev
+  	mkdir -p $(1)/etc/crontabs
+- 	mkdir -p $(1)/jffs
+- 	mkdir -p $(1)/lib/firmware
+  	mkdir -p $(1)/mnt
+  	mkdir -p $(1)/proc
+  	mkdir -p $(1)/tmp
+  	mkdir -p $(1)/usr/lib
+  	mkdir -p $(1)/usr/bin
+  	mkdir -p $(1)/sys
+- 	mkdir -p $(1)/www
+  	mkdir -p $(1)/root
+  	ln -sf /proc/mounts $(1)/etc/mtab
+  	rm -f $(1)/var
+--- 145,158 ----
+  			$(CP) $(PLATFORM_SUBDIR)/base-files-$(PROFILE)/* $(1)/; \
+  		fi \
+  	)
+  	mkdir -p $(1)/dev
+  	mkdir -p $(1)/etc/crontabs
+  	mkdir -p $(1)/mnt
+  	mkdir -p $(1)/proc
+  	mkdir -p $(1)/tmp
+  	mkdir -p $(1)/usr/lib
+  	mkdir -p $(1)/usr/bin
+  	mkdir -p $(1)/sys
+  	mkdir -p $(1)/root
+  	ln -sf /proc/mounts $(1)/etc/mtab
+  	rm -f $(1)/var
diff -Naur a/package/base-files/files/bin/entropy-update.sh b/package/base-files/files/bin/entropy-update.sh
--- a/package/base-files/files/bin/entropy-update.sh	1970-01-01 00:00:00.000000000 +0000
+++ b/package/base-files/files/bin/entropy-update.sh	2009-02-01 09:29:53.330466568 +0000
@@ -0,0 +1,7 @@
+#!/bin/sh
+rndfile="$1"
