Imported Debian patch 2.3.1-80

[debian/makedev] / MAKEDEV

diff --git a/MAKEDEV b/MAKEDEV
index 1f15cd12501b4bcaecc73eec15f8ff89e8459e87..6fba12ad1aaca2478557554ff281ed45afa9dfe5 100644 (file)
--- a/MAKEDEV
+++ b/MAKEDEV
@@ -53,7 +53,7 @@ elif [ -d /dev/.static/dev/ ] && [ "`pwd`" = /dev ] && [ -e /proc/mounts ] \
 elif [ -d /.dev/ ] && [ "`pwd`" = /dev ] && [ -e /proc/mounts ] \
     && grep -qE '^[^ ]+ /\.dev' /proc/mounts; then
   cd /.dev/
-elif [ -d .udevdb/ ] && [ "`pwd`" = /dev ]; then
+elif [ -d .udevdb/ -o -d .udev/ ] && [ "`pwd`" = /dev ]; then
   echo ".udevdb presence implies active udev.  Aborting MAKEDEV invocation."
   # use exit 0, not 1, so postinst scripts don't fail on this
   exit 0
@@ -323,7 +323,7 @@ do
                        alpha)
                                $0 $opts generic-alpha
                                ;;
-                       arm)
+                       arm|armeb)
                                $0 $opts generic-arm
                                ;;
                        hppa)
@@ -1109,6 +1109,9 @@ do
                makedev mergemem  c $major 153 $mouse
                makedev pmu       c $major 154 $mouse
                ;;
+       fuse)
+               makedev fuse      c 10 229 $system
+               ;;
        pmu)
                major=`Major mouse 10` || continue
                makedev pmu       c $major 154 $mouse