From: Jo-Philipp Wich <jow@openwrt.org>
Date: Mon, 21 Sep 2009 02:34:40 +0000 (+0000)
Subject: [8.09] merge r17571 and r17572
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;h=dc2e347fdd09d483d8eb36da6ce9701008c184c4

[8.09] merge r17571 and r17572


SVN-Revision: 17654
---

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index f46fe74509..aea4ea7242 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=base-files
-PKG_RELEASE:=14.7
+PKG_RELEASE:=14.8
 
 PKG_FILE_DEPEND:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
 
diff --git a/package/base-files/files/etc/init.d/done b/package/base-files/files/etc/init.d/done
index 0640b61938..8278669120 100755
--- a/package/base-files/files/etc/init.d/done
+++ b/package/base-files/files/etc/init.d/done
@@ -9,6 +9,11 @@ boot() {
 		lock -u /tmp/.switch2jffs
 	}
 
+	# process user commands
+	[ -f /etc/rc.local ] && {
+		sh /etc/rc.local
+	}
+
 	# set leds to normal state
 	. /etc/diag.sh
 	set_state done
diff --git a/package/base-files/files/etc/rc.local b/package/base-files/files/etc/rc.local
new file mode 100644
index 0000000000..56394773c3
--- /dev/null
+++ b/package/base-files/files/etc/rc.local
@@ -0,0 +1,4 @@
+# Put your custom commands here that should be executed once
+# the system init finished. By default this file does nothing.
+
+exit 0
diff --git a/package/base-files/files/sbin/sysupgrade b/package/base-files/files/sbin/sysupgrade
index ecc5e9a708..0936d9ec32 100755
--- a/package/base-files/files/sbin/sysupgrade
+++ b/package/base-files/files/sbin/sysupgrade
@@ -54,7 +54,7 @@ EOF
 
 add_uci_conffiles() {
 	local file="$1"
-	find /etc/config /etc/passwd /etc/group /etc/dropbear /etc/firewall.user > "$file"
+	find /etc/config /etc/passwd /etc/group /etc/dropbear /etc/firewall.user /etc/rc.local > "$file"
 	return 0
 }