From 82431b7506d646165d52f11bc2958e8ce8ec5cce Mon Sep 17 00:00:00 2001
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Mon, 12 Apr 2021 14:38:16 +0100
Subject: [PATCH] rc: remove the 'archdep' script

It was unused since 405c3050f10, which removed iBCS support.

This also moves the 'linux' rc script slightly earlier, which
might help in some setups.  The original version of this patch
moved it even more, before 'mountcritlocal', which would fixe
mount(8) errors due to missing /dev/shm in setups with entries
for /path/to/chroot/dev/shm without the "late" flag; however,
in the end 'kldxref' turned out to depend on 'mountcritlocal'
anyway.

Reported By:	pstef
Reviewed By:	dchagin
Sponsored By:	EPSRC
Differential Revision:	https://reviews.freebsd.org/D29590
---
 ObsoleteFiles.inc        |  3 +++
 libexec/rc/rc.d/Makefile |  1 -
 libexec/rc/rc.d/archdep  | 26 --------------------------
 libexec/rc/rc.d/linux    |  2 +-
 libexec/rc/rc.d/sysvipc  |  2 +-
 5 files changed, 5 insertions(+), 29 deletions(-)
 delete mode 100755 libexec/rc/rc.d/archdep

diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index 373e014ba07..1019436f1e2 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -40,6 +40,9 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20210410: remove unused libexec/rc.d/archdep
+OLD_FILES+=etc/rc.d/archdep
+
 # 20210408: remove tcp_hostcache.h
 OLD_FILES+=usr/include/netinet/tcp_hostcache.h
 
diff --git a/libexec/rc/rc.d/Makefile b/libexec/rc/rc.d/Makefile
index 1a61e89aa21..7b15cab40bb 100644
--- a/libexec/rc/rc.d/Makefile
+++ b/libexec/rc/rc.d/Makefile
@@ -13,7 +13,6 @@ CONFS=	DAEMON \
 	SERVERS \
 	addswap \
 	adjkerntz \
-	archdep \
 	bgfsck \
 	${_blacklistd} \
 	bridge \
diff --git a/libexec/rc/rc.d/archdep b/libexec/rc/rc.d/archdep
deleted file mode 100755
index 52a7ac684ee..00000000000
--- a/libexec/rc/rc.d/archdep
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# PROVIDE: archdep
-# REQUIRE: mountcritremote
-# KEYWORD: nojail
-
-. /etc/rc.subr
-
-name="archdep"
-start_cmd="archdep_start"
-stop_cmd=":"
-
-archdep_start()
-{
-	local _arch
-
-	_arch=`${SYSCTL_N} hw.machine_arch`
-	case $_arch in
-	esac
-}
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/libexec/rc/rc.d/linux b/libexec/rc/rc.d/linux
index c9c45ba8b33..882cf401249 100755
--- a/libexec/rc/rc.d/linux
+++ b/libexec/rc/rc.d/linux
@@ -4,7 +4,7 @@
 #
 
 # PROVIDE: linux
-# REQUIRE: archdep
+# REQUIRE: kldxref
 # KEYWORD: nojail
 
 . /etc/rc.subr
diff --git a/libexec/rc/rc.d/sysvipc b/libexec/rc/rc.d/sysvipc
index 0effbe7e22c..bbec47d75e2 100755
--- a/libexec/rc/rc.d/sysvipc
+++ b/libexec/rc/rc.d/sysvipc
@@ -4,7 +4,7 @@
 #
 
 # PROVIDE: sysvipc
-# REQUIRE: archdep
+# REQUIRE: kldxref
 # KEYWORD: nojail
 
 . /etc/rc.subr