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

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/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