From 9e6fdd3493ece2ee5e12760fd2d31c792d24593d Mon Sep 17 00:00:00 2001
From: deraadt <>
Date: Fri, 4 Jan 2002 03:00:44 +0000
Subject: [PATCH] add missing rm commands; todd ok

---
 src/etc/etc.hp300/MAKEDEV   |  3 ++-
 src/etc/etc.mvme68k/MAKEDEV | 11 ++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/etc/etc.hp300/MAKEDEV b/src/etc/etc.hp300/MAKEDEV
index d922fa59..e15b58d8 100644
--- a/src/etc/etc.hp300/MAKEDEV
+++ b/src/etc/etc.hp300/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: MAKEDEV,v 1.35 2001/06/28 02:58:53 kjc Exp $
+#	$OpenBSD: MAKEDEV,v 1.36 2002/01/04 03:00:44 deraadt Exp $
 #	$NetBSD: MAKEDEV,v 1.12 1995/11/05 23:50:22 thorpej Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
@@ -207,6 +207,7 @@ tun*)
 
 rd*)
 	umask 2 ; unit=`expr $i : '.*d\(.*\)'`
+	rm -f rd$unit? rrd$unit?
 	mknod rd${unit}a b 8 `expr $unit '*' 16 + 0`
 	mknod rd${unit}c b 8 `expr $unit '*' 16 + 2`
 	mknod rrd${unit}a c 34 `expr $unit '*' 16 + 0`
diff --git a/src/etc/etc.mvme68k/MAKEDEV b/src/etc/etc.mvme68k/MAKEDEV
index bedf633e..3fa19997 100644
--- a/src/etc/etc.mvme68k/MAKEDEV
+++ b/src/etc/etc.mvme68k/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: MAKEDEV,v 1.33 2001/06/28 02:58:55 kjc Exp $
+#	$OpenBSD: MAKEDEV,v 1.34 2002/01/04 03:00:44 deraadt Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
 # All rights reserved.
@@ -33,7 +33,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-#	$OpenBSD: MAKEDEV,v 1.33 2001/06/28 02:58:55 kjc Exp $
+#	$OpenBSD: MAKEDEV,v 1.34 2002/01/04 03:00:44 deraadt Exp $
 #
 # Device "make" file.  Valid arguments:
 #	all	makes all known devices, including local devices,
@@ -384,9 +384,10 @@ pty*)
 		umask 0
 		eval `echo $offset $name | awk ' { b=$1; n=$2 } END {
 			for (i = 0; i < 16; i++)
-				printf("mknod tty%s%x c 4 %d;" \
-					"mknod pty%s%x c 5 %d; ", \
-					n, i, b+i, n, i, b+i); }'`
+				printf("rm -f tty%s%x pty%s%x;" \
+			    	    "mknod tty%s%x c 4 %d;" \
+				    "mknod pty%s%x c 5 %d; ", \
+					n, i, n, i, n, i, b+i, n, i, b+i); }'`
 		umask 77
 		;;
 	esac