9 files changed, 78 insertions, 17 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 95f22f6f0..0c7ce0b24 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -6,7 +6,7 @@ include $(ADK_TOPDIR)/mk/rootfs.mk
 
 PKG_NAME:=		base-files
 PKG_VERSION:=		1.1
-PKG_RELEASE:=		27
+PKG_RELEASE:=		29
 PKG_SECTION:=		base/apps
 PKG_DESCR:=		basic files and scripts
 
@@ -40,7 +40,6 @@ do-install:
 	ln -sf ../run $(IDIR_BASE_FILES)/var/run
 	chmod 600 $(IDIR_BASE_FILES)/etc/shadow
 	chmod 1777 ${IDIR_BASE_FILES}/tmp
-ifeq ($(ADK_RUNTIME_INIT_SYSTEMD),)
 	echo $(ADK_RUNTIME_TMPFS_SIZE) > $(IDIR_BASE_FILES)/etc/tmpfs
 	mkdir -p $(IDIR_BASE_FILES)/etc/init.d
 	cp ./files/init.d/* $(IDIR_BASE_FILES)/etc/init.d
@@ -64,7 +63,6 @@ ifeq (${ADK_TARGET_ROOTFS_NFSROOT},y)
 else
 	(cd $(IDIR_BASE_FILES)/etc; ln -sf ../tmp/resolv.conf .)
 endif
-endif
 ifeq ($(ADK_RUNTIME_DEV_MDEV),y)
 	$(CP) ./files/rcdev.mdev $(IDIR_BASE_FILES)/etc/init.d/rcdev
 	$(SED) "s#@ADK_RUNTIME_DEV_MDEV_LOGGING@#"$(ADK_RUNTIME_DEV_MDEV_LOGGING_LINE)"#g" $(IDIR_BASE_FILES)/etc/init.d/rcdev
@@ -91,9 +89,6 @@ endif
 	$(SED) 's#@SPEED@#$(ADK_RUNTIME_CONSOLE_SERIAL_SPEED)#' $(IDIR_BASE_FILES)/etc/inittab
 	$(SED) 's#@AUTOLOGIN@#$(ADK_RUNTIME_GETTY_SERIAL_AUTOLOGIN_STANZA)#' $(IDIR_BASE_FILES)/etc/inittab
 endif
-ifeq ($(ADK_RUNTIME_INIT_SYSVINIT),y)
-	cp ./files/inittab.sysvinit $(IDIR_BASE_FILES)/etc/inittab
-endif
 ifeq ($(ADK_RUNTIME_MOUNT_DEBUGFS),y)
 	echo debugfs    /sys/kernel/debug      debugfs  defaults  0 0 >> $(IDIR_BASE_FILES)/etc/fstab
 	echo null::sysinit:/bin/mount -a -t debugfs >> $(IDIR_BASE_FILES)/etc/inittab
@@ -132,9 +127,6 @@ ifeq ($(ADK_TARGET_WITH_ROOT_RW),y)
 else
 	echo 'export IPKGTMPDIR=/tmp' >> $(IDIR_BASE_FILES)/etc/profile
 endif
-ifeq ($(ADK_TARGET_BOARD_BCM28XX),y)
-	echo 'export LD_LIBRARY_PATH=/opt/vc/lib' >> $(IDIR_BASE_FILES)/etc/profile
-endif
 endif
 ifeq (${ADK_TARGET_PACKAGE_IPKG},y)
 	$(CP) ./files/ipkg.conf $(IDIR_BASE_FILES)/etc/
@@ -225,9 +217,9 @@ endif
 
 ifeq ($(ADK_RUNTIME_ADDUSER),y)
 	mkdir -p ${IDIR_BASE_FILES}/$(ADK_RUNTIME_USER_HOME)
-	printf "$(ADK_RUNTIME_USER_NAME):x:100:100:$(ADK_RUNTIME_USER_NAME):$(ADK_RUNTIME_USER_HOME):$(ADK_RUNTIME_USER_SHELL)" >> ${IDIR_BASE_FILES}/etc/passwd
-	printf "$(ADK_RUNTIME_USER_NAME):$(ADK_RUNTIME_USER_PASSWORD):16514:0:::::" >> ${IDIR_BASE_FILES}/etc/shadow
-	printf "$(ADK_RUNTIME_USER_NAME):x:100:" >> ${IDIR_BASE_FILES}/etc/group
+	printf "$(ADK_RUNTIME_USER_NAME):x:100:100:$(ADK_RUNTIME_USER_NAME):$(ADK_RUNTIME_USER_HOME):$(ADK_RUNTIME_USER_SHELL)\n" >> ${IDIR_BASE_FILES}/etc/passwd
+	printf "$(ADK_RUNTIME_USER_NAME):$(ADK_RUNTIME_USER_PASSWORD):16514:0:::::\n" >> ${IDIR_BASE_FILES}/etc/shadow
+	printf "$(ADK_RUNTIME_USER_NAME):x:100:\n" >> ${IDIR_BASE_FILES}/etc/group
 endif
 
 include ${ADK_TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/base-files/files/base-files.conffiles b/package/base-files/files/base-files.conffiles
index 2ee449379..4845c1855 100644
--- a/package/base-files/files/base-files.conffiles
+++ b/package/base-files/files/base-files.conffiles
@@ -1,4 +1,3 @@
-/etc/mdev.conf
 /etc/inittab
 /etc/banner
 /etc/group
diff --git a/package/base-files/files/init.d/rcS b/package/base-files/files/init.d/rcS
index db03a76e5..9015a71ac 100755
--- a/package/base-files/files/init.d/rcS
+++ b/package/base-files/files/init.d/rcS
@@ -17,6 +17,7 @@ fi
 mkdir -p /var/log
 mkdir -p /var/run
 mkdir -p /var/tmp
+mkdir -p /var/lock
 touch /var/log/lastlog
 touch /var/log/wtmp
 
diff --git a/package/base-files/files/interfaces-dhcp b/package/base-files/files/interfaces-dhcp
index 11174c152..652101214 100644
--- a/package/base-files/files/interfaces-dhcp
+++ b/package/base-files/files/interfaces-dhcp
@@ -22,6 +22,15 @@ iface eth0 inet dhcp
 #  bridge-ports eth0 eth1
 ##
 
+## LACP configuration
+#auto lacp0
+#iface lacp0 inet dhcp
+#  bond-ports eth0 eth1
+#  bond-mode 802.3ad
+#  bond-miimon 100
+#  bond-lacp-rate slow
+#  bond-xmit-hash-policy layer2+3
+
 ## pppoe configuration
 #auto ppp0
 #iface ppp0 inet ppp
@@ -55,4 +64,4 @@ iface eth0 inet dhcp
 #  wireless-passphrase xxxxxxxx
 ##
 
-# for more special cases see: http://www.openadk.org/doku.php?id=network
+# for more special cases see: https://docs.openadk.org/html/manual.html#network-configuration
diff --git a/package/base-files/files/profile b/package/base-files/files/profile
index c89b12c92..22bf8655d 100644
--- a/package/base-files/files/profile
+++ b/package/base-files/files/profile
@@ -1,6 +1,7 @@
 export PATH=/bin:/sbin:/usr/bin:/usr/sbin
 export TERM=linux
 export EDITOR=/bin/vi
+export M4=/usr/bin/m4
 if [[ $(id -u) = 0 ]]; then
 	export PS1='`whoami`@`hostname`:`pwd` # '
 else
diff --git a/package/base-files/files/rcdev.mdev b/package/base-files/files/rcdev.mdev
index b8afd453c..93d678932 100644
--- a/package/base-files/files/rcdev.mdev
+++ b/package/base-files/files/rcdev.mdev
@@ -1,5 +1,5 @@
 # remount /dev with smaller size
-mount -o remount,nosuid,size=128k,mode=0755 -t tmpfs mdev /dev
+#mount -o remount,nosuid,size=128k,mode=0755 -t tmpfs mdev /dev
 # start mdev dynamic device node management
 echo >/dev/mdev.seq
 @ADK_RUNTIME_DEV_MDEV_LOGGING@
diff --git a/package/base-files/src/etc/network/if-post-down.d/04-bonding b/package/base-files/src/etc/network/if-post-down.d/04-bonding
new file mode 100755
index 000000000..0b9c9f362
--- /dev/null
+++ b/package/base-files/src/etc/network/if-post-down.d/04-bonding
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+case "$IF_BOND_PORTS" in
+"")
+	exit 0
+	;;
+none)
+	INTERFACES=""
+	;;
+*)
+	INTERFACES="$IF_BOND_PORTS"
+	;;
+esac
+
+for IF in $INTERFACES; do
+	ip link set $IF nomaster
+	ip link set $IF down
+done
+ip link del $IFACE
+exit 0
diff --git a/package/base-files/src/etc/network/if-pre-up.d/04-wireless b/package/base-files/src/etc/network/if-pre-up.d/04-wireless
index fa68058bf..ef070c5bc 100755
--- a/package/base-files/src/etc/network/if-pre-up.d/04-wireless
+++ b/package/base-files/src/etc/network/if-pre-up.d/04-wireless
@@ -81,6 +81,8 @@ case "$IF_WIRELESS_MODE" in
 			cat /etc/hostapd.conf.post >> /tmp/hostapd.conf
 		;;
 	sta)
+		# need to wait for wlan drivers to settle down
+		sleep 1
 		ip link set up dev ${IFACE}
 		[ $IF_WIRELESS_EXTENSION -eq 1 ] && {
 			[ -x /usr/sbin/iwconfig ] || {
@@ -96,9 +98,9 @@ case "$IF_WIRELESS_MODE" in
 			}
 			driver=nl80211
 			[ $sec -eq 2 ] && {
-				iw dev ${IFACE} connect $IF_WIRELESS_SSID key d:0:$IF_WIRELESS_PASSPHRASE
+				iw dev ${IFACE} connect "$IF_WIRELESS_SSID" key d:0:$IF_WIRELESS_PASSPHRASE
 			} || {
-				iw dev ${IFACE} connect $IF_WIRELESS_SSID
+				iw dev ${IFACE} connect "$IF_WIRELESS_SSID" 2>/dev/null
 			}
 		}
 		[ $wpa2 -eq 1 ] && {
diff --git a/package/base-files/src/etc/network/if-pre-up.d/05-bonding b/package/base-files/src/etc/network/if-pre-up.d/05-bonding
new file mode 100755
index 000000000..489a2fcad
--- /dev/null
+++ b/package/base-files/src/etc/network/if-pre-up.d/05-bonding
@@ -0,0 +1,37 @@
+#!/bin/sh
+
+INTERFACES=""
+BONDOPTS=""
+for var in $(env | grep '^IF_BOND_'); do
+	val="${var#*=}"
+	opt="${var%%=*}"
+	if [ "$opt" == "IF_BOND_PORTS" ]; then
+		case "$val" in
+		none)
+			INTERFACES=""
+			;;
+		*)
+			INTERFACES="$val"
+			;;
+		esac
+		continue
+	fi
+	opt="$(tr '[A-Z]' '[a-z]' <<< ${opt#IF_BOND_})"
+	BONDOPTS+=" $opt"
+	[ -n "$val" ] && BONDOPTS+=" $val"
+done
+
+[ -n "$INTERFACES" ] || exit 0
+
+ip link add $IFACE type bond ${BONDOPTS} || exit 1
+for IF in $INTERFACES; do
+	if ! grep -q $IF /proc/net/dev; then
+		echo "Error: interface '$IF' does not exist!"
+		ip link del $IFACE
+		exit 1
+	fi
+	ip link set $IF master $IFACE
+	ip link set $IF up
+done
+
+exit 0