diff options
120 files changed, 999 insertions, 557 deletions
@@ -1,5 +1,4 @@ -- fix init scripts pidof? vs. killall -- rpm package backend +- make rpm package backend working - freebsd build - win cygwin build - netbsd build @@ -9,4 +8,3 @@ - network scripts for pppoe - customise mconf help texts to better fit for OpenADK - publish via trac - diff --git a/mk/modules.mk b/mk/modules.mk index bdb8fa897..19ab1b14d 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -269,6 +269,45 @@ $(eval $(call KMOD_template,INET_XFRM_MODE_BEET,net-ipsec-beet,\ ## Filtering / Firewalling ## # +# Ethernet Bridging firewall +# +$(eval $(call KMOD_template,BRIDGE_NF_EBTABLES,nf-ebtables,\ + $(MODULES_DIR)/kernel/net/bridge/netfilter/ebtables \ +,55)) + +$(eval $(call KMOD_template,BRIDGE_EBT_BROUTE,nf-ebtables-broute,\ + $(MODULES_DIR)/kernel/net/bridge/netfilter/ebtable_broute \ +,60)) + +$(eval $(call KMOD_template,BRIDGE_EBT_T_FILTER,nf-ebtables-filter,\ + $(MODULES_DIR)/kernel/net/bridge/netfilter/ebtable_filter \ +,60)) + +$(eval $(call KMOD_template,BRIDGE_EBT_T_NAT,nf-ebtables-nat,\ + $(MODULES_DIR)/kernel/net/bridge/netfilter/ebtable_nat \ +,60)) + +$(eval $(call KMOD_template,BRIDGE_EBT_802_3,nf-ebtables-802-3,\ + $(MODULES_DIR)/kernel/net/bridge/netfilter/ebt_802_3 \ +,65)) + +$(eval $(call KMOD_template,BRIDGE_EBT_AMONG,nf-ebtables-among,\ + $(MODULES_DIR)/kernel/net/bridge/netfilter/ebt_among \ +,65)) + +$(eval $(call KMOD_template,BRIDGE_EBT_ARP,nf-ebtables-arp,\ + $(MODULES_DIR)/kernel/net/bridge/netfilter/ebt_arpreply \ +,65)) + +$(eval $(call KMOD_template,BRIDGE_EBT_IP,nf-ebtables-ip,\ + $(MODULES_DIR)/kernel/net/bridge/netfilter/ebt_ip \ +,65)) + +$(eval $(call KMOD_template,BRIDGE_EBT_REDIRECT,nf-ebtables-redirect,\ + $(MODULES_DIR)/kernel/net/bridge/netfilter/ebt_redirect \ +,65)) + +# # Netfilter Core # $(eval $(call KMOD_template,NETFILTER_XT_TARGET_CLASSIFY,nf-classify,\ 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</ |