Replace a bunch of "ln foo bar"'s with "ln -f foo bar".

This means that if(when) you go "sh MAKEDEV all" in /dev
the devices get remade; you don't get errors.
A lot of the changes are for info only; they are commented out.

Not exactly shot to pieces by:	bde

2 files changed, 84 insertions, 84 deletions

diff --git a/etc/MAKEDEV b/etc/MAKEDEV
index 3cbb27c..df4de21 100644
--- a/etc/MAKEDEV
+++ b/etc/MAKEDEV
@@ -121,7 +121,7 @@
 #	ipl	ipfilter control devices (ipl, ipnat, ipstate, ipauth)
 #	kbd	keyboard devices
 #
-#	$Id: MAKEDEV,v 1.182 1999/01/11 00:03:58 n_hibma Exp $
+#	$Id: MAKEDEV,v 1.183 1999/01/12 01:31:13 n_hibma Exp $
 #
 
 PATH=/sbin:/bin/:/usr/bin:/usr/sbin:$PATH
@@ -365,68 +365,68 @@ fd*)
 		# Fake BSD partitions
 		for i in a b c d e f g h
 		do
-			ln ${name}${unit} ${name}${unit}$i
-			ln r${name}${unit} r${name}${unit}$i
+			ln -f ${name}${unit} ${name}${unit}$i
+			ln -f r${name}${unit} r${name}${unit}$i
 		done
 		# User-readable and programmer-readable name sets
 
 		mknod ${name}${unit}.1720  b $blk `expr $unit '*' 64 + 1`
 		mknod r${name}${unit}.1720 c $chr `expr $unit '*' 64 + 1`
-		# ln ${name}${unit}.1720 ${name}${unit}135hs21
-		# ln r${name}${unit}.1720 r${name}${unit}135hs21
+		# ln -f ${name}${unit}.1720 ${name}${unit}135hs21
+		# ln -f r${name}${unit}.1720 r${name}${unit}135hs21
 
 		mknod ${name}${unit}.1480  b $blk `expr $unit '*' 64 + 2`
 		mknod r${name}${unit}.1480 c $chr `expr $unit '*' 64 + 2`
-		# ln ${name}${unit}.1480 ${name}${unit}135hs18
-		# ln r${name}${unit}.1480 r${name}${unit}135hs18
-		# ln ${name}${unit}.1480 ${name}${unit}96hs18
-		# ln r${name}${unit}.1480 r${name}${unit}96hs18
+		# ln -f ${name}${unit}.1480 ${name}${unit}135hs18
+		# ln -f r${name}${unit}.1480 r${name}${unit}135hs18
+		# ln -f ${name}${unit}.1480 ${name}${unit}96hs18
+		# ln -f r${name}${unit}.1480 r${name}${unit}96hs18
 
 		mknod ${name}${unit}.1440  b $blk `expr $unit '*' 64 + 3`
 		mknod r${name}${unit}.1440 c $chr `expr $unit '*' 64 + 3`
-		# ln ${name}${unit}.1440 ${name}${unit}135
-		# ln r${name}${unit}.1440 r${name}${unit}135
-		# ln ${name}${unit}.1440 ${name}${unit}135ds18
-		# ln r${name}${unit}.1440 r${name}${unit}135ds18
-		# ln ${name}${unit}.1440 ${name}${unit}96ds18
-		# ln r${name}${unit}.1440 r${name}${unit}96ds18
+		# ln -f ${name}${unit}.1440 ${name}${unit}135
+		# ln -f r${name}${unit}.1440 r${name}${unit}135
+		# ln -f ${name}${unit}.1440 ${name}${unit}135ds18
+		# ln -f r${name}${unit}.1440 r${name}${unit}135ds18
+		# ln -f ${name}${unit}.1440 ${name}${unit}96ds18
+		# ln -f r${name}${unit}.1440 r${name}${unit}96ds18
 
 		mknod ${name}${unit}.1200  b $blk `expr $unit '*' 64 + 4`
 		mknod r${name}${unit}.1200 c $chr `expr $unit '*' 64 + 4`
-		# ln ${name}${unit}.1200 ${name}${unit}96
-		# ln r${name}${unit}.1200 r${name}${unit}96
-		# ln ${name}${unit}.1200 ${name}${unit}96ds15
-		# ln r${name}${unit}.1200 r${name}${unit}96ds15
-		# ln ${name}${unit}.1200 ${name}${unit}135ds15
-		# ln r${name}${unit}.1200 r${name}${unit}135ds15
+		# ln -f ${name}${unit}.1200 ${name}${unit}96
+		# ln -f r${name}${unit}.1200 r${name}${unit}96
+		# ln -f ${name}${unit}.1200 ${name}${unit}96ds15
+		# ln -f r${name}${unit}.1200 r${name}${unit}96ds15
+		# ln -f ${name}${unit}.1200 ${name}${unit}135ds15
+		# ln -f r${name}${unit}.1200 r${name}${unit}135ds15
 
 		mknod ${name}${unit}.820  b $blk `expr $unit '*' 64 + 5`
 		mknod r${name}${unit}.820 c $chr `expr $unit '*' 64 + 5`
-		# ln ${name}${unit}.820 ${name}${unit}96hs10
-		# ln r${name}${unit}.820 r${name}${unit}96hs10
-		# ln ${name}${unit}.820 ${name}${unit}135hs10
-		# ln r${name}${unit}.820 r${name}${unit}135hs10
+		# ln -f ${name}${unit}.820 ${name}${unit}96hs10
+		# ln -f r${name}${unit}.820 r${name}${unit}96hs10
+		# ln -f ${name}${unit}.820 ${name}${unit}135hs10
+		# ln -f r${name}${unit}.820 r${name}${unit}135hs10
 
 		mknod ${name}${unit}.800  b $blk `expr $unit '*' 64 + 6`
 		mknod r${name}${unit}.800 c $chr `expr $unit '*' 64 + 6`
-		# ln ${name}${unit}.800 ${name}${unit}96ds10
-		# ln r${name}${unit}.800 r${name}${unit}96ds10
-		# ln ${name}${unit}.800 ${name}${unit}135ds10
-		# ln r${name}${unit}.800 r${name}${unit}135ds10
+		# ln -f ${name}${unit}.800 ${name}${unit}96ds10
+		# ln -f r${name}${unit}.800 r${name}${unit}96ds10
+		# ln -f ${name}${unit}.800 ${name}${unit}135ds10
+		# ln -f r${name}${unit}.800 r${name}${unit}135ds10
 
 		mknod ${name}${unit}.720  b $blk `expr $unit '*' 64 + 7`
 		mknod r${name}${unit}.720 c $chr `expr $unit '*' 64 + 7`
-		# ln ${name}${unit}.720 ${name}${unit}96ds9
-		# ln r${name}${unit}.720 r${name}${unit}96ds9
-		# ln ${name}${unit}.720 ${name}${unit}135ds9
-		# ln r${name}${unit}.720 r${name}${unit}135ds9
+		# ln -f ${name}${unit}.720 ${name}${unit}96ds9
+		# ln -f r${name}${unit}.720 r${name}${unit}96ds9
+		# ln -f ${name}${unit}.720 ${name}${unit}135ds9
+		# ln -f r${name}${unit}.720 r${name}${unit}135ds9
 
 		mknod ${name}${unit}.360  b $blk `expr $unit '*' 64 + 8`
 		mknod r${name}${unit}.360 c $chr `expr $unit '*' 64 + 8`
-		# ln ${name}${unit}.360 ${name}${unit}48
-		# ln r${name}${unit}.360 r${name}${unit}48
-		# ln ${name}${unit}.360 ${name}${unit}48ds9
-		# ln r${name}${unit}.360 r${name}${unit}48ds9
+		# ln -f ${name}${unit}.360 ${name}${unit}48
+		# ln -f r${name}${unit}.360 r${name}${unit}48
+		# ln -f ${name}${unit}.360 ${name}${unit}48ds9
+		# ln -f r${name}${unit}.360 r${name}${unit}48ds9
 
 		chgrp operator ${name}${unit}* r${name}${unit}*
 		;;
@@ -445,8 +445,8 @@ ft*)
 	0|1|2|3)
 		mknod ${name}${unit}   b $blk `expr $unit '*' 64 + 32`
 		mknod r${name}${unit}  c $chr `expr $unit '*' 64 + 32`
-		ln ${name}${unit} ${name}${unit}a
-		ln r${name}${unit} r${name}${unit}a
+		ln -f ${name}${unit} ${name}${unit}a
+		ln -f r${name}${unit} r${name}${unit}a
 		chgrp operator ${name}${unit}* r${name}${unit}*
 		;;
 	*)
@@ -625,9 +625,9 @@ sa*)
 					ersa${unit}.${mode}
 		done
 
-		ln rsa${unit}.0 rsa${unit}
-		ln nrsa${unit}.0 nrsa${unit}
-		ln ersa${unit}.0 ersa${unit}
+		ln -f rsa${unit}.0 rsa${unit}
+		ln -f nrsa${unit}.0 nrsa${unit}
+		ln -f ersa${unit}.0 ersa${unit}
 		;;
 	*)
 		echo bad unit for tape in: $i
diff --git a/etc/etc.i386/MAKEDEV b/etc/etc.i386/MAKEDEV
index 3cbb27c..df4de21 100644
--- a/etc/etc.i386/MAKEDEV
+++ b/etc/etc.i386/MAKEDEV
@@ -121,7 +121,7 @@
 #	ipl	ipfilter control devices (ipl, ipnat, ipstate, ipauth)
 #	kbd	keyboard devices
 #
-#	$Id: MAKEDEV,v 1.182 1999/01/11 00:03:58 n_hibma Exp $
+#	$Id: MAKEDEV,v 1.183 1999/01/12 01:31:13 n_hibma Exp $
 #
 
 PATH=/sbin:/bin/:/usr/bin:/usr/sbin:$PATH
@@ -365,68 +365,68 @@ fd*)
 		# Fake BSD partitions
 		for i in a b c d e f g h
 		do
-			ln ${name}${unit} ${name}${unit}$i
-			ln r${name}${unit} r${name}${unit}$i
+			ln -f ${name}${unit} ${name}${unit}$i
+			ln -f r${name}${unit} r${name}${unit}$i
 		done
 		# User-readable and programmer-readable name sets
 
 		mknod ${name}${unit}.1720  b $blk `expr $unit '*' 64 + 1`
 		mknod r${name}${unit}.1720 c $chr `expr $unit '*' 64 + 1`
-		# ln ${name}${unit}.1720 ${name}${unit}135hs21
-		# ln r${name}${unit}.1720 r${name}${unit}135hs21
+		# ln -f ${name}${unit}.1720 ${name}${unit}135hs21
+		# ln -f r${name}${unit}.1720 r${name}${unit}135hs21
 
 		mknod ${name}${unit}.1480  b $blk `expr $unit '*' 64 + 2`
 		mknod r${name}${unit}.1480 c $chr `expr $unit '*' 64 + 2`
-		# ln ${name}${unit}.1480 ${name}${unit}135hs18
-		# ln r${name}${unit}.1480 r${name}${unit}135hs18
-		# ln ${name}${unit}.1480 ${name}${unit}96hs18
-		# ln r${name}${unit}.1480 r${name}${unit}96hs18
+		# ln -f ${name}${unit}.1480 ${name}${unit}135hs18
+		# ln -f r${name}${unit}.1480 r${name}${unit}135hs18
+		# ln -f ${name}${unit}.1480 ${name}${unit}96hs18
+		# ln -f r${name}${unit}.1480 r${name}${unit}96hs18
 
 		mknod ${name}${unit}.1440  b $blk `expr $unit '*' 64 + 3`
 		mknod r${name}${unit}.1440 c $chr `expr $unit '*' 64 + 3`
-		# ln ${name}${unit}.1440 ${name}${unit}135
-		# ln r${name}${unit}.1440 r${name}${unit}135
-		# ln ${name}${unit}.1440 ${name}${unit}135ds18
-		# ln r${name}${unit}.1440 r${name}${unit}135ds18
-		# ln ${name}${unit}.1440 ${name}${unit}96ds18
-		# ln r${name}${unit}.1440 r${name}${unit}96ds18
+		# ln -f ${name}${unit}.1440 ${name}${unit}135
+		# ln -f r${name}${unit}.1440 r${name}${unit}135
+		# ln -f ${name}${unit}.1440 ${name}${unit}135ds18
+		# ln -f r${name}${unit}.1440 r${name}${unit}135ds18
+		# ln -f ${name}${unit}.1440 ${name}${unit}96ds18
+		# ln -f r${name}${unit}.1440 r${name}${unit}96ds18
 
 		mknod ${name}${unit}.1200  b $blk `expr $unit '*' 64 + 4`
 		mknod r${name}${unit}.1200 c $chr `expr $unit '*' 64 + 4`
-		# ln ${name}${unit}.1200 ${name}${unit}96
-		# ln r${name}${unit}.1200 r${name}${unit}96
-		# ln ${name}${unit}.1200 ${name}${unit}96ds15
-		# ln r${name}${unit}.1200 r${name}${unit}96ds15
-		# ln ${name}${unit}.1200 ${name}${unit}135ds15
-		# ln r${name}${unit}.1200 r${name}${unit}135ds15
+		# ln -f ${name}${unit}.1200 ${name}${unit}96
+		# ln -f r${name}${unit}.1200 r${name}${unit}96
+		# ln -f ${name}${unit}.1200 ${name}${unit}96ds15
+		# ln -f r${name}${unit}.1200 r${name}${unit}96ds15
+		# ln -f ${name}${unit}.1200 ${name}${unit}135ds15
+		# ln -f r${name}${unit}.1200 r${name}${unit}135ds15
 
 		mknod ${name}${unit}.820  b $blk `expr $unit '*' 64 + 5`
 		mknod r${name}${unit}.820 c $chr `expr $unit '*' 64 + 5`
-		# ln ${name}${unit}.820 ${name}${unit}96hs10
-		# ln r${name}${unit}.820 r${name}${unit}96hs10
-		# ln ${name}${unit}.820 ${name}${unit}135hs10
-		# ln r${name}${unit}.820 r${name}${unit}135hs10
+		# ln -f ${name}${unit}.820 ${name}${unit}96hs10
+		# ln -f r${name}${unit}.820 r${name}${unit}96hs10
+		# ln -f ${name}${unit}.820 ${name}${unit}135hs10
+		# ln -f r${name}${unit}.820 r${name}${unit}135hs10
 
 		mknod ${name}${unit}.800  b $blk `expr $unit '*' 64 + 6`
 		mknod r${name}${unit}.800 c $chr `expr $unit '*' 64 + 6`
-		# ln ${name}${unit}.800 ${name}${unit}96ds10
-		# ln r${name}${unit}.800 r${name}${unit}96ds10
-		# ln ${name}${unit}.800 ${name}${unit}135ds10
-		# ln r${name}${unit}.800 r${name}${unit}135ds10
+		# ln -f ${name}${unit}.800 ${name}${unit}96ds10
+		# ln -f r${name}${unit}.800 r${name}${unit}96ds10
+		# ln -f ${name}${unit}.800 ${name}${unit}135ds10
+		# ln -f r${name}${unit}.800 r${name}${unit}135ds10
 
 		mknod ${name}${unit}.720  b $blk `expr $unit '*' 64 + 7`
 		mknod r${name}${unit}.720 c $chr `expr $unit '*' 64 + 7`
-		# ln ${name}${unit}.720 ${name}${unit}96ds9
-		# ln r${name}${unit}.720 r${name}${unit}96ds9
-		# ln ${name}${unit}.720 ${name}${unit}135ds9
-		# ln r${name}${unit}.720 r${name}${unit}135ds9
+		# ln -f ${name}${unit}.720 ${name}${unit}96ds9
+		# ln -f r${name}${unit}.720 r${name}${unit}96ds9
+		# ln -f ${name}${unit}.720 ${name}${unit}135ds9
+		# ln -f r${name}${unit}.720 r${name}${unit}135ds9
 
 		mknod ${name}${unit}.360  b $blk `expr $unit '*' 64 + 8`
 		mknod r${name}${unit}.360 c $chr `expr $unit '*' 64 + 8`
-		# ln ${name}${unit}.360 ${name}${unit}48
-		# ln r${name}${unit}.360 r${name}${unit}48
-		# ln ${name}${unit}.360 ${name}${unit}48ds9
-		# ln r${name}${unit}.360 r${name}${unit}48ds9
+		# ln -f ${name}${unit}.360 ${name}${unit}48
+		# ln -f r${name}${unit}.360 r${name}${unit}48
+		# ln -f ${name}${unit}.360 ${name}${unit}48ds9
+		# ln -f r${name}${unit}.360 r${name}${unit}48ds9
 
 		chgrp operator ${name}${unit}* r${name}${unit}*
 		;;
@@ -445,8 +445,8 @@ ft*)
 	0|1|2|3)
 		mknod ${name}${unit}   b $blk `expr $unit '*' 64 + 32`
 		mknod r${name}${unit}  c $chr `expr $unit '*' 64 + 32`
-		ln ${name}${unit} ${name}${unit}a
-		ln r${name}${unit} r${name}${unit}a
+		ln -f ${name}${unit} ${name}${unit}a
+		ln -f r${name}${unit} r${name}${unit}a
 		chgrp operator ${name}${unit}* r${name}${unit}*
 		;;
 	*)
@@ -625,9 +625,9 @@ sa*)
 					ersa${unit}.${mode}
 		done
 
-		ln rsa${unit}.0 rsa${unit}
-		ln nrsa${unit}.0 nrsa${unit}
-		ln ersa${unit}.0 ersa${unit}
+		ln -f rsa${unit}.0 rsa${unit}
+		ln -f nrsa${unit}.0 nrsa${unit}
+		ln -f ersa${unit}.0 ersa${unit}
 		;;
 	*)
 		echo bad unit for tape in: $i