diff options
Diffstat (limited to 'package/base-files')
| -rw-r--r-- | package/base-files/Makefile | 8 | ||||
| -rw-r--r-- | package/base-files/files/base-files.conffiles | 1 | ||||
| -rwxr-xr-x | package/base-files/files/init.d/rcS | 1 | ||||
| -rw-r--r-- | package/base-files/files/profile | 1 | ||||
| -rwxr-xr-x | package/base-files/src/etc/network/if-pre-up.d/04-wireless | 6 |
5 files changed, 10 insertions, 7 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile index c3f77fe7c..9b3191ae7 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 @@ -220,9 +220,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/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/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 ] && { |