Merge branch 'master' of ssh://ka.blankertz.org/home/matthias/git/panda_linux

This commit is contained in:
2014-05-09 14:37:12 +02:00
3 changed files with 32 additions and 6 deletions

View File

@@ -1,6 +1,6 @@
BR2_x86_athlon_4=y BR2_x86_athlon_4=y
BR2_KERNEL_HEADERS_VERSION=y BR2_KERNEL_HEADERS_VERSION=y
BR2_DEFAULT_KERNEL_VERSION="3.12.18" BR2_DEFAULT_KERNEL_VERSION="3.12.19"
BR2_UCLIBC_CONFIG="$(TOPDIR)/../uClibc-0.9.33.panda.config" BR2_UCLIBC_CONFIG="$(TOPDIR)/../uClibc-0.9.33.panda.config"
BR2_TOOLCHAIN_BUILDROOT_LARGEFILE=y BR2_TOOLCHAIN_BUILDROOT_LARGEFILE=y
BR2_TOOLCHAIN_BUILDROOT_INET_IPV6=y BR2_TOOLCHAIN_BUILDROOT_INET_IPV6=y
@@ -17,7 +17,7 @@ BR2_ROOTFS_OVERLAY="$(TOPDIR)/../overlay"
BR2_ROOTFS_CUSTOM_FAKEROOT="$(TOPDIR)/../fakeroot.fs" BR2_ROOTFS_CUSTOM_FAKEROOT="$(TOPDIR)/../fakeroot.fs"
BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.12.18" BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.12.19"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(TOPDIR)/../linux-3.12.x.config" BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(TOPDIR)/../linux-3.12.x.config"
BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_INSTALL_TARGET=y

View File

@@ -107,8 +107,8 @@ iptables -A INPUT -i tun+ -j ACCEPT
iptables -A FORWARD -i tun+ -j ACCEPT iptables -A FORWARD -i tun+ -j ACCEPT
# Catchall # Catchall
iptables -A INPUT -j LOG --log-prefix "CATCHALL " iptables -A INPUT -j LOG --log-level debug --log-prefix "CATCHALL "
iptables -A FORWARD -j LOG --log-prefix "CATCHALL " iptables -A FORWARD -j LOG --log-level debug --log-prefix "CATCHALL "
# Masquerade local subnet # Masquerade local subnet
iptables -t nat -A POSTROUTING -s $PRIVATE -o $LANIF -j MASQUERADE iptables -t nat -A POSTROUTING -s $PRIVATE -o $LANIF -j MASQUERADE
@@ -197,5 +197,5 @@ ip6tables -A FORWARD -o $LANIF -p ipv6-icmp -m icmp6 --icmpv6-type 134/0 -j NoRo
ip6tables -A NoRouterAdv -j LOG --log-prefix "NORADV6 " ip6tables -A NoRouterAdv -j LOG --log-prefix "NORADV6 "
ip6tables -A NoRouterAdv -j DROP ip6tables -A NoRouterAdv -j DROP
ip6tables -A INPUT -j LOG --log-prefix "CATCHALL6 " ip6tables -A INPUT -j LOG --log-level debug --log-prefix "CATCHALL6 "
ip6tables -A FORWARD -j LOG --log-prefix "CATCHALL6 " ip6tables -A FORWARD -j LOG --log-level debug --log-prefix "CATCHALL6 "

26
overlay/etc/init.d/S01logging Executable file
View File

@@ -0,0 +1,26 @@
#!/bin/sh
#
# Start logging
#
case "$1" in
start)
echo -n "Starting logging: "
start-stop-daemon -b -S -q -m -p /var/run/syslogd.pid --exec /sbin/syslogd -- -n -l 7
start-stop-daemon -b -S -q -m -p /var/run/klogd.pid --exec /sbin/klogd -- -n
echo "OK"
;;
stop)
echo -n "Stopping logging: "
start-stop-daemon -K -q -p /var/run/syslogd.pid
start-stop-daemon -K -q -p /var/run/klogd.pid
echo "OK"
;;
restart|reload)
;;
*)
echo "Usage: $0 {start|stop|restart}"
exit 1
esac
exit $?