Imported Debian patch 2.3.1-84

[debian/makedev] / MAKEDEV

diff --git a/MAKEDEV b/MAKEDEV
index f38f0733664a22ae4a44c808703a030133c3657b..7a5ffef905a718a33a22217fb03c0042ee0ad393 100644 (file)
--- a/MAKEDEV
+++ b/MAKEDEV
@@ -114,7 +114,8 @@ opts="${opt_n:+-n} ${opt_v:+-v} ${opt_d:+-d}"
 #---#---#---#---#---#---#---#---#---#---#---#---#---#---#---#---#---#---#---#
 
 devicename () {        # translate device names to something safe
-       echo "$*" | sed -e 's/[^A-Za-z0-9_]/_/g'
+       # A-Z is not full alphabet in all locales (e.g. in et_EE)
+       echo "$*" | LC_ALL=C sed -e 's/[^A-Za-z0-9_]/_/g' 
 }
 
 makedev () {   # usage: makedev name [bcu] major minor owner group mode
@@ -256,7 +257,6 @@ cvt () {
                        st)     echo st0 ;;
                        xd)     echo xda xdb ;;
                        ad)     echo ada adb ;;
-                       fd)     echo fd0 fd1 ;;
                        lp)     echo lp ;;
                        mt)     echo ftape ;;
                        qft)    echo ftape ;;
@@ -318,6 +318,8 @@ cvt () {
 
 for arg in `cvt $*`
 do
+       # this is to make the case patterns work as expected in all locales
+       LC_ALL=C
        case $arg in
        generic)
                # pick the right generic-<arch> using dpkg's knowledge
@@ -325,7 +327,7 @@ do
                        alpha)
                                $0 $opts generic-alpha
                                ;;
-                       arm|armeb)
+                       arm|armeb|armel)
                                $0 $opts generic-arm
                                ;;
                        hppa)
@@ -604,7 +606,7 @@ do
                symlink core $procfs/kcore
                makedev full c 1 7 $public
                makedev random c 1 8 $public
-               makedev urandom c 1 9 $readable
+               makedev urandom c 1 9 $public
                makedev tty  c 5 0 $tty
                $0 $opts ram
                $0 $opts loop
@@ -1092,6 +1094,9 @@ do
        irnet)
                makedev irnet c 10 187 $system
                ;;
+       cbm)
+               makedev irnet c 10 177 $system
+               ;;
        misc)
                major=`Major mouse 10` || continue
                makedev logibm    c $major 0 $mouse
@@ -1152,6 +1157,7 @@ do
                makedev systrace  c 10 226 $private
                ;;
        uinput)
+               mkdir -p input
                makedev input/uinput  c 10 223 $mouse
                ;;
        js)
@@ -1617,7 +1623,8 @@ do
                ;;
        md)
                major=`Major md 9` || continue
-               for part in 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
+               for part in 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 \
+                       16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31
                do
                        makedev md$part b $major $part $disk
                done