regen

17 files changed, 51 insertions, 85 deletions

diff --git a/etc/etc.alpha/MAKEDEV b/etc/etc.alpha/MAKEDEV
index a81b4c68f77..07f47b96f87 100644
--- a/etc/etc.alpha/MAKEDEV
+++ b/etc/etc.alpha/MAKEDEV
@@ -5,7 +5,7 @@
 #
 #	OpenBSD: etc.alpha/MAKEDEV.md,v 1.27 2005/08/01 22:22:12 deraadt Exp 
 #	OpenBSD: MAKEDEV.common,v 1.20 2005/08/01 22:22:12 deraadt Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.74 2005/10/04 07:39:37 otto Exp 
+#	OpenBSD: MAKEDEV.mi,v 1.75 2005/10/04 18:11:10 otto Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
 #
@@ -153,15 +153,13 @@ dodisk()
 {
 	[ "$DEBUG" ] && set -x
 	n=$(($((${5}*${7:-16}))+${6})) count=0
-	RMlist="$RMlist $1$2? r$1$2?"
 	[ 0$7 -ne 8 ] && l="i j k l m n o p"
 	for d in a b c d e f g h $l
 	do
-		M $1$2$d	b $3 $(($n+$count)) 640
-		M r$1$2$d	c $4 $(($n+$count)) 640
+		M $1$2$d	b $3 $(($n+$count)) 640 operaror
+		M r$1$2$d	c $4 $(($n+$count)) 640 operator
 		let count=count+1
 	done
-	MKlist="$MKlist;chown root:operator $1$2? r$1$2?"
 }
 
 dodisk2()
diff --git a/etc/etc.amd64/MAKEDEV b/etc/etc.amd64/MAKEDEV
index 8dea445e8e0..a6d59ef5a33 100644
--- a/etc/etc.amd64/MAKEDEV
+++ b/etc/etc.amd64/MAKEDEV
@@ -5,7 +5,7 @@
 #
 #	OpenBSD: etc.amd64/MAKEDEV.md,v 1.13 2005/08/01 22:22:12 deraadt Exp 
 #	OpenBSD: MAKEDEV.common,v 1.20 2005/08/01 22:22:12 deraadt Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.74 2005/10/04 07:39:37 otto Exp 
+#	OpenBSD: MAKEDEV.mi,v 1.75 2005/10/04 18:11:10 otto Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
 #
@@ -165,15 +165,13 @@ dodisk()
 {
 	[ "$DEBUG" ] && set -x
 	n=$(($((${5}*${7:-16}))+${6})) count=0
-	RMlist="$RMlist $1$2? r$1$2?"
 	[ 0$7 -ne 8 ] && l="i j k l m n o p"
 	for d in a b c d e f g h $l
 	do
-		M $1$2$d	b $3 $(($n+$count)) 640
-		M r$1$2$d	c $4 $(($n+$count)) 640
+		M $1$2$d	b $3 $(($n+$count)) 640 operaror
+		M r$1$2$d	c $4 $(($n+$count)) 640 operator
 		let count=count+1
 	done
-	MKlist="$MKlist;chown root:operator $1$2? r$1$2?"
 }
 
 dodisk2()
diff --git a/etc/etc.cats/MAKEDEV b/etc/etc.cats/MAKEDEV
index 68a9a7f6086..c73d66e3eae 100644
--- a/etc/etc.cats/MAKEDEV
+++ b/etc/etc.cats/MAKEDEV
@@ -5,7 +5,7 @@
 #
 #	OpenBSD: etc.cats/MAKEDEV.md,v 1.11 2005/08/01 22:22:13 deraadt Exp 
 #	OpenBSD: MAKEDEV.common,v 1.20 2005/08/01 22:22:12 deraadt Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.74 2005/10/04 07:39:37 otto Exp 
+#	OpenBSD: MAKEDEV.mi,v 1.75 2005/10/04 18:11:10 otto Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
 #
@@ -148,15 +148,13 @@ dodisk()
 {
 	[ "$DEBUG" ] && set -x
 	n=$(($((${5}*${7:-16}))+${6})) count=0
-	RMlist="$RMlist $1$2? r$1$2?"
 	[ 0$7 -ne 8 ] && l="i j k l m n o p"
 	for d in a b c d e f g h $l
 	do
-		M $1$2$d	b $3 $(($n+$count)) 640
-		M r$1$2$d	c $4 $(($n+$count)) 640
+		M $1$2$d	b $3 $(($n+$count)) 640 operaror
+		M r$1$2$d	c $4 $(($n+$count)) 640 operator
 		let count=count+1
 	done
-	MKlist="$MKlist;chown root:operator $1$2? r$1$2?"
 }
 
 dodisk2()
diff --git a/etc/etc.hp300/MAKEDEV b/etc/etc.hp300/MAKEDEV
index 646ab3304fc..e6a3e863e8a 100644
--- a/etc/etc.hp300/MAKEDEV
+++ b/etc/etc.hp300/MAKEDEV
@@ -5,7 +5,7 @@
 #
 #	OpenBSD: etc.hp300/MAKEDEV.md,v 1.24 2005/08/01 22:22:13 deraadt Exp 
 #	OpenBSD: MAKEDEV.common,v 1.20 2005/08/01 22:22:12 deraadt Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.74 2005/10/04 07:39:37 otto Exp 
+#	OpenBSD: MAKEDEV.mi,v 1.75 2005/10/04 18:11:10 otto Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
 #
@@ -137,15 +137,13 @@ dodisk()
 {
 	[ "$DEBUG" ] && set -x
 	n=$(($((${5}*${7:-16}))+${6})) count=0
-	RMlist="$RMlist $1$2? r$1$2?"
 	[ 0$7 -ne 8 ] && l="i j k l m n o p"
 	for d in a b c d e f g h $l
 	do
-		M $1$2$d	b $3 $(($n+$count)) 640
-		M r$1$2$d	c $4 $(($n+$count)) 640
+		M $1$2$d	b $3 $(($n+$count)) 640 operaror
+		M r$1$2$d	c $4 $(($n+$count)) 640 operator
 		let count=count+1
 	done
-	MKlist="$MKlist;chown root:operator $1$2? r$1$2?"
 }
 
 dodisk2()
diff --git a/etc/etc.hppa/MAKEDEV b/etc/etc.hppa/MAKEDEV
index e9cd2a5eb69..15c45fadf17 100644
--- a/etc/etc.hppa/MAKEDEV
+++ b/etc/etc.hppa/MAKEDEV
@@ -5,7 +5,7 @@
 #
 #	OpenBSD: etc.hppa/MAKEDEV.md,v 1.25 2005/08/01 22:22:13 deraadt Exp 
 #	OpenBSD: MAKEDEV.common,v 1.20 2005/08/01 22:22:12 deraadt Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.74 2005/10/04 07:39:37 otto Exp 
+#	OpenBSD: MAKEDEV.mi,v 1.75 2005/10/04 18:11:10 otto Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
 #
@@ -147,15 +147,13 @@ dodisk()
 {
 	[ "$DEBUG" ] && set -x
 	n=$(($((${5}*${7:-16}))+${6})) count=0
-	RMlist="$RMlist $1$2? r$1$2?"
 	[ 0$7 -ne 8 ] && l="i j k l m n o p"
 	for d in a b c d e f g h $l
 	do
-		M $1$2$d	b $3 $(($n+$count)) 640
-		M r$1$2$d	c $4 $(($n+$count)) 640
+		M $1$2$d	b $3 $(($n+$count)) 640 operaror
+		M r$1$2$d	c $4 $(($n+$count)) 640 operator
 		let count=count+1
 	done
-	MKlist="$MKlist;chown root:operator $1$2? r$1$2?"
 }
 
 dodisk2()
diff --git a/etc/etc.hppa64/MAKEDEV b/etc/etc.hppa64/MAKEDEV
index 1b20b85cb6b..0647a1d6725 100644
--- a/etc/etc.hppa64/MAKEDEV
+++ b/etc/etc.hppa64/MAKEDEV
@@ -5,7 +5,7 @@
 #
 #	OpenBSD: etc.hppa64/MAKEDEV.md,v 1.3 2005/08/01 22:22:13 deraadt Exp 
 #	OpenBSD: MAKEDEV.common,v 1.20 2005/08/01 22:22:12 deraadt Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.74 2005/10/04 07:39:37 otto Exp 
+#	OpenBSD: MAKEDEV.mi,v 1.75 2005/10/04 18:11:10 otto Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
 #
@@ -138,15 +138,13 @@ dodisk()
 {
 	[ "$DEBUG" ] && set -x
 	n=$(($((${5}*${7:-16}))+${6})) count=0
-	RMlist="$RMlist $1$2? r$1$2?"
 	[ 0$7 -ne 8 ] && l="i j k l m n o p"
 	for d in a b c d e f g h $l
 	do
-		M $1$2$d	b $3 $(($n+$count)) 640
-		M r$1$2$d	c $4 $(($n+$count)) 640
+		M $1$2$d	b $3 $(($n+$count)) 640 operaror
+		M r$1$2$d	c $4 $(($n+$count)) 640 operator
 		let count=count+1
 	done
-	MKlist="$MKlist;chown root:operator $1$2? r$1$2?"
 }
 
 dodisk2()
diff --git a/etc/etc.i386/MAKEDEV b/etc/etc.i386/MAKEDEV
index 7dd0417cebf..6ce8d020bbf 100644
--- a/etc/etc.i386/MAKEDEV
+++ b/etc/etc.i386/MAKEDEV
@@ -5,7 +5,7 @@
 #
 #	OpenBSD: etc.i386/MAKEDEV.md,v 1.33 2005/08/01 22:22:13 deraadt Exp 
 #	OpenBSD: MAKEDEV.common,v 1.20 2005/08/01 22:22:12 deraadt Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.74 2005/10/04 07:39:37 otto Exp 
+#	OpenBSD: MAKEDEV.mi,v 1.75 2005/10/04 18:11:10 otto Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
 #
@@ -168,15 +168,13 @@ dodisk()
 {
 	[ "$DEBUG" ] && set -x
 	n=$(($((${5}*${7:-16}))+${6})) count=0
-	RMlist="$RMlist $1$2? r$1$2?"
 	[ 0$7 -ne 8 ] && l="i j k l m n o p"
 	for d in a b c d e f g h $l
 	do
-		M $1$2$d	b $3 $(($n+$count)) 640
-		M r$1$2$d	c $4 $(($n+$count)) 640
+		M $1$2$d	b $3 $(($n+$count)) 640 operaror
+		M r$1$2$d	c $4 $(($n+$count)) 640 operator
 		let count=count+1
 	done
-	MKlist="$MKlist;chown root:operator $1$2? r$1$2?"
 }
 
 dodisk2()
diff --git a/etc/etc.luna88k/MAKEDEV b/etc/etc.luna88k/MAKEDEV
index fbe45803fe5..dbe2d845b32 100644
--- a/etc/etc.luna88k/MAKEDEV
+++ b/etc/etc.luna88k/MAKEDEV
@@ -5,7 +5,7 @@
 #
 #	OpenBSD: etc.luna88k/MAKEDEV.md,v 1.2 2005/08/01 22:22:13 deraadt Exp 
 #	OpenBSD: MAKEDEV.common,v 1.20 2005/08/01 22:22:12 deraadt Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.74 2005/10/04 07:39:37 otto Exp 
+#	OpenBSD: MAKEDEV.mi,v 1.75 2005/10/04 18:11:10 otto Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
 #
@@ -130,15 +130,13 @@ dodisk()
 {
 	[ "$DEBUG" ] && set -x
 	n=$(($((${5}*${7:-16}))+${6})) count=0
-	RMlist="$RMlist $1$2? r$1$2?"
 	[ 0$7 -ne 8 ] && l="i j k l m n o p"
 	for d in a b c d e f g h $l
 	do
-		M $1$2$d	b $3 $(($n+$count)) 640
-		M r$1$2$d	c $4 $(($n+$count)) 640
+		M $1$2$d	b $3 $(($n+$count)) 640 operaror
+		M r$1$2$d	c $4 $(($n+$count)) 640 operator
 		let count=count+1
 	done
-	MKlist="$MKlist;chown root:operator $1$2? r$1$2?"
 }
 
 dodisk2()
diff --git a/etc/etc.mac68k/MAKEDEV b/etc/etc.mac68k/MAKEDEV
index be6ee24686b..18308be8316 100644
--- a/etc/etc.mac68k/MAKEDEV
+++ b/etc/etc.mac68k/MAKEDEV
@@ -5,7 +5,7 @@
 #
 #	OpenBSD: etc.mac68k/MAKEDEV.md,v 1.19 2005/08/01 22:22:13 deraadt Exp 
 #	OpenBSD: MAKEDEV.common,v 1.20 2005/08/01 22:22:12 deraadt Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.74 2005/10/04 07:39:37 otto Exp 
+#	OpenBSD: MAKEDEV.mi,v 1.75 2005/10/04 18:11:10 otto Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
 #
@@ -128,15 +128,13 @@ dodisk()
 {
 	[ "$DEBUG" ] && set -x
 	n=$(($((${5}*${7:-16}))+${6})) count=0
-	RMlist="$RMlist $1$2? r$1$2?"
 	[ 0$7 -ne 8 ] && l="i j k l m n o p"
 	for d in a b c d e f g h $l
 	do
-		M $1$2$d	b $3 $(($n+$count)) 640
-		M r$1$2$d	c $4 $(($n+$count)) 640
+		M $1$2$d	b $3 $(($n+$count)) 640 operaror
+		M r$1$2$d	c $4 $(($n+$count)) 640 operator
 		let count=count+1
 	done
-	MKlist="$MKlist;chown root:operator $1$2? r$1$2?"
 }
 
 dodisk2()
diff --git a/etc/etc.macppc/MAKEDEV b/etc/etc.macppc/MAKEDEV
index 7c2a8ca98b8..fe5e5f16a16 100644
--- a/etc/etc.macppc/MAKEDEV
+++ b/etc/etc.macppc/MAKEDEV
@@ -5,7 +5,7 @@
 #
 #	OpenBSD: etc.macppc/MAKEDEV.md,v 1.21 2005/08/01 22:22:13 deraadt Exp 
 #	OpenBSD: MAKEDEV.common,v 1.20 2005/08/01 22:22:12 deraadt Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.74 2005/10/04 07:39:37 otto Exp 
+#	OpenBSD: MAKEDEV.mi,v 1.75 2005/10/04 18:11:10 otto Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
 #
@@ -150,15 +150,13 @@ dodisk()
 {
 	[ "$DEBUG" ] && set -x
 	n=$(($((${5}*${7:-16}))+${6})) count=0
-	RMlist="$RMlist $1$2? r$1$2?"
 	[ 0$7 -ne 8 ] && l="i j k l m n o p"
 	for d in a b c d e f g h $l
 	do
-		M $1$2$d	b $3 $(($n+$count)) 640
-		M r$1$2$d	c $4 $(($n+$count)) 640
+		M $1$2$d	b $3 $(($n+$count)) 640 operaror
+		M r$1$2$d	c $4 $(($n+$count)) 640 operator
 		let count=count+1
 	done
-	MKlist="$MKlist;chown root:operator $1$2? r$1$2?"
 }
 
 dodisk2()
diff --git a/etc/etc.mvme68k/MAKEDEV b/etc/etc.mvme68k/MAKEDEV
index c17f51c7f68..033ececc87e 100644
--- a/etc/etc.mvme68k/MAKEDEV
+++ b/etc/etc.mvme68k/MAKEDEV
@@ -5,7 +5,7 @@
 #
 #	OpenBSD: etc.mvme68k/MAKEDEV.md,v 1.15 2005/08/01 22:22:13 deraadt Exp 
 #	OpenBSD: MAKEDEV.common,v 1.20 2005/08/01 22:22:12 deraadt Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.74 2005/10/04 07:39:37 otto Exp 
+#	OpenBSD: MAKEDEV.mi,v 1.75 2005/10/04 18:11:10 otto Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
 #
@@ -133,15 +133,13 @@ dodisk()
 {
 	[ "$DEBUG" ] && set -x
 	n=$(($((${5}*${7:-16}))+${6})) count=0
-	RMlist="$RMlist $1$2? r$1$2?"
 	[ 0$7 -ne 8 ] && l="i j k l m n o p"
 	for d in a b c d e f g h $l
 	do
-		M $1$2$d	b $3 $(($n+$count)) 640
-		M r$1$2$d	c $4 $(($n+$count)) 640
+		M $1$2$d	b $3 $(($n+$count)) 640 operaror
+		M r$1$2$d	c $4 $(($n+$count)) 640 operator
 		let count=count+1
 	done
-	MKlist="$MKlist;chown root:operator $1$2? r$1$2?"
 }
 
 dodisk2()
diff --git a/etc/etc.mvme88k/MAKEDEV b/etc/etc.mvme88k/MAKEDEV
index c83e6d4700b..0dc44dadb45 100644
--- a/etc/etc.mvme88k/MAKEDEV
+++ b/etc/etc.mvme88k/MAKEDEV
@@ -5,7 +5,7 @@
 #
 #	OpenBSD: etc.mvme88k/MAKEDEV.md,v 1.15 2005/08/01 22:22:13 deraadt Exp 
 #	OpenBSD: MAKEDEV.common,v 1.20 2005/08/01 22:22:12 deraadt Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.74 2005/10/04 07:39:37 otto Exp 
+#	OpenBSD: MAKEDEV.mi,v 1.75 2005/10/04 18:11:10 otto Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
 #
@@ -129,15 +129,13 @@ dodisk()
 {
 	[ "$DEBUG" ] && set -x
 	n=$(($((${5}*${7:-16}))+${6})) count=0
-	RMlist="$RMlist $1$2? r$1$2?"
 	[ 0$7 -ne 8 ] && l="i j k l m n o p"
 	for d in a b c d e f g h $l
 	do
-		M $1$2$d	b $3 $(($n+$count)) 640
-		M r$1$2$d	c $4 $(($n+$count)) 640
+		M $1$2$d	b $3 $(($n+$count)) 640 operaror
+		M r$1$2$d	c $4 $(($n+$count)) 640 operator
 		let count=count+1
 	done
-	MKlist="$MKlist;chown root:operator $1$2? r$1$2?"
 }
 
 dodisk2()
diff --git a/etc/etc.sgi/MAKEDEV b/etc/etc.sgi/MAKEDEV
index bf087592cbc..10063e78f26 100644
--- a/etc/etc.sgi/MAKEDEV
+++ b/etc/etc.sgi/MAKEDEV
@@ -5,7 +5,7 @@
 #
 #	OpenBSD: etc.sgi/MAKEDEV.md,v 1.10 2005/08/01 22:22:13 deraadt Exp 
 #	OpenBSD: MAKEDEV.common,v 1.20 2005/08/01 22:22:12 deraadt Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.74 2005/10/04 07:39:37 otto Exp 
+#	OpenBSD: MAKEDEV.mi,v 1.75 2005/10/04 18:11:10 otto Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
 #
@@ -133,15 +133,13 @@ dodisk()
 {
 	[ "$DEBUG" ] && set -x
 	n=$(($((${5}*${7:-16}))+${6})) count=0
-	RMlist="$RMlist $1$2? r$1$2?"
 	[ 0$7 -ne 8 ] && l="i j k l m n o p"
 	for d in a b c d e f g h $l
 	do
-		M $1$2$d	b $3 $(($n+$count)) 640
-		M r$1$2$d	c $4 $(($n+$count)) 640
+		M $1$2$d	b $3 $(($n+$count)) 640 operaror
+		M r$1$2$d	c $4 $(($n+$count)) 640 operator
 		let count=count+1
 	done
-	MKlist="$MKlist;chown root:operator $1$2? r$1$2?"
 }
 
 dodisk2()
diff --git a/etc/etc.sparc/MAKEDEV b/etc/etc.sparc/MAKEDEV
index 86c504d5638..9a7fef049ee 100644
--- a/etc/etc.sparc/MAKEDEV
+++ b/etc/etc.sparc/MAKEDEV
@@ -5,7 +5,7 @@
 #
 #	OpenBSD: etc.sparc/MAKEDEV.md,v 1.29 2005/08/01 22:22:13 deraadt Exp 
 #	OpenBSD: MAKEDEV.common,v 1.20 2005/08/01 22:22:12 deraadt Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.74 2005/10/04 07:39:37 otto Exp 
+#	OpenBSD: MAKEDEV.mi,v 1.75 2005/10/04 18:11:10 otto Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
 #
@@ -146,15 +146,13 @@ dodisk()
 {
 	[ "$DEBUG" ] && set -x
 	n=$(($((${5}*${7:-16}))+${6})) count=0
-	RMlist="$RMlist $1$2? r$1$2?"
 	[ 0$7 -ne 8 ] && l="i j k l m n o p"
 	for d in a b c d e f g h $l
 	do
-		M $1$2$d	b $3 $(($n+$count)) 640
-		M r$1$2$d	c $4 $(($n+$count)) 640
+		M $1$2$d	b $3 $(($n+$count)) 640 operaror
+		M r$1$2$d	c $4 $(($n+$count)) 640 operator
 		let count=count+1
 	done
-	MKlist="$MKlist;chown root:operator $1$2? r$1$2?"
 }
 
 dodisk2()
diff --git a/etc/etc.sparc64/MAKEDEV b/etc/etc.sparc64/MAKEDEV
index 37c89627336..1ebbed8d4c6 100644
--- a/etc/etc.sparc64/MAKEDEV
+++ b/etc/etc.sparc64/MAKEDEV
@@ -5,7 +5,7 @@
 #
 #	OpenBSD: etc.sparc64/MAKEDEV.md,v 1.38 2005/08/01 22:22:13 deraadt Exp 
 #	OpenBSD: MAKEDEV.common,v 1.20 2005/08/01 22:22:12 deraadt Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.74 2005/10/04 07:39:37 otto Exp 
+#	OpenBSD: MAKEDEV.mi,v 1.75 2005/10/04 18:11:10 otto Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
 #
@@ -160,15 +160,13 @@ dodisk()
 {
 	[ "$DEBUG" ] && set -x
 	n=$(($((${5}*${7:-16}))+${6})) count=0
-	RMlist="$RMlist $1$2? r$1$2?"
 	[ 0$7 -ne 8 ] && l="i j k l m n o p"
 	for d in a b c d e f g h $l
 	do
-		M $1$2$d	b $3 $(($n+$count)) 640
-		M r$1$2$d	c $4 $(($n+$count)) 640
+		M $1$2$d	b $3 $(($n+$count)) 640 operaror
+		M r$1$2$d	c $4 $(($n+$count)) 640 operator
 		let count=count+1
 	done
-	MKlist="$MKlist;chown root:operator $1$2? r$1$2?"
 }
 
 dodisk2()
diff --git a/etc/etc.vax/MAKEDEV b/etc/etc.vax/MAKEDEV
index 673f496ed6c..f2f5f14e9ba 100644
--- a/etc/etc.vax/MAKEDEV
+++ b/etc/etc.vax/MAKEDEV
@@ -5,7 +5,7 @@
 #
 #	OpenBSD: etc.vax/MAKEDEV.md,v 1.21 2005/08/01 22:22:14 deraadt Exp 
 #	OpenBSD: MAKEDEV.common,v 1.20 2005/08/01 22:22:12 deraadt Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.74 2005/10/04 07:39:37 otto Exp 
+#	OpenBSD: MAKEDEV.mi,v 1.75 2005/10/04 18:11:10 otto Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
 #
@@ -144,15 +144,13 @@ dodisk()
 {
 	[ "$DEBUG" ] && set -x
 	n=$(($((${5}*${7:-16}))+${6})) count=0
-	RMlist="$RMlist $1$2? r$1$2?"
 	[ 0$7 -ne 8 ] && l="i j k l m n o p"
 	for d in a b c d e f g h $l
 	do
-		M $1$2$d	b $3 $(($n+$count)) 640
-		M r$1$2$d	c $4 $(($n+$count)) 640
+		M $1$2$d	b $3 $(($n+$count)) 640 operaror
+		M r$1$2$d	c $4 $(($n+$count)) 640 operator
 		let count=count+1
 	done
-	MKlist="$MKlist;chown root:operator $1$2? r$1$2?"
 }
 
 dodisk2()
diff --git a/etc/etc.zaurus/MAKEDEV b/etc/etc.zaurus/MAKEDEV
index 584b83dd581..7db4951cbad 100644
--- a/etc/etc.zaurus/MAKEDEV
+++ b/etc/etc.zaurus/MAKEDEV
@@ -5,7 +5,7 @@
 #
 #	OpenBSD: etc.zaurus/MAKEDEV.md,v 1.7 2005/08/01 22:22:14 deraadt Exp 
 #	OpenBSD: MAKEDEV.common,v 1.20 2005/08/01 22:22:12 deraadt Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.74 2005/10/04 07:39:37 otto Exp 
+#	OpenBSD: MAKEDEV.mi,v 1.75 2005/10/04 18:11:10 otto Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
 #
@@ -149,15 +149,13 @@ dodisk()
 {
 	[ "$DEBUG" ] && set -x
 	n=$(($((${5}*${7:-16}))+${6})) count=0
-	RMlist="$RMlist $1$2? r$1$2?"
 	[ 0$7 -ne 8 ] && l="i j k l m n o p"
 	for d in a b c d e f g h $l
 	do
-		M $1$2$d	b $3 $(($n+$count)) 640
-		M r$1$2$d	c $4 $(($n+$count)) 640
+		M $1$2$d	b $3 $(($n+$count)) 640 operaror
+		M r$1$2$d	c $4 $(($n+$count)) 640 operator
 		let count=count+1
 	done
-	MKlist="$MKlist;chown root:operator $1$2? r$1$2?"
 }
 
 dodisk2()