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 | 4 | ||||
-rw-r--r-- | package/base-files/src/etc/profile | 4 | ||||
-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 | ||||
-rwxr-xr-x | package/base-files/src/usr/share/udhcpc/default.script | 2 |
7 files changed, 12 insertions, 9 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 1ccc4d823..78442d8ae 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 @@ -1,5 +1,4 @@ #!/bin/sh -#set -x set -e [ "${IFACE%%[0-9]*}" = "wlan" ] || exit 0 @@ -7,6 +6,7 @@ set -e [ "$IF_WIRELESS_SSID" ] || exit 1 [ "$IF_WIRELESS_CHANNEL" ] || exit 1 [ "$IF_WIRELESS_HWMODE" ] || IF_WIRELESS_HWMODE=g +[ "$IF_WIRELESS_EXTENSION" ] || IF_WIRELESS_EXTENSION=0 wpa=0 wpa1=0 @@ -46,7 +46,7 @@ case "$IF_WIRELESS_MODE" in echo "channel=$IF_WIRELESS_CHANNEL" >> /tmp/hostapd.conf echo "hw_mode=$IF_WIRELESS_HWMODE" >> /tmp/hostapd.conf echo "auth_algs=$sec" >> /tmp/hostapd.conf - [ $wpa -eq 0 ] && { + [ $wpa -eq 0 ] && [ $wpa1 -eq 0 ] && [ $wpa2 -eq 0 ] && { logger -t hostap "using no security mechanism" echo "wpa=0" >> /tmp/hostapd.conf } diff --git a/package/base-files/src/etc/profile b/package/base-files/src/etc/profile index b849feb49..78cf2fe37 100644 --- a/package/base-files/src/etc/profile +++ b/package/base-files/src/etc/profile @@ -1,9 +1,9 @@ export PATH=/bin:/sbin:/usr/bin:/usr/sbin export TERM=vt220 if [[ $(id -u) = 0 ]]; then - export PS1='# ' + export PS1='`whoami`@`hostname`:`pwd` # ' else - export PS1='$ ' + export PS1='`whoami`@`hostname`:`pwd` $ ' 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 diff --git a/package/base-files/src/usr/share/udhcpc/default.script b/package/base-files/src/usr/share/udhcpc/default.script index 02e4a7a3c..68c603496 100755 --- a/package/base-files/src/usr/share/udhcpc/default.script +++ b/package/base-files/src/usr/share/udhcpc/default.script @@ -4,7 +4,7 @@ if [[ -z $1 ]]; then exit 1 fi -RESOLV_CONF=/tmp/resolv.conf +RESOLV_CONF=/etc/resolv.conf case $1 in (deconfig) |