Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into monit

Conflicts:
	config/rootfiles/packages/asterisk

src/initscripts/init.d/cleanfs

@@ -71,6 +71,13 @@ create_files() {
 
 case "${1}" in
 	start)
+		if [[ ! -L "/var/run" ]]; then
+			boot_mesg "Repair /var/run symlink to /run..."
+			mv -u /var/run/* /run/ 2>&1 > /dev/null
+			rm -rf /var/run
+			ln -s ../run /var/run
+		fi
+
 		boot_mesg -n "Cleaning file systems:" ${INFO}
 
 		boot_mesg -n " /tmp" ${NORMAL}

src/initscripts/init.d/dhcrelay

@@ -0,0 +1,53 @@
+#!/bin/sh
+########################################################################
+# Begin $rc_base/init.d/dhcrelay
+#
+# Description : The DHCP Relay Daemon
+#
+########################################################################
+
+. /etc/sysconfig/rc
+. ${rc_functions}
+
+CONFIG_FILE="/var/ipfire/dhcp/relay"
+
+if [ -r "${CONFIG_FILE}" ]; then
+	eval $(/usr/local/bin/readhash ${CONFIG_FILE})
+fi
+
+ARGS="-q"
+
+for interface in ${INTERFACES}; do
+	ARGS="${ARGS} -i ${interface}"
+done
+
+ARGS="${ARGS} ${SERVERS}"
+
+case "${1}" in
+	start)
+		boot_mesg "Starting DHCP Relay..."
+		loadproc /usr/sbin/dhcrelay ${ARGS}
+		;;
+
+	stop)
+		boot_mesg "Stopping DHCP Relay..."
+		killproc -p /var/run/dhcrelay.pid /usr/sbin/dhcrelay
+		;;
+
+	restart)
+		${0} stop
+		sleep 1
+		${0} start
+		;;
+
+	status)
+		statusproc /usr/sbin/dhcrelay
+		;;
+
+	*)
+		echo "Usage: ${0} {start|stop|restart|status}"
+		exit 1
+		;;
+esac
+
+# End $rc_base/init.d/dhcrelay

src/initscripts/init.d/dnsmasq

@@ -20,7 +20,20 @@ if [ -e "/etc/sysconfig/dnsmasq" ]; then
 	. /etc/sysconfig/dnsmasq
 fi
 
+CACHE_SIZE=2500
+ENABLE_DNSSEC=1
 SHOW_SRV=1
+TRUST_ANCHOR=".,19036,8,2,49AAC11D7B6F6446702E54A1607371607A1A41855200FD2CE1CDDE32F24E8FB5"
+
+function dnssec_args() {
+	local cmdline="--dnssec"
+
+	if [ -n "${TRUST_ANCHOR}" ]; then
+		cmdline="${cmdline} --trust-anchor=${TRUST_ANCHOR}"
+	fi
+
+	echo "${cmdline}"
+}
 
 function dns_forward_args() {
 	local file="${1}"
@@ -41,7 +54,6 @@ function dns_forward_args() {
 	echo "${cmdline}"
 }
 
-
 case "${1}" in
 	start)
 		# kill already running copy of dnsmasq...
@@ -73,6 +85,15 @@ case "${1}" in
 		# Add custom forward dns zones.
 		ARGS="${ARGS} $(dns_forward_args /var/ipfire/dnsforward/config)"
 
+		# Enabled DNSSEC validation
+		if [ "${ENABLE_DNSSEC}" -eq 1 ]; then
+			ARGS="${ARGS} $(dnssec_args)"
+		fi
+
+		if [ -n "${CACHE_SIZE}" ]; then
+			ARGS="${ARGS} --cache-size=${CACHE_SIZE}"
+		fi
+
 		loadproc /usr/sbin/dnsmasq -l /var/state/dhcp/dhcpd.leases $ARGS
 		
 		if [ "${SHOW_SRV}" -eq 1 ] && [ "${DNS1}" != "" -o "${DNS2}" != "" ]; then

src/initscripts/init.d/leds

@@ -17,9 +17,11 @@ fi
 # Load ethernet settings
 eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings)
 
-if [ "${RED_DEV}" == "" ]; then
-	RED_DEV=ppp0
-fi
+case "${RED_TYPE}" in
+	PPPOE)
+		RED_DEV="ppp0"
+		;;
+esac
 
 # setup_netdev_trigger LED DEVICE MODE
 setup_netdev_trigger ()

src/initscripts/init.d/networking/red.up/30-ddns

@@ -1,5 +1,3 @@
 #!/bin/bash
 
-/usr/local/bin/setddns.pl -f
-
-exit 0
+exec /usr/bin/ddns update-all

src/initscripts/init.d/udev

@@ -64,7 +64,7 @@ case "${1}" in
 
 		# Now traverse /sys in order to "coldplug" devices that have
 		# already been discovered
-		/bin/udevadm trigger
+		/bin/udevadm trigger --action=add
 
 		# Now wait for udevd to process the uevents we triggered
 		/bin/udevadm settle