Imported Debian patch 2.3.1-85

[debian/makedev] / debian / postinst

diff --git a/debian/postinst b/debian/postinst
index 5f46cdddc4f59b5e13b9a57989ee8a86d3b625df..d2d8d0aabb8d1d9357c54fd4f0f929a090e480ab 100644 (file)
--- a/debian/postinst
+++ b/debian/postinst
@@ -14,12 +14,15 @@ then
     exit 0
 fi
 
-/sbin/MAKEDEV std
-/sbin/MAKEDEV consoleonly
+/sbin/MAKEDEV std consoleonly fd
+
+# ensure base tty set exists, since debootstrap no longer does
+for i in tty0 tty1 tty2 tty3 tty4 tty5 tty6 tty7 tty8 tty9; do
+       test -e /dev/$i || /sbin/MAKEDEV $i
+done
 
 /bin/chmod g-r,o= /dev/tty[0-9]*
 
-test -e /dev/tty0 || /sbin/MAKEDEV tty0
 test -e /dev/random || /sbin/MAKEDEV random
 test -e /dev/urandom || /sbin/MAKEDEV urandom
 test -e /dev/audio || /sbin/MAKEDEV audio
@@ -27,10 +30,10 @@ test -e /dev/agpgart || /sbin/MAKEDEV agpgart
 
 [ ! -f /dev/mouse ] && [ -f /dev/sunmouse ] && ln -s sunmouse mouse
 
-# force update of fb devices if kernel is >= 2.4 and they already exist
+# force update of fb devices if kernel is Linux >= 2.4 and they already exist
 kern_rev1=`uname -r | sed -e 's@^\([^.]*\)\..*@\1@'`
 kern_rev2=`uname -r | sed -e 's@^[^.]*\.\([^.]*\)\..*@\1@'`
-if [ $kern_rev1 -ge 2 ] && [ $kern_rev2 -ge 4 ] && [ -e /dev/fb0 ]
+if [ `uname -s` == "Linux" ] && [ $kern_rev1 -ge 2 ] && [ $kern_rev2 -ge 4 ] && [ -e /dev/fb0 ]
 then
        /sbin/MAKEDEV fb
 fi