From aebe2bc2346d0ff75ae75041effa05a45c3a8fa8 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Mon, 21 Sep 2009 02:34:40 +0000 Subject: [PATCH] merge r17571 and r17572 SVN-Revision: 17654 --- package/base-files/Makefile | 2 +- package/base-files/files/etc/init.d/done | 5 +++++ package/base-files/files/etc/rc.local | 4 ++++ package/base-files/files/sbin/sysupgrade | 2 +- 4 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 package/base-files/files/etc/rc.local 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 } -- 2.30.2