qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-24 01:43:08 +02:00
Code

[backfire] merge r23232 and r23233

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@23236 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
jow 2010-10-05 07:45:22 +00:00
parent a9d5337f66
commit b11d4c0dfc
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
package/base-files/Makefile
View File

@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=base-files PKG_NAME:=base-files
PKG_RELEASE:=43.5 PKG_RELEASE:=43.6
PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/ PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
PKG_BUILD_DEPENDS:=opkg/host PKG_BUILD_DEPENDS:=opkg/host
@ -53,6 +53,7 @@ define Package/base-files/conffiles
/etc/profile /etc/profile
/etc/shells /etc/shells
/etc/sysctl.conf /etc/sysctl.conf
/etc/rc.local
$(call $(TARGET)/conffiles) $(call $(TARGET)/conffiles)
endef endef

5
package/base-files/files/sbin/sysupgrade
View File

@ -51,8 +51,9 @@ EOF
add_uci_conffiles() { add_uci_conffiles() {
local file="$1" local file="$1"
find /etc/config /etc/passwd /etc/group /etc/dropbear \ ( find /etc/config /etc/passwd /etc/group /etc/dropbear \
/etc/firewall.user /etc/rc.local -type f > "$file" /etc/firewall.user /etc/rc.local -type f;
opkg list-changed-conffiles ) | sort -u > "$file"
return 0 return 0
} }