diff options
Diffstat (limited to 'package')
114 files changed, 708 insertions, 545 deletions
diff --git a/package/Config.in b/package/Config.in index 8799b3588..898f916d7 100644 --- a/package/Config.in +++ b/package/Config.in @@ -237,6 +237,7 @@ menu "Firewall / Routing / Bridging" source "package/arpd/Config.in" source "package/bridge-utils/Config.in" source "package/cutter/Config.in" +source "package/ebtables/Config.in" source "package/ether-wake/Config.in" source "package/iproute2/Config.in" source "package/ipset/Config.in" diff --git a/package/Makefile b/package/Makefile index 27f9f1fe5..070ecf0ee 100644 --- a/package/Makefile +++ b/package/Makefile @@ -83,6 +83,7 @@ package-$(ADK_PACKAGE_DSNIFF) += dsniff package-$(ADK_PACKAGE_E2FSPROGS) += e2fsprogs package-$(ADK_PACKAGE_LIBUUID) += e2fsprogs package-$(ADK_PACKAGE_LIBBLKID) += e2fsprogs +package-$(ADK_PACKAGE_EBTABLES) += ebtables package-$(ADK_PACKAGE_ELINKS) += elinks package-$(ADK_PACKAGE_ESOUND) += esound package-$(ADK_PACKAGE_ETHER_WAKE) += ether-wake diff --git a/package/axtls/files/axhttpd.init b/package/axtls/files/axhttpd.init index bc11e0b4c..61572bf0f 100644 --- a/package/axtls/files/axhttpd.init +++ b/package/axtls/files/axhttpd.init @@ -17,7 +17,7 @@ start) /usr/sbin/axhttpd >>/var/log/axhttpd.access ;; stop) - killall axhttpd + pkill axhttpd ;; restart) sh $0 stop diff --git a/package/base-files/extra/etc/profile b/package/base-files/extra/etc/profile index 798548a46..1b8f4a6a6 100644 --- a/package/base-files/extra/etc/profile +++ b/package/base-files/extra/etc/profile @@ -1,12 +1,12 @@ export PATH=/bin:/sbin:/usr/bin:/usr/sbin +export TERM=vt220 if [[ $(id -u) = 0 ]]; then export PS1='# ' else export PS1='$ ' + export HOME=/tmp fi -export HOME=/tmp cat /etc/banner 2>&- -[ -x /usr/bin/less ] || alias less=more -[ -x /usr/bin/vim ] || alias vim=vi +[ -x /usr/bin/vim ] && alias vi=vim || alias vim=vi [ -x /usr/bin/arp ] || arp() { cat /proc/net/arp; } [ -x /usr/bin/ldd ] || ldd() { LD_TRACE_LOADED_OBJECTS=1 "$@"; } diff --git a/package/base-files/extra/init b/package/base-files/extra/init index 9013065d0..db8c3a676 100755 --- a/package/base-files/extra/init +++ b/package/base-files/extra/init @@ -1,5 +1,5 @@ #!/bin/sh -echo "Pre-boot initializing" +echo "Starting system ..." export PATH=/bin:/sbin:/usr/bin:/usr/sbin mount -nt proc proc /proc mount -o nosuid,nodev,noexec -t sysfs sysfs /sys @@ -19,5 +19,4 @@ mount -o remount,rw / cat /etc/.rnd >/dev/urandom 2>&1 [ -f /etc/fstab ] && mount -a [ -x /sbin/cfgfs ] && { cfgfs setup; mount -o remount,ro /;} -echo "Starting system" exec /sbin/init diff --git a/package/base-files/extra/sbin/update b/package/base-files/extra/sbin/update index a812bb23d..10d6e58c2 100755 --- a/package/base-files/extra/sbin/update +++ b/package/base-files/extra/sbin/update @@ -7,9 +7,8 @@ if [ $who -ne 0 ]; then fi cd / - +umount -f /etc mount -o remount,rw / -umount /etc check_exit() { if [ $? -ne 0 ];then @@ -19,17 +18,17 @@ check_exit() { } extract_from_file() { - tar -xzvf $1 + cat $1 | gunzip -c | tar -xf - check_exit } extract_from_ssh() { - ssh $1 "cat $2" | tar -xzvf - + ssh $1 "cat $2" | gunzip -c | tar -xf - check_exit } extract_from_http() { - wget -O - $1 | tar -xzvf - + wget -O - $1 | gunzip -c | tar -xf - check_exit } @@ -60,7 +59,6 @@ case $1 in esac sync -mount --bind /etc /tmp/.cfgfs/root +mount -o bind /etc /tmp/.cfgfs/root -echo "Check with cfgfs status if you need to merge and save any changes in /etc." -echo "You should reboot now." +echo "Update sucessful. You should reboot now." diff --git a/package/bind/files/named.init b/package/bind/files/named.init index ce0c0abfa..b2052c1d3 100644 --- a/package/bind/files/named.init +++ b/package/bind/files/named.init @@ -15,7 +15,7 @@ autostop) ;; fi ;; stop) - killall named + pkill named ;; restart) sh $0 stop diff --git a/package/bitlbee/files/bitlbee.init b/package/bitlbee/files/bitlbee.init index 1ff40c754..491b741c7 100644 --- a/package/bitlbee/files/bitlbee.init +++ b/package/bitlbee/files/bitlbee.init @@ -14,7 +14,7 @@ start) bitlbee -D ;; stop) - killall bitlbee + pkill bitlbee ;; restart) sh $0 stop diff --git a/package/bluez/files/bluez.init b/package/bluez/files/bluez.init index 6a61d38cd..477013d9f 100644 --- a/package/bluez/files/bluez.init +++ b/package/bluez/files/bluez.init @@ -13,7 +13,7 @@ start) bluetoothd ;; stop) - killall bluetoothd + pkill bluetoothd ;; restart) sh $0 stop diff --git a/package/busybox/config/Config.in b/package/busybox/config/Config.in index 6da769cc0..427a45b4a 100644 --- a/package/busybox/config/Config.in +++ b/package/busybox/config/Config.in @@ -65,7 +65,7 @@ config BUSYBOX_SHOW_USAGE config BUSYBOX_FEATURE_VERBOSE_USAGE bool "Show verbose applet usage messages" - default n + default y select BUSYBOX_SHOW_USAGE help All BusyBox applets will show more verbose help messages when @@ -155,7 +155,7 @@ config BUSYBOX_FEATURE_CLEAN_UP config BUSYBOX_FEATURE_PIDFILE bool "Support writing pidfiles" - default n + default y help This option makes some applets |