switch(4) and switchd(8) are retiering. Unhook them from various

configuration files.
OK sthen@ kn@ patrick@

diff --git a/etc/Makefile b/etc/Makefile
index 24d1376..d2fe2ef 100644 (file)
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.484 2021/05/01 16:11:07 visa Exp $
+#      $OpenBSD: Makefile,v 1.485 2021/11/11 09:38:14 claudio Exp $
 
 .include <bsd.own.mk>
 
@@ -64,7 +64,7 @@ RCDAEMONS=amd apmd bgpd bootparamd cron dhcpd dhcpleased dhcrelay dhcrelay6 \
        lpd mopd mountd mrouted nfsd npppd nsd ntpd ospf6d ospfd \
        pflogd portmap rad radiusd rarpd rbootd relayd resolvd ripd route6d \
        sasyncd sensorsd slowcgi slaacd smtpd sndiod snmpd spamd \
-       spamlogd sshd statd switchd syslogd tftpd tftpproxy unbound \
+       spamlogd sshd statd syslogd tftpd tftpproxy unbound \
        unwind vmd watchdogd wsmoused xenodm ypbind ypldap ypserv
 
 MISETS=        base${OSrev}.tgz comp${OSrev}.tgz man${OSrev}.tgz game${OSrev}.tgz

diff --git a/etc/changelist b/etc/changelist
index b6a7ec0..97a9ff0 100644 (file)
--- a/etc/changelist
+++ b/etc/changelist
@@ -1,4 +1,4 @@
-#      $OpenBSD: changelist,v 1.129 2021/09/13 11:49:21 robert Exp $
+#      $OpenBSD: changelist,v 1.130 2021/11/11 09:38:14 claudio Exp $
 #
 # List of files which the security script backs up and checks
 # for modifications.
@@ -140,7 +140,6 @@
 /etc/suid_profile
 /etc/sysctl.conf
 /etc/syslog.conf
-/etc/switchd.conf
 /etc/sysmerge.ignore
 /etc/ttys
 /etc/unwind.conf

diff --git a/etc/examples/vm.conf b/etc/examples/vm.conf
index f655f03..458beef 100644 (file)
--- a/etc/examples/vm.conf
+++ b/etc/examples/vm.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: vm.conf,v 1.10 2020/05/17 17:04:29 deraadt Exp $
+# $OpenBSD: vm.conf,v 1.11 2021/11/11 09:38:14 claudio Exp $
 
 #
 # Macros
@@ -11,8 +11,7 @@ sets="/var/www/htdocs/pub/OpenBSD/snapshots/amd64/"
 
 switch "uplink" {
        # This switch will use bridge0, defined by /etc/hostname.bridge0, as
-       # the underlying interface.  switch(4) is also supported
-       #interface switch0
+       # the underlying interface.  veb(4) is also supported
        interface bridge0
 }
 

diff --git a/etc/rc b/etc/rc
index 829511b..26c10aa 100644 (file)
--- a/etc/rc
+++ b/etc/rc
@@ -1,4 +1,4 @@
-#      $OpenBSD: rc,v 1.554 2021/09/01 08:15:53 deraadt Exp $
+#      $OpenBSD: rc,v 1.555 2021/11/11 09:38:14 claudio Exp $
 
 # System startup script run by init on autoboot or after single-user.
 # Output and error are redirected to console by init, and the console is the
@@ -596,7 +596,7 @@ echo 'preserving editor files.'; /usr/libexec/vi.recover
 run_upgrade_script sysmerge
 
 echo -n 'starting network daemons:'
-start_daemon ldomd sshd switchd snmpd ldpd ripd ospfd ospf6d bgpd ifstated
+start_daemon ldomd sshd snmpd ldpd ripd ospfd ospf6d bgpd ifstated
 start_daemon relayd dhcpd dhcrelay mrouted dvmrpd radiusd eigrpd route6d
 start_daemon rad hostapd lpd smtpd slowcgi httpd ftpd
 start_daemon ftpproxy ftpproxy6 tftpd tftpproxy identd inetd rarpd bootparamd

diff --git a/etc/rc.conf b/etc/rc.conf
index 66dbc1e..c2ea765 100644 (file)
--- a/etc/rc.conf
+++ b/etc/rc.conf
@@ -1,4 +1,4 @@
-#      $OpenBSD: rc.conf,v 1.224 2021/07/16 15:21:41 florian Exp $
+#      $OpenBSD: rc.conf,v 1.225 2021/11/11 09:38:14 claudio Exp $
 
 # DO NOT EDIT THIS FILE!!
 #
@@ -65,7 +65,6 @@ snmpd_flags=NO
 spamd_flags=NO         # also see spamd_black below
 spamlogd_flags=                # use eg. "-i interface" and see spamlogd(8)
 sshd_flags=
-switchd_flags=NO
 syslogd_flags=         # add more flags, e.g. "-u -a /chroot/dev/log"
 tftpd_flags=NO
 tftpproxy_flags=NO

diff --git a/etc/rc.d/switchd b/etc/rc.d/switchd
deleted file mode 100644 (file)
index bafb7c2..0000000
--- a/etc/rc.d/switchd
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/ksh
-#
-# $OpenBSD: switchd,v 1.4 2019/01/21 01:41:16 claudio Exp $
-
-daemon="/usr/sbin/switchd"
-
-. /etc/rc.d/rc.subr
-
-# Child will not return a config loading error to the parent.
-rc_pre() {
-       # use rcexec here since daemon_flags may contain arguments with spaces
-       ${rcexec} "${daemon} -n ${daemon_flags}"
-}
-
-rc_cmd $1