--- cci/dev/MAKEDEV	2019/07/28 12:24:19	1.1
+++ cci/dev/MAKEDEV	2019/07/28 12:30:13	1.1.1.2
@@ -48,6 +48,10 @@ cy*)
 		/etc/mknod ncy"$unit"s	b $blk $u8; ln ncy"$unit"s nmt$unit
 		/etc/mknod rcy"$unit"s	c $chr $unit; ln rcy"$unit"s rmt$unit
 		/etc/mknod rncy"$unit"s c $chr $u8; ln rncy"$unit"s nrmt$unit
+		/etc/mknod cy"$unit"f	b $blk $unit
+		/etc/mknod ncy"$unit"f	b $blk $u8
+		/etc/mknod rcy"$unit"f	c $chr $unit
+		/etc/mknod rncy"$unit"f c $chr $u8
 		umask 77
 		;;
 	*)
@@ -66,7 +70,7 @@ fsd*|smd*|xfd*|fuj*|xsd*)
 	xsd*) name=xsd; blk=1; chr=5;;
 	esac
 	case $unit in
-	0|1|2|3|4|5|6|7|8|9|a|b|c|d|e|f)
+	0|1|2|3|4|5|6|7|8|9|a|b|c|d|e|f|10|11|12|13|14|15|16|17|18|19|1a|1b|1c|1d|1e|1f)
 		case $unit in
 		a) u=10 ;;
 		b) u=11 ;;
@@ -74,6 +78,22 @@ fsd*|smd*|xfd*|fuj*|xsd*)
 		d) u=13 ;;
 		e) u=14 ;;
 		f) u=15 ;;
+		10) u=16 ;;
+		11) u=17 ;;
+		12) u=18 ;;
+		13) u=19 ;;
+		14) u=20 ;;
+		15) u=21 ;;
+		16) u=22 ;;
+		17) u=23 ;;
+		18) u=24 ;;
+		19) u=25 ;;
+		1a) u=26 ;;
+		1b) u=27 ;;
+		1c) u=28 ;;
+		1d) u=29 ;;
+		1e) u=30 ;;
+		1f) u=31 ;;
 		*) u=$unit ;;
 		esac
 
@@ -83,12 +103,17 @@ fsd*|smd*|xfd*|fuj*|xsd*)
 		/etc/mknod ${name}${unit}d	b $blk `expr $u '*' 8 + 3`
 		/etc/mknod ${name}${unit}e	b $blk `expr $u '*' 8 + 4`
 		/etc/mknod ${name}${unit}f	b $blk `expr $u '*' 8 + 5`
+		/etc/mknod ${name}${unit}g	b $blk `expr $u '*' 8 + 6`
+		/etc/mknod ${name}${unit}h	b $blk `expr $u '*' 8 + 7`
+
 		/etc/mknod r${name}${unit}a	c $chr `expr $u '*' 8 + 0`
 		/etc/mknod r${name}${unit}b	c $chr `expr $u '*' 8 + 1`
 		/etc/mknod r${name}${unit}c	c $chr `expr $u '*' 8 + 2`
 		/etc/mknod r${name}${unit}d	c $chr `expr $u '*' 8 + 3`
 		/etc/mknod r${name}${unit}e	c $chr `expr $u '*' 8 + 4`
 		/etc/mknod r${name}${unit}f	c $chr `expr $u '*' 8 + 5`
+		/etc/mknod r${name}${unit}g	c $chr `expr $u '*' 8 + 6`
+		/etc/mknod r${name}${unit}h	c $chr `expr $u '*' 8 + 7`
 
 		chmod 644 ${name}${unit}a
 		chmod 644 ${name}${unit}b
@@ -96,12 +121,16 @@ fsd*|smd*|xfd*|fuj*|xsd*)
 		chmod 644 ${name}${unit}d
 		chmod 644 ${name}${unit}e
 		chmod 644 ${name}${unit}f
+		chmod 644 ${name}${unit}g
+		chmod 644 ${name}${unit}h
 		chmod 644 r${name}${unit}a
 		chmod 644 r${name}${unit}b
 		chmod 644 r${name}${unit}c
 		chmod 644 r${name}${unit}d
 		chmod 644 r${name}${unit}e
 		chmod 644 r${name}${unit}f
+		chmod 644 r${name}${unit}g
+		chmod 644 r${name}${unit}h
 		;;
 	*)
 		echo bad unit for disk in: $i
@@ -125,9 +154,10 @@ vx*)
 		eval `echo $un | awk ' { u = $1 } END {
 		    for (i = 0; i < 16; i++)
 			printf("/etc/mknod tty%02x c 1 %d; ",u*16+i,u*16+i); }'`
+
 		ls -1 tty?? | grep [A-F] | while read x; do
-			y=`echo $x | tr [A-F] [a-f]`
-			mv $x $y
+			y=`echo $x|sed "y/ABCDEF/abcdef/"|sed "s/ttyd/ttyD/"`
+			mv $x $y >/dev/null 2>&1
 		done
 		;;
 	*)
@@ -152,26 +182,43 @@ pty*)
 				printf("/etc/mknod tty%s%x c 9 %d; \
 					/etc/mknod pty%s%x c 10 %d; ", \
 					n, i, b+i, n, i, b+i); }'`
-		ls -1 tty?? | grep [A-F] | while read x; do
-			y=`echo $x | tr [A-F] [a-f]`
-			mv $x $y
-		done
-		ls -1 pty?? | grep [A-F] | while read x; do
-			y=`echo $x | tr [A-F] [a-f]`
-			mv $x $y
+		ls -1 tty?? pty?? | grep [A-F] | while read x; do
+			y=`echo $x|sed "y/ABCDEF/abcdef/"|sed "s/ttyd/ttyD/"`
+			mv $x $y >/dev/null 2>&1
 		done
 		umask 77
 		;;
 	esac
 	;;
 
-lock)
-	/etc/mknod iilock c 14 0
-	chmod 600  iilock
+lock*)
+	version=`expr $i : 'lock\(.*\)'`
+	major=0
+	case $version in
+	2) major=14 ;;
+	3) major=15 ;;
+	*) echo "bad version for ingres lock file (should be 2 or 3)" ;;
+	esac
+	if [ $major -ne 0 ]
+	then	/etc/mknod iilock c $major 0
+		chown ingres iilock
+		chmod 600  iilock
+		ln iilock iilock1
+	fi
 	;;
 
 local)
 	sh MAKEDEV.local
 	;;
+enpram*)
+	class=`expr $i : 'enpram\(.*\)'`
+	case $class in
+	0) /etc/mknod enp0ram 	c 16 0 	; chmod 644 enp0ram ;;
+	1) /etc/mknod enp1ram 	c 16 1 	; chmod 644 enp1ram ;;
+	*) /etc/mknod enp0ram 	c 16 0 	; chmod 644 enp0ram ;
+	   /etc/mknod enp1ram 	c 16 1 	; chmod 644 enp1ram ;;
+	esac
+	;;
+*) echo bad device name in: $i;;
 esac
 done