X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=MAKEDEV;h=f38f0733664a22ae4a44c808703a030133c3657b;hb=refs%2Ftags%2Fdebian%2F2.3.1-81;hp=d9224a445397c94e95e89bb8b728242caafd2deb;hpb=cdf394cc4498e09d3d2c1f46147d9dce82f5ec61;p=debian%2Fmakedev

diff --git a/MAKEDEV b/MAKEDEV
index d9224a4..f38f073 100644
--- a/MAKEDEV
+++ b/MAKEDEV
@@ -49,12 +49,14 @@ if [ "$WRITE_ON_UDEV" ]; then
   :
 elif [ -d /dev/.static/dev/ ] && [ "`pwd`" = /dev ] && [ -e /proc/mounts ] \
     && grep -qE '^[^ ]+ /dev/\.static/dev' /proc/mounts; then
+  echo "udev active, devices will be created in /dev/.static/dev/"
   cd /dev/.static/dev/
 elif [ -d /.dev/ ] && [ "`pwd`" = /dev ] && [ -e /proc/mounts ] \
     && grep -qE '^[^ ]+ /\.dev' /proc/mounts; then
+  echo "udev active, devices will be created in /.dev/"
   cd /.dev/
-elif [ -d .udevdb/ ] && [ "`pwd`" = /dev ]; then
-  echo ".udevdb presence implies active udev.  Aborting MAKEDEV invocation."
+elif [ -d .udevdb/ -o -d .udev/ ] && [ "`pwd`" = /dev ]; then
+  echo ".udevdb or .udev presence implies active udev.  Aborting MAKEDEV invocation."
   # use exit 0, not 1, so postinst scripts don't fail on this
   exit 0
 fi
@@ -225,7 +227,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 +241,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 +307,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
@@ -318,7 +325,7 @@ do
 			alpha)
 				$0 $opts generic-alpha
 				;;
-			arm)
+			arm|armeb)
 				$0 $opts generic-arm
 				;;
 			hppa)
@@ -367,9 +374,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 +393,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 +412,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 +431,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 +454,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 +473,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 +491,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 +508,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 +525,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 +559,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 +577,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
@@ -623,6 +619,12 @@ do
 			makedev scc$unit c 34 $unit $system
 		done
 		;;
+	mtd)	
+		for unit in 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
+		do
+			makedev mtd$unit c 90 `math $unit \* 2` $system
+		done
+		;;
 	bc)	
 		for unit in 0 1 2 3
 		do
@@ -723,6 +725,10 @@ do
 			makedev video1394/$i c 171 `math 16 + $i` $video
 		done
 		;;
+	alsa)
+		echo "You requested 'alsa' devices.  Please install the alsa-base package instead,"
+		echo "which creates and maintains device information for ALSA."
+		;;
 	nvram)
 		makedev nvram c 10 144 $mouse
 		;;
@@ -1058,6 +1064,10 @@ do
 		major=`Major $arg 10` || continue
 		makedev $arg	c $major 183 $private
 		;;
+	mcelog)
+		major=`Major $arg 10` || continue
+		makedev $arg	c $major 227 $private
+		;;
 	cpu|microcode)
 		mkdir -p cpu
 		makedev cpu/microcode c 10 184 $private
@@ -1115,7 +1125,11 @@ 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
 		;;
 	thinkpad)
@@ -1206,7 +1220,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
@@ -1217,7 +1231,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
@@ -1228,7 +1242,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
@@ -1239,7 +1253,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
@@ -1250,7 +1264,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
@@ -1261,7 +1275,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
@@ -1272,7 +1286,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
@@ -1283,7 +1297,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
@@ -1294,7 +1308,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
@@ -1305,7 +1319,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