diff options
Diffstat (limited to 'package/base-files/src')
| -rw-r--r-- | package/base-files/src/etc/ipkg.conf | 2 | ||||
| -rwxr-xr-x | package/base-files/src/etc/network/if-pre-up.d/04-wireless | 24 | ||||
| -rw-r--r-- | package/base-files/src/etc/profile | 1 | ||||
| -rw-r--r-- | package/base-files/src/etc/shadow | 3 | ||||
| -rwxr-xr-x | package/base-files/src/init | 3 | ||||
| -rwxr-xr-x | package/base-files/src/sbin/adkupdate | 3 |
6 files changed, 24 insertions, 12 deletions
diff --git a/package/base-files/src/etc/ipkg.conf b/package/base-files/src/etc/ipkg.conf index 6c9242620..edb050116 100644 --- a/package/base-files/src/etc/ipkg.conf +++ b/package/base-files/src/etc/ipkg.conf @@ -1,3 +1,3 @@ -src openadk http://www.openadk.org/packages/@TARGET@ +src @VENDOR@ http://@HOST@/@TARGET@_@LIBC@/packages dest root / dest ram /tmp 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 1898de4d4..1ccc4d823 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 @@ -74,13 +74,23 @@ case "$IF_WIRELESS_MODE" in } ;; sta) - [ -x /usr/sbin/iw ] || { - logger -t wireless "No iw utility found" - exit 1 - } ip link set up dev ${IFACE} - iw dev ${IFACE} set channel $IF_WIRELESS_CHANNEL - iw dev ${IFACE} connect $IF_WIRELESS_SSID + [ $IF_WIRELESS_EXTENSION -eq 1 ] && { + [ -x /usr/sbin/iwconfig ] || { + logger -t wireless "No wireless-tools found" + exit 1 + } + driver=wext + iwconfig ${IFACE} essid $IF_WIRELESS_SSID + } || { + [ -x /usr/sbin/iw ] || { + logger -t wireless "No iw utility found" + exit 1 + } + driver=nl80211 + iw dev ${IFACE} set channel $IF_WIRELESS_CHANNEL + iw dev ${IFACE} connect $IF_WIRELESS_SSID + } [ $wpa2 -eq 1 ] && { [ -x /usr/sbin/wpa_supplicant ] || { logger -t wireless "No wpa_supplicant found" @@ -93,7 +103,7 @@ case "$IF_WIRELESS_MODE" in echo " psk=\"$IF_WIRELESS_PASSPHRASE\"" >> /tmp/wpa_supplicant.conf echo " priority=5" >> /tmp/wpa_supplicant.conf echo "}" >> /tmp/wpa_supplicant.conf - wpa_supplicant -B -Dnl80211 -i${IFACE} -c/tmp/wpa_supplicant.conf + wpa_supplicant -B -D${driver} -i${IFACE} -c/tmp/wpa_supplicant.conf } ;; *) diff --git a/package/base-files/src/etc/profile b/package/base-files/src/etc/profile index 1b8f4a6a6..b849feb49 100644 --- a/package/base-files/src/etc/profile +++ b/package/base-files/src/etc/profile @@ -4,7 +4,6 @@ if [[ $(id -u) = 0 ]]; then export PS1='# ' else export PS1='$ ' - export HOME=/tmp fi cat /etc/banner 2>&- [ -x /usr/bin/vim ] && alias vi=vim || alias vim=vi diff --git a/package/base-files/src/etc/shadow b/package/base-files/src/etc/shadow index 3683d71ea..374e358bb 100644 --- a/package/base-files/src/etc/shadow +++ b/package/base-files/src/etc/shadow @@ -1,3 +1,2 @@ -root:$1$8sJkb6fV$46vEIu5ntmbUuljmr55zY/:14191:0::::: -admin:$1$8sJkb6fV$46vEIu5ntmbUuljmr55zY/:14191:0::::: +root:*NP*:14191:0::::: nobody:*:9797:0::::: diff --git a/package/base-files/src/init b/package/base-files/src/init index 618547693..173e91b0b 100755 --- a/package/base-files/src/init +++ b/package/base-files/src/init @@ -4,7 +4,8 @@ export PATH=/bin:/sbin:/usr/bin:/usr/sbin mount -nt proc proc /proc mount -o nosuid,nodev,noexec -t sysfs sysfs /sys [ ! -f /etc/notmpfs ] && { - size=$(awk '/MemTotal:/ { if ($2 > 16000) { print 4096 } else { print 2048 }}' /proc/meminfo) + size=2048 + size=$(cat /etc/tmpfs 2>/dev/null) mount none /tmp -t tmpfs -o size=${size}k mount none /tmp -t tmpfs -o remount,nosuid,nodev,mode=1777 } diff --git a/package/base-files/src/sbin/adkupdate b/package/base-files/src/sbin/adkupdate index dd8d3ecec..3de759c74 100755 --- a/package/base-files/src/sbin/adkupdate +++ b/package/base-files/src/sbin/adkupdate @@ -29,9 +29,12 @@ check_exit() { prepare() { cd / if [ -x /sbin/cfgfs ];then + pkill crond umount -f /etc + check_exit fi mount -o remount,rw / + check_exit if [ "$system" == "RB532" ];then mount -t yaffs2 /dev/mtdblock0 /boot elif [ "$system" == "AR7130" ];then |