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

config/rootfiles/core/76/filelists/files

@@ -17,6 +17,7 @@ srv/web/ipfire/html/themes/darkdos
 srv/web/ipfire/html/themes/ipfire
 srv/web/ipfire/html/themes/ipfire-legacy
 srv/web/ipfire/html/themes/maniac
+usr/lib/firewall
 usr/local/bin/timezone-transition
 usr/local/bin/setddns.pl
 var/ipfire/backup/bin/backup.pl

config/rootfiles/core/76/update.sh

@@ -283,7 +283,7 @@ rm -rf /var/ipfire/{dmzholes,portfw,outgoing,xtaccess}
 
 # Convert inittab and fstab
 sed -i -e "s/tty1 9600$/tty1 9600 --noclear/g" /etc/inittab
-sed -i -e "s/xvc0 9600$/tty1 9600 --noclear/g" /etc/inittab
+sed -i -e "s/xvc0 9600$/xvc0 9600 --noclear/g" /etc/inittab
 sed -i -e "s/^proc/#proc/g" /etc/fstab
 sed -i -e "s/^sysfs/#sysfs/g" /etc/fstab
 sed -i -e "s/^devpts/#devpts/g" /etc/fstab

src/initscripts/init.d/udev

@@ -41,6 +41,16 @@ case "${1}" in
 			/etc/rc.d/init.d/halt stop
 		fi
 
+		if ! grep -q '[[:space:]]/dev/shm' /proc/mounts; then
+			mkdir -p /dev/shm
+			mount -t tmpfs tmpfs /dev/shm
+		fi
+
+		if ! grep -q '[[:space:]]/dev/pts' /proc/mounts; then
+			mkdir -p /dev/pts
+			mount -t devpts devpts -o gid=5,mode=620 /dev/pts
+		fi
+
 		# Udev handles uevents itself, so we don't need to have
 		# the kernel call out to any binary in response to them
 		echo > /proc/sys/kernel/hotplug