From 7cf81ff1e4965636cef1c873e21d9165c488b696 Mon Sep 17 00:00:00 2001
From: otto <>
Date: Tue, 4 Oct 2005 18:12:01 +0000
Subject: [PATCH] regen

---
 src/etc/etc.alpha/MAKEDEV   | 8 +++-----
 src/etc/etc.amd64/MAKEDEV   | 8 +++-----
 src/etc/etc.cats/MAKEDEV    | 8 +++-----
 src/etc/etc.hp300/MAKEDEV   | 8 +++-----
 src/etc/etc.hppa/MAKEDEV    | 8 +++-----
 src/etc/etc.hppa64/MAKEDEV  | 8 +++-----
 src/etc/etc.i386/MAKEDEV    | 8 +++-----
 src/etc/etc.luna88k/MAKEDEV | 8 +++-----
 src/etc/etc.mac68k/MAKEDEV  | 8 +++-----
 src/etc/etc.macppc/MAKEDEV  | 8 +++-----
 src/etc/etc.mvme68k/MAKEDEV | 8 +++-----
 src/etc/etc.mvme88k/MAKEDEV | 8 +++-----
 src/etc/etc.sgi/MAKEDEV     | 8 +++-----
 src/etc/etc.sparc/MAKEDEV   | 8 +++-----
 src/etc/etc.sparc64/MAKEDEV | 8 +++-----
 src/etc/etc.vax/MAKEDEV     | 8 +++-----
 src/etc/etc.zaurus/MAKEDEV  | 8 +++-----
 17 files changed, 51 insertions(+), 85 deletions(-)

diff --git a/src/etc/etc.alpha/MAKEDEV b/src/etc/etc.alpha/MAKEDEV
index a81b4c68..07f47b96 100644
--- a/src/etc/etc.alpha/MAKEDEV
+++ b/src/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/src/etc/etc.amd64/MAKEDEV b/src/etc/etc.amd64/MAKEDEV
index 8dea445e..a6d59ef5 100644
--- a/src/etc/etc.amd64/MAKEDEV
+++ b/src/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/src/etc/etc.cats/MAKEDEV b/src/etc/etc.cats/MAKEDEV
index 68a9a7f6..c73d66e3 100644
--- a/src/etc/etc.cats/MAKEDEV
+++ b/src/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/src/etc/etc.hp300/MAKEDEV b/src/etc/etc.hp300/MAKEDEV
index 646ab330..e6a3e863 100644
--- a/src/etc/etc.hp300/MAKEDEV
+++ b/src/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/src/etc/etc.hppa/MAKEDEV b/src/etc/etc.hppa/MAKEDEV
index e9cd2a5e..15c45fad 100644
--- a/src/etc/etc.hppa/MAKEDEV
+++ b/src/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/src/etc/etc.hppa64/MAKEDEV b/src/etc/etc.hppa64/MAKEDEV
index 1b20b85c..0647a1d6 100644
--- a/src/etc/etc.hppa64/MAKEDEV
+++ b/src/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/src/etc/etc.i386/MAKEDEV b/src/etc/etc.i386/MAKEDEV
index 7dd0417c..6ce8d020 100644
--- a/src/etc/etc.i386/MAKEDEV
+++ b/src/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/src/etc/etc.luna88k/MAKEDEV b/src/etc/etc.luna88k/MAKEDEV
index fbe45803..dbe2d845 100644
--- a/src/etc/etc.luna88k/MAKEDEV
+++ b/src/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/src/etc/etc.mac68k/MAKEDEV b/src/etc/etc.mac68k/MAKEDEV
index be6ee246..18308be8 100644
--- a/src/etc/etc.mac68k/MAKEDEV
+++ b/src/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/src/etc/etc.macppc/MAKEDEV b/src/etc/etc.macppc/MAKEDEV
index 7c2a8ca9..fe5e5f16 100644
--- a/src/etc/etc.macppc/MAKEDEV
+++ b/src/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/src/etc/etc.mvme68k/MAKEDEV b/src/etc/etc.mvme68k/MAKEDEV
index c17f51c7..033ececc 100644
--- a/src/etc/etc.mvme68k/MAKEDEV
+++ b/src/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/src/etc/etc.mvme88k/MAKEDEV b/src/etc/etc.mvme88k/MAKEDEV
index c83e6d47..0dc44dad 100644
--- a/src/etc/etc.mvme88k/MAKEDEV
+++ b/src/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/src/etc/etc.sgi/MAKEDEV b/src/etc/etc.sgi/MAKEDEV
index bf087592..10063e78 100644
--- a/src/etc/etc.sgi/MAKEDEV
+++ b/src/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/src/etc/etc.sparc/MAKEDEV b/src/etc/etc.sparc/MAKEDEV
index 86c504d5..9a7fef04 100644
--- a/src/etc/etc.sparc/MAKEDEV
+++ b/src/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/src/etc/etc.sparc64/MAKEDEV b/src/etc/etc.sparc64/MAKEDEV
index 37c89627..1ebbed8d 100644
--- a/src/etc/etc.sparc64/MAKEDEV
+++ b/src/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/src/etc/etc.vax/MAKEDEV b/src/etc/etc.vax/MAKEDEV
index 673f496e..f2f5f14e 100644
--- a/src/etc/etc.vax/MAKEDEV
+++ b/src/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/src/etc/etc.zaurus/MAKEDEV b/src/etc/etc.zaurus/MAKEDEV
index 584b83dd..7db4951c 100644
--- a/src/etc/etc.zaurus/MAKEDEV
+++ b/src/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()