mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2025-04-21 12:27:27 +03:00
Merge commit 'nbd/master' into xburst
This commit is contained in:
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
|
||||
include $(INCLUDE_DIR)/kernel.mk
|
||||
|
||||
PKG_NAME:=base-files
|
||||
PKG_RELEASE:=38
|
||||
PKG_RELEASE:=39
|
||||
|
||||
PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
|
||||
DEVICENAME ~~ (null|full|ptmx|tty|zero|gpio) {
|
||||
DEVICENAME ~~ (null|full|ptmx|tty|zero|gpio|hvc) {
|
||||
nothrottle
|
||||
makedev /dev/%DEVICENAME% 0666
|
||||
next
|
||||
@@ -34,6 +34,12 @@ DEVPATH is set, SUBSYSTEM ~~ (input) {
|
||||
makedev /dev/input/%DEVICENAME% 0644
|
||||
}
|
||||
|
||||
DEVICENAME == device-mapper {
|
||||
nothrottle
|
||||
makedev /dev/mapper/control 0600
|
||||
}
|
||||
|
||||
|
||||
DEVPATH is set {
|
||||
nothrottle
|
||||
makedev /dev/%DEVICENAME% 0644
|
||||
|
||||
@@ -4,5 +4,5 @@
|
||||
STOP=99
|
||||
stop() {
|
||||
sync
|
||||
umount -a -r -l
|
||||
umount -a -r
|
||||
}
|
||||
|
||||
@@ -327,6 +327,11 @@ setup_interface() {
|
||||
}
|
||||
}
|
||||
|
||||
stop_interface_dhcp() {
|
||||
local config="$1"
|
||||
uci -P /var/state revert "network.$config"
|
||||
}
|
||||
|
||||
unbridge() {
|
||||
local dev="$1"
|
||||
local brdev
|
||||
|
||||
@@ -31,8 +31,7 @@ setup_interface () {
|
||||
config_get old_subnet "$ifc" netmask
|
||||
}
|
||||
|
||||
[ "$1" = "ifup" ] \
|
||||
|| [ "$ip" != "$old_ip" ] \
|
||||
[ "$ip" != "$old_ip" ] \
|
||||
|| [ "${broadcast:-+}" != "$old_broadcast" ] \
|
||||
|| [ "${subnet:-255.255.255.0}" != "$old_subnet" ] && {
|
||||
echo "udhcpc: ifconfig $interface $ip netmask ${subnet:-255.255.255.0} broadcast ${broadcast:-+}"
|
||||
|
||||
Reference in New Issue
Block a user