From: ratchov <ratchov@openbsd.org>
Date: Sat, 28 Jul 2018 08:11:08 +0000 (+0000)
Subject: sync
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=0a6a61591ab5824ee8bbeaa7b941c8f7f28b2378;p=openbsd

sync
---

diff --git a/etc/etc.alpha/MAKEDEV b/etc/etc.alpha/MAKEDEV
index f7967216afb..9179dbae054 100644
--- a/etc/etc.alpha/MAKEDEV
+++ b/etc/etc.alpha/MAKEDEV
@@ -339,9 +339,7 @@ audio*)
 	M audio$U	c 24 $U
 	M mixer$U	c 24 $(($U+16))
 	M audioctl$U	c 24 $(($U+192))
-	MKlist[${#MKlist[*]}]=";[ -e audio ] || ln -s audio$U audio"
 	MKlist[${#MKlist[*]}]=";[ -e mixer ] || ln -s mixer$U mixer"
-	MKlist[${#MKlist[*]}]=";[ -e audioctl ] || ln -s audioctl$U audioctl"
 	;;
 
 usb*)
diff --git a/etc/etc.amd64/MAKEDEV b/etc/etc.amd64/MAKEDEV
index 2253b401866..4dcbc748a26 100644
--- a/etc/etc.amd64/MAKEDEV
+++ b/etc/etc.amd64/MAKEDEV
@@ -375,9 +375,7 @@ audio*)
 	M audio$U	c 42 $U
 	M mixer$U	c 42 $(($U+16))
 	M audioctl$U	c 42 $(($U+192))
-	MKlist[${#MKlist[*]}]=";[ -e audio ] || ln -s audio$U audio"
 	MKlist[${#MKlist[*]}]=";[ -e mixer ] || ln -s mixer$U mixer"
-	MKlist[${#MKlist[*]}]=";[ -e audioctl ] || ln -s audioctl$U audioctl"
 	;;
 
 apm*)
diff --git a/etc/etc.arm64/MAKEDEV b/etc/etc.arm64/MAKEDEV
index f8b832c6c04..1619b6d4c7d 100644
--- a/etc/etc.arm64/MAKEDEV
+++ b/etc/etc.arm64/MAKEDEV
@@ -325,9 +325,7 @@ audio*)
 	M audio$U	c 42 $U
 	M mixer$U	c 42 $(($U+16))
 	M audioctl$U	c 42 $(($U+192))
-	MKlist[${#MKlist[*]}]=";[ -e audio ] || ln -s audio$U audio"
 	MKlist[${#MKlist[*]}]=";[ -e mixer ] || ln -s mixer$U mixer"
-	MKlist[${#MKlist[*]}]=";[ -e audioctl ] || ln -s audioctl$U audioctl"
 	;;
 
 apm*)
diff --git a/etc/etc.armv7/MAKEDEV b/etc/etc.armv7/MAKEDEV
index 7ec728cefce..42da4552a21 100644
--- a/etc/etc.armv7/MAKEDEV
+++ b/etc/etc.armv7/MAKEDEV
@@ -323,9 +323,7 @@ audio*)
 	M audio$U	c 36 $U
 	M mixer$U	c 36 $(($U+16))
 	M audioctl$U	c 36 $(($U+192))
-	MKlist[${#MKlist[*]}]=";[ -e audio ] || ln -s audio$U audio"
 	MKlist[${#MKlist[*]}]=";[ -e mixer ] || ln -s mixer$U mixer"
-	MKlist[${#MKlist[*]}]=";[ -e audioctl ] || ln -s audioctl$U audioctl"
 	;;
 
 apm*)
diff --git a/etc/etc.hppa/MAKEDEV b/etc/etc.hppa/MAKEDEV
index cd7e8e849bf..02263213ca2 100644
--- a/etc/etc.hppa/MAKEDEV
+++ b/etc/etc.hppa/MAKEDEV
@@ -301,9 +301,7 @@ audio*)
 	M audio$U	c 35 $U
 	M mixer$U	c 35 $(($U+16))
 	M audioctl$U	c 35 $(($U+192))
-	MKlist[${#MKlist[*]}]=";[ -e audio ] || ln -s audio$U audio"
 	MKlist[${#MKlist[*]}]=";[ -e mixer ] || ln -s mixer$U mixer"
-	MKlist[${#MKlist[*]}]=";[ -e audioctl ] || ln -s audioctl$U audioctl"
 	;;
 
 ttyU[0-9a-zA-Z])
diff --git a/etc/etc.i386/MAKEDEV b/etc/etc.i386/MAKEDEV
index 68a2b730da6..fa476cdab24 100644
--- a/etc/etc.i386/MAKEDEV
+++ b/etc/etc.i386/MAKEDEV
@@ -380,9 +380,7 @@ audio*)
 	M audio$U	c 42 $U
 	M mixer$U	c 42 $(($U+16))
 	M audioctl$U	c 42 $(($U+192))
-	MKlist[${#MKlist[*]}]=";[ -e audio ] || ln -s audio$U audio"
 	MKlist[${#MKlist[*]}]=";[ -e mixer ] || ln -s mixer$U mixer"
-	MKlist[${#MKlist[*]}]=";[ -e audioctl ] || ln -s audioctl$U audioctl"
 	;;
 
 apm*)
diff --git a/etc/etc.landisk/MAKEDEV b/etc/etc.landisk/MAKEDEV
index c374afce66b..b83083f844b 100644
--- a/etc/etc.landisk/MAKEDEV
+++ b/etc/etc.landisk/MAKEDEV
@@ -306,9 +306,7 @@ audio*)
 	M audio$U	c 36 $U
 	M mixer$U	c 36 $(($U+16))
 	M audioctl$U	c 36 $(($U+192))
-	MKlist[${#MKlist[*]}]=";[ -e audio ] || ln -s audio$U audio"
 	MKlist[${#MKlist[*]}]=";[ -e mixer ] || ln -s mixer$U mixer"
-	MKlist[${#MKlist[*]}]=";[ -e audioctl ] || ln -s audioctl$U audioctl"
 	;;
 
 usb*)
diff --git a/etc/etc.loongson/MAKEDEV b/etc/etc.loongson/MAKEDEV
index 038e934c44b..2e811fb2f40 100644
--- a/etc/etc.loongson/MAKEDEV
+++ b/etc/etc.loongson/MAKEDEV
@@ -297,9 +297,7 @@ audio*)
 	M audio$U	c 44 $U
 	M mixer$U	c 44 $(($U+16))
 	M audioctl$U	c 44 $(($U+192))
-	MKlist[${#MKlist[*]}]=";[ -e audio ] || ln -s audio$U audio"
 	MKlist[${#MKlist[*]}]=";[ -e mixer ] || ln -s mixer$U mixer"
-	MKlist[${#MKlist[*]}]=";[ -e audioctl ] || ln -s audioctl$U audioctl"
 	;;
 
 apm*)
diff --git a/etc/etc.luna88k/MAKEDEV b/etc/etc.luna88k/MAKEDEV
index 91887ddac85..374fa4e1822 100644
--- a/etc/etc.luna88k/MAKEDEV
+++ b/etc/etc.luna88k/MAKEDEV
@@ -285,9 +285,7 @@ audio*)
 	M audio$U	c 26 $U
 	M mixer$U	c 26 $(($U+16))
 	M audioctl$U	c 26 $(($U+192))
-	MKlist[${#MKlist[*]}]=";[ -e audio ] || ln -s audio$U audio"
 	MKlist[${#MKlist[*]}]=";[ -e mixer ] || ln -s mixer$U mixer"
-	MKlist[${#MKlist[*]}]=";[ -e audioctl ] || ln -s audioctl$U audioctl"
 	;;
 
 wsmouse[0-9]*)
diff --git a/etc/etc.macppc/MAKEDEV b/etc/etc.macppc/MAKEDEV
index 6008ee67088..1eb76f01ab1 100644
--- a/etc/etc.macppc/MAKEDEV
+++ b/etc/etc.macppc/MAKEDEV
@@ -328,9 +328,7 @@ audio*)
 	M audio$U	c 44 $U
 	M mixer$U	c 44 $(($U+16))
 	M audioctl$U	c 44 $(($U+192))
-	MKlist[${#MKlist[*]}]=";[ -e audio ] || ln -s audio$U audio"
 	MKlist[${#MKlist[*]}]=";[ -e mixer ] || ln -s mixer$U mixer"
-	MKlist[${#MKlist[*]}]=";[ -e audioctl ] || ln -s audioctl$U audioctl"
 	;;
 
 apm*)
diff --git a/etc/etc.octeon/MAKEDEV b/etc/etc.octeon/MAKEDEV
index aa1f724770d..cfd21294895 100644
--- a/etc/etc.octeon/MAKEDEV
+++ b/etc/etc.octeon/MAKEDEV
@@ -290,9 +290,7 @@ audio*)
 	M audio$U	c 44 $U
 	M mixer$U	c 44 $(($U+16))
 	M audioctl$U	c 44 $(($U+192))
-	MKlist[${#MKlist[*]}]=";[ -e audio ] || ln -s audio$U audio"
 	MKlist[${#MKlist[*]}]=";[ -e mixer ] || ln -s mixer$U mixer"
-	MKlist[${#MKlist[*]}]=";[ -e audioctl ] || ln -s audioctl$U audioctl"
 	;;
 
 usb*)
diff --git a/etc/etc.sgi/MAKEDEV b/etc/etc.sgi/MAKEDEV
index 8efa6b0949c..07d39ca00bf 100644
--- a/etc/etc.sgi/MAKEDEV
+++ b/etc/etc.sgi/MAKEDEV
@@ -292,9 +292,7 @@ audio*)
 	M audio$U	c 44 $U
 	M mixer$U	c 44 $(($U+16))
 	M audioctl$U	c 44 $(($U+192))
-	MKlist[${#MKlist[*]}]=";[ -e audio ] || ln -s audio$U audio"
 	MKlist[${#MKlist[*]}]=";[ -e mixer ] || ln -s mixer$U mixer"
-	MKlist[${#MKlist[*]}]=";[ -e audioctl ] || ln -s audioctl$U audioctl"
 	;;
 
 usb*)
diff --git a/etc/etc.sparc64/MAKEDEV b/etc/etc.sparc64/MAKEDEV
index 00970453b41..f3627fb761e 100644
--- a/etc/etc.sparc64/MAKEDEV
+++ b/etc/etc.sparc64/MAKEDEV
@@ -352,9 +352,7 @@ audio*)
 	M audio$U	c 69 $U
 	M mixer$U	c 69 $(($U+16))
 	M audioctl$U	c 69 $(($U+192))
-	MKlist[${#MKlist[*]}]=";[ -e audio ] || ln -s audio$U audio"
 	MKlist[${#MKlist[*]}]=";[ -e mixer ] || ln -s mixer$U mixer"
-	MKlist[${#MKlist[*]}]=";[ -e audioctl ] || ln -s audioctl$U audioctl"
 	;;
 
 usb*)