From: deraadt Date: Fri, 2 Apr 2021 02:30:29 +0000 (+0000) Subject: sync X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=a90aeaa9a38f68f813a78213b1c862496d7de25e;p=openbsd sync --- diff --git a/etc/etc.hppa/MAKEDEV b/etc/etc.hppa/MAKEDEV index bae9a5dcd8e..5bdb46e946d 100644 --- a/etc/etc.hppa/MAKEDEV +++ b/etc/etc.hppa/MAKEDEV @@ -3,8 +3,8 @@ # THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. # generated from: # -# OpenBSD: etc.hppa/MAKEDEV.md,v 1.66 2021/01/23 05:08:33 thfr Exp -# OpenBSD: MAKEDEV.common,v 1.112 2021/01/23 05:08:33 thfr Exp +# OpenBSD: etc.hppa/MAKEDEV.md,v 1.67 2021/04/02 02:29:54 deraadt Exp +# OpenBSD: MAKEDEV.common,v 1.113 2021/02/12 10:26:33 jsg Exp # OpenBSD: MAKEDEV.mi,v 1.83 2016/09/11 03:06:31 deraadt Exp # OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp # @@ -213,7 +213,7 @@ U=`unt $i` case $i in ramdisk) R std fd st0 st1 sd0 sd1 sd2 sd3 rd0 random - R pty0 bpf bio diskmap + R bpf bio diskmap ;; std) diff --git a/etc/etc.loongson/MAKEDEV b/etc/etc.loongson/MAKEDEV index bbda1f1be76..606087e4e80 100644 --- a/etc/etc.loongson/MAKEDEV +++ b/etc/etc.loongson/MAKEDEV @@ -3,7 +3,7 @@ # THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. # generated from: # -# OpenBSD: etc.loongson/MAKEDEV.md,v 1.34 2021/02/12 10:26:34 jsg Exp +# OpenBSD: etc.loongson/MAKEDEV.md,v 1.35 2021/04/02 02:29:56 deraadt Exp # OpenBSD: MAKEDEV.common,v 1.113 2021/02/12 10:26:33 jsg Exp # OpenBSD: MAKEDEV.mi,v 1.83 2016/09/11 03:06:31 deraadt Exp # OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp @@ -485,8 +485,8 @@ local) ;; ramdisk) - R wskbd0 wskbd1 wskbd2 diskmap bio pty0 rd0 cd0 cd1 st0 st1 - R wd0 wd1 wd2 wd3 wd4 sd0 sd1 sd2 sd3 sd4 tty00 tty01 bpf std + R wskbd0 wskbd1 wskbd2 diskmap bio rd0 cd0 cd1 st0 st1 wd0 + R wd1 wd2 wd3 wd4 sd0 sd1 sd2 sd3 sd4 tty00 tty01 bpf std ;; all) diff --git a/etc/etc.luna88k/MAKEDEV b/etc/etc.luna88k/MAKEDEV index 9ef328aae47..d06fad82e68 100644 --- a/etc/etc.luna88k/MAKEDEV +++ b/etc/etc.luna88k/MAKEDEV @@ -3,8 +3,8 @@ # THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. # generated from: # -# OpenBSD: etc.luna88k/MAKEDEV.md,v 1.35 2020/07/06 06:11:27 dlg Exp -# OpenBSD: MAKEDEV.common,v 1.111 2020/07/06 06:11:26 dlg Exp +# OpenBSD: etc.luna88k/MAKEDEV.md,v 1.36 2021/04/02 02:29:56 deraadt Exp +# OpenBSD: MAKEDEV.common,v 1.113 2021/02/12 10:26:33 jsg Exp # OpenBSD: MAKEDEV.mi,v 1.83 2016/09/11 03:06:31 deraadt Exp # OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp # @@ -408,8 +408,8 @@ local) ;; ramdisk) - R diskmap bio pty0 ttya rd0 cd0 cd1 st0 st1 wd0 wd1 wd2 wd3 - R wd4 sd0 sd1 sd2 sd3 sd4 tty00 tty01 bpf std + R diskmap bio ttya rd0 cd0 cd1 st0 st1 wd0 wd1 wd2 wd3 wd4 + R sd0 sd1 sd2 sd3 sd4 tty00 tty01 bpf std ;; all) diff --git a/etc/etc.macppc/MAKEDEV b/etc/etc.macppc/MAKEDEV index 25b96110266..8d81ccfeb95 100644 --- a/etc/etc.macppc/MAKEDEV +++ b/etc/etc.macppc/MAKEDEV @@ -3,7 +3,7 @@ # THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. # generated from: # -# OpenBSD: etc.macppc/MAKEDEV.md,v 1.77 2021/02/12 10:26:34 jsg Exp +# OpenBSD: etc.macppc/MAKEDEV.md,v 1.78 2021/04/02 02:29:56 deraadt Exp # OpenBSD: MAKEDEV.common,v 1.113 2021/02/12 10:26:33 jsg Exp # OpenBSD: MAKEDEV.mi,v 1.83 2016/09/11 03:06:31 deraadt Exp # OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp @@ -536,8 +536,8 @@ local) ;; ramdisk) - R diskmap bio pty0 rd0 cd0 cd1 st0 st1 wd0 wd1 wd2 wd3 wd4 - R sd0 sd1 sd2 sd3 sd4 tty00 tty01 bpf std + R diskmap bio rd0 cd0 cd1 st0 st1 wd0 wd1 wd2 wd3 wd4 sd0 sd1 + R sd2 sd3 sd4 tty00 tty01 bpf std ;; all) diff --git a/etc/etc.octeon/MAKEDEV b/etc/etc.octeon/MAKEDEV index 44c589cca23..323d78cdd43 100644 --- a/etc/etc.octeon/MAKEDEV +++ b/etc/etc.octeon/MAKEDEV @@ -3,8 +3,8 @@ # THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. # generated from: # -# OpenBSD: etc.octeon/MAKEDEV.md,v 1.20 2021/01/23 05:08:33 thfr Exp -# OpenBSD: MAKEDEV.common,v 1.112 2021/01/23 05:08:33 thfr Exp +# OpenBSD: etc.octeon/MAKEDEV.md,v 1.21 2021/04/02 02:29:56 deraadt Exp +# OpenBSD: MAKEDEV.common,v 1.113 2021/02/12 10:26:33 jsg Exp # OpenBSD: MAKEDEV.mi,v 1.83 2016/09/11 03:06:31 deraadt Exp # OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp # @@ -449,8 +449,8 @@ local) ;; ramdisk) - R octcf0 diskmap bio pty0 rd0 cd0 cd1 st0 st1 wd0 wd1 wd2 wd3 - R wd4 sd0 sd1 sd2 sd3 sd4 tty00 tty01 bpf std + R octcf0 diskmap bio rd0 cd0 cd1 st0 st1 wd0 wd1 wd2 wd3 wd4 + R sd0 sd1 sd2 sd3 sd4 tty00 tty01 bpf std ;; all) diff --git a/etc/etc.sgi/MAKEDEV b/etc/etc.sgi/MAKEDEV index bb22e3f7688..5ab654a7533 100644 --- a/etc/etc.sgi/MAKEDEV +++ b/etc/etc.sgi/MAKEDEV @@ -3,8 +3,8 @@ # THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. # generated from: # -# OpenBSD: etc.sgi/MAKEDEV.md,v 1.55 2021/01/23 05:08:33 thfr Exp -# OpenBSD: MAKEDEV.common,v 1.112 2021/01/23 05:08:33 thfr Exp +# OpenBSD: etc.sgi/MAKEDEV.md,v 1.56 2021/04/02 02:29:56 deraadt Exp +# OpenBSD: MAKEDEV.common,v 1.113 2021/02/12 10:26:33 jsg Exp # OpenBSD: MAKEDEV.mi,v 1.83 2016/09/11 03:06:31 deraadt Exp # OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp # @@ -474,8 +474,8 @@ local) ;; ramdisk) - R diskmap bio pty0 rd0 cd0 cd1 st0 st1 wd0 wd1 wd2 wd3 wd4 - R sd0 sd1 sd2 sd3 sd4 tty00 tty01 bpf std + R diskmap bio rd0 cd0 cd1 st0 st1 wd0 wd1 wd2 wd3 wd4 sd0 sd1 + R sd2 sd3 sd4 tty00 tty01 bpf std ;; all)