mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2025-04-21 12:27:27 +03:00
Merge branch 'master' into xburst
This commit is contained in:
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
|
||||
include $(INCLUDE_DIR)/kernel.mk
|
||||
|
||||
PKG_NAME:=base-files
|
||||
PKG_RELEASE:=33
|
||||
PKG_RELEASE:=34
|
||||
|
||||
PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
|
||||
|
||||
@@ -156,7 +156,9 @@ define Package/libc/Default
|
||||
SECTION:=libs
|
||||
CATEGORY:=Base system
|
||||
VERSION:=$(LIBC_VERSION)-$(PKG_RELEASE)
|
||||
ifneq ($(TARGET_avr32)$(TARGET_coldfire),)
|
||||
DEPENDS:=+libgcc
|
||||
endif
|
||||
URL:=$(LIBC_URL)
|
||||
endef
|
||||
|
||||
|
||||
@@ -59,6 +59,7 @@ start() {
|
||||
touch /var/log/lastlog
|
||||
touch /tmp/resolv.conf.auto
|
||||
ln -sf /tmp/resolv.conf.auto /tmp/resolv.conf
|
||||
grep -q debugfs /proc/filesystems && mount -t debugfs debugfs /sys/kernel/debug
|
||||
[ "$FAILSAFE" = "true" ] && touch /tmp/.failsafe
|
||||
|
||||
killall -q hotplug2
|
||||
|
||||
@@ -51,7 +51,8 @@ EOF
|
||||
|
||||
add_uci_conffiles() {
|
||||
local file="$1"
|
||||
find /etc/config /etc/passwd /etc/group /etc/dropbear /etc/firewall.user /etc/rc.local > "$file"
|
||||
find /etc/config /etc/passwd /etc/group /etc/dropbear \
|
||||
/etc/firewall.user /etc/rc.local -type f > "$file"
|
||||
return 0
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user