Imported Debian patch 2.3.1-79

[debian/makedev] / MAKEDEV

diff --git a/MAKEDEV b/MAKEDEV
index 6945934b9e5b08b91b662e3ff93a514daccc60cb..1f15cd12501b4bcaecc73eec15f8ff89e8459e87 100644 (file)
--- a/MAKEDEV
+++ b/MAKEDEV
@@ -225,7 +225,7 @@ cvt () {
        do
                case "$1" in
                        mem|tty|ttyp|cua|cub|cui)       ;;
-                       hd)     (for d in a b c d e f g h ; do
+                       hd)     (for d in a b c d e f g h i j k l m n o p ; do
                                        echo -n hd$d " "
                                 done) ; echo
                                ;;
@@ -239,7 +239,10 @@ cvt () {
                        ide7)   echo hdo hdp ;;
                        ide8)   echo hdq hdr ;;
                        ide9)   echo hds hdt ;;
-                       sd)     echo sda sdb sdc sdd ;;
+                       sd)     (for d in a b c d e f g h i j k l m n o p ; do
+                                       echo -n sd$d " "
+                                done) ; echo
+                               ;;
                        dasd)   (for d in a b c d e f g h i j k l m \
                                        n o p q r s t u v w x y z ; do
                                        echo -n dasd$d " "
@@ -302,15 +305,17 @@ cvt () {
                        bluetooth)      echo bluetooth ;;
                        lvm)    ;; # taken care of by LVM userspace tools
                        ramdisk)        echo ram ;;
-                       *)      echo "$0: don't know what \"$1\" is" >&2 ;;
+                       null)   echo std ;;
+                       zero)   echo std ;;
+#                      *)      echo "$0: don't know what \"$1\" is" >&2 ;;
+                       *)      echo $1
                esac
                shift
        done
 }
 
-for arg in $*
+for arg in `cvt $*`
 do
-#      case `cvt $arg` in
        case $arg in
        generic)
                # pick the right generic-<arch> using dpkg's knowledge
@@ -367,9 +372,8 @@ do
                $0 $opts std
                $0 $opts fd
                $0 $opts fd0 fd1
-               $0 $opts hda hdb hdc hdd
+               $0 $opts hd sd
                $0 $opts xda xdb
-               $0 $opts sda sdb sdc sdd
                $0 $opts scd0 scd1
                $0 $opts st0 st1
                $0 $opts sg
@@ -387,9 +391,8 @@ do
                $0 $opts std
                $0 $opts fd
                $0 $opts fd0 fd1
-               $0 $opts hda hdb hdc hdd
+               $0 $opts hd sd
                $0 $opts xda xdb
-               $0 $opts sda sdb sdc sdd
                $0 $opts scd0 scd1
                $0 $opts st0 st1
                $0 $opts sg
@@ -407,8 +410,7 @@ do
                $0 $opts std
                $0 $opts fd
                $0 $opts fd0 fd1
-               $0 $opts hda hdb hdc hdd
-               $0 $opts sda sdb sdc sdd
+               $0 $opts hd sd
                $0 $opts scd0 scd1
                $0 $opts st0 st1
                $0 $opts sg
@@ -427,9 +429,8 @@ do
                $0 $opts std
                $0 $opts fd
                $0 $opts fd0 fd1
-               $0 $opts hda hdb hdc hdd
+               $0 $opts hd sd
                $0 $opts xda xdb
-               $0 $opts sda sdb sdc sdd
                $0 $opts scd0 scd1
                $0 $opts st0 st1
                $0 $opts sg
@@ -451,8 +452,7 @@ do
                $0 $opts std
                $0 $opts fd
                $0 $opts fd0 fd1
-               $0 $opts hda hdb hdc hdd
-               $0 $opts sda sdb sdc sdd
+               $0 $opts hd sd
                $0 $opts scd0 scd1
                $0 $opts st0 st1
                $0 $opts sg
@@ -471,8 +471,7 @@ do
                $0 $opts std
                $0 $opts fd
                $0 $opts fd0 fd1
-               $0 $opts hda hdb hdc hdd
-               $0 $opts sda sdb sdc sdd
+               $0 $opts hd sd
                $0 $opts scd0 scd1
                $0 $opts sg
                $0 $opts ada adb adc add ade adf
@@ -490,8 +489,7 @@ do
                $0 $opts std
                $0 $opts fd
                $0 $opts fd0 fd1
-               $0 $opts hda hdb
-               $0 $opts sda sdb sdc sdd
+               $0 $opts hd sd
                $0 $opts scd0 scd1
                $0 $opts st0 st1
                $0 $opts sg
@@ -508,8 +506,7 @@ do
                $0 $opts std
                $0 $opts fd
                $0 $opts fd0 fd1
-               $0 $opts hda hdb
-               $0 $opts sda sdb sdc sdd
+               $0 $opts hd sd
                $0 $opts scd0 scd1
                $0 $opts st0 st1
                $0 $opts sg
@@ -526,8 +523,7 @@ do
                $0 $opts std
                $0 $opts fd
                $0 $opts fd0 fd1
-               $0 $opts hda hdb hdc hdd
-               $0 $opts sda sdb sdc sdd
+               $0 $opts hd sd
                $0 $opts scd0 scd1
                $0 $opts st0 st1
                $0 $opts sg
@@ -561,8 +557,7 @@ do
                $0 $opts std
                $0 $opts fd
                $0 $opts fd0 fd1
-               $0 $opts hda hdb
-               $0 $opts sda sdb sdc sdd
+               $0 $opts hd sd
                $0 $opts scd0 scd1
                $0 $opts st0 st1
                $0 $opts sg
@@ -580,8 +575,7 @@ do
                $0 $opts std
                $0 $opts fd
                $0 $opts fd0 fd1
-               $0 $opts hda hdb hdc hdd
-               $0 $opts sda sdb sdc sdd
+               $0 $opts hd sd
                $0 $opts scd0 scd1
                $0 $opts st0 st1
                $0 $opts sg
@@ -1207,7 +1201,7 @@ do
                base=`index ab $unit`
                base=`math $base \* 64`
                makedev hd$unit b $major $base $disk
-               for part in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20
+               for part in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24
                do
                        makedev hd$unit$part b $major `math $base + $part` $disk
                done
@@ -1218,7 +1212,7 @@ do
                base=`index cd $unit`
                base=`math $base \* 64`
                makedev hd$unit b $major $base $disk
-               for part in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20
+               for part in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24
                do
                        makedev hd$unit$part b $major $(( $base + $part )) $disk
                done
@@ -1229,7 +1223,7 @@ do
                base=`index ef $unit`
                base=`math $base \* 64`
                makedev hd$unit b $major $base $disk
-               for part in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20
+               for part in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24
                do
                        makedev hd$unit$part b $major $(( $base + $part )) $disk
                done
@@ -1240,7 +1234,7 @@ do
                base=`index gh $unit`
                base=`math $base \* 64`
                makedev hd$unit b $major $base $disk
-               for part in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20
+               for part in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24
                do
                        makedev hd$unit$part b $major $(( $base + $part )) $disk
                done
@@ -1251,7 +1245,7 @@ do
                base=`index ij $unit`
                base=`math $base \* 64`
                makedev hd$unit b $major $base $disk
-               for part in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20
+               for part in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24
                do
                        makedev hd$unit$part b $major $(( $base + $part )) $disk
                done
@@ -1262,7 +1256,7 @@ do
                base=`index kl $unit`
                base=`math $base \* 64`
                makedev hd$unit b $major $base $disk
-               for part in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20
+               for part in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24
                do
                        makedev hd$unit$part b $major $(( $base + $part )) $disk
                done
@@ -1273,7 +1267,7 @@ do
                base=`index mn $unit`
                base=`math $base \* 64`
                makedev hd$unit b $major $base $disk
-               for part in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20
+               for part in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24
                do
                        makedev hd$unit$part b $major $(( $base + $part )) $disk
                done
@@ -1284,7 +1278,7 @@ do
                base=`index op $unit`
                base=`math $base \* 64`
                makedev hd$unit b $major $base $disk
-               for part in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20
+               for part in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24
                do
                        makedev hd$unit$part b $major $(( $base + $part )) $disk
                done
@@ -1295,7 +1289,7 @@ do
                base=`index qr $unit`
                base=`math $base \* 64`
                makedev hd$unit b $major $base $disk
-               for part in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20
+               for part in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24
                do
                        makedev hd$unit$part b $major $(( $base + $part )) $disk
                done
@@ -1306,7 +1300,7 @@ do
                base=`index st $unit`
                base=`math $base \* 64`
                makedev hd$unit b $major $base $disk
-               for part in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20
+               for part in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24
                do
                        makedev hd$unit$part b $major $(( $base + $part )) $disk
                done