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

diff --git a/config/rootfiles/core/76/filelists/files b/config/rootfiles/core/76/filelists/files
index ce685e5e6eb4cfac4bc7995be230d27e4b823508..ed5b7575ab26174f744c4a902c198897a81738e1 100644 (file)
--- a/config/rootfiles/core/76/filelists/files
+++ b/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

diff --git a/config/rootfiles/core/76/update.sh b/config/rootfiles/core/76/update.sh
index 655da31bcda5554e235ab3b6b4b9efb4c8468ba2..c2a0d347d0cd1a5af5efc166ed0c65d41d97bffc 100644 (file)
--- a/config/rootfiles/core/76/update.sh
+++ b/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

diff --git a/src/initscripts/init.d/udev b/src/initscripts/init.d/udev
index 7674ab52c314d229919db8a3220b3866a67fa2d5..b6d01009a8e5234795bf7b3abaf955bf5f88d4ed 100644 (file)
--- a/src/initscripts/init.d/udev
+++ b/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