From 9567e13ef347ebe9b1c2d20d727e94f8818f8418 Mon Sep 17 00:00:00 2001
From: Fabian Keil <fk@fabiankeil.de>
Date: Mon, 11 Apr 2016 11:45:44 +0200
Subject: [PATCH 133/325] etc/rc.d: Remove a couple of requirements that don't
 apply to ElectroBSD

Obtained from: ElectroBSD
---
 libexec/rc/rc.d/NETWORKING  |  4 ++--
 libexec/rc/rc.d/bridge      |  2 +-
 libexec/rc/rc.d/ipfw        |  1 -
 libexec/rc/rc.d/ipnat       | 28 ----------------------------
 libexec/rc/rc.d/netif       |  6 +++---
 libexec/rc/rc.d/routing     |  2 +-
 libexec/rc/rc.d/securelevel |  2 +-
 7 files changed, 8 insertions(+), 37 deletions(-)
 delete mode 100755 libexec/rc/rc.d/ipnat

diff --git a/libexec/rc/rc.d/NETWORKING b/libexec/rc/rc.d/NETWORKING
index 9cdb5577ed2b..1bbea5aa40b9 100755
--- a/libexec/rc/rc.d/NETWORKING
+++ b/libexec/rc/rc.d/NETWORKING
@@ -4,8 +4,8 @@
 #
 
 # PROVIDE: NETWORKING NETWORK
-# REQUIRE: netif netwait netoptions routing ppp ipfw stf
-# REQUIRE: defaultroute route6d resolv bridge
+# REQUIRE: netif netwait netoptions routing ipfw stf
+# REQUIRE: defaultroute routed route6d resolv bridge
 # REQUIRE: static_arp static_ndp
 
 #	This is a dummy dependency, for services which require networking
diff --git a/libexec/rc/rc.d/bridge b/libexec/rc/rc.d/bridge
index 95e4eb9c2fac..8631fdab2b05 100755
--- a/libexec/rc/rc.d/bridge
+++ b/libexec/rc/rc.d/bridge
@@ -26,7 +26,7 @@
 #
 
 # PROVIDE: bridge
-# REQUIRE: netif ppp stf
+# REQUIRE: netif stf
 # KEYWORD: nojail
 
 . /etc/rc.subr
diff --git a/libexec/rc/rc.d/ipfw b/libexec/rc/rc.d/ipfw
index 5d0bcc816560..69f034987c07 100755
--- a/libexec/rc/rc.d/ipfw
+++ b/libexec/rc/rc.d/ipfw
@@ -4,7 +4,6 @@
 #
 
 # PROVIDE: ipfw
-# REQUIRE: ppp
 # KEYWORD: nojailvnet
 
 . /etc/rc.subr
diff --git a/libexec/rc/rc.d/ipnat b/libexec/rc/rc.d/ipnat
deleted file mode 100755
index d4fa6b65dff4..000000000000
--- a/libexec/rc/rc.d/ipnat
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# PROVIDE: ipnat
-# KEYWORD: nojailvnet
-
-. /etc/rc.subr
-
-name="ipnat"
-desc="user interface to the NAT subsystem"
-rcvar="ipnat_enable"
-load_rc_config $name
-start_cmd="ipnat_start"
-stop_cmd="${ipnat_program} -F -C"
-reload_cmd="${ipnat_program} -F -C -f ${ipnat_rules}"
-extra_commands="reload"
-required_files="${ipnat_rules}"
-required_modules="ipl:ipfilter"
-
-ipnat_start()
-{
-	echo "Installing NAT rules."
-	${ipnat_program} -CF -f ${ipnat_rules} ${ipnat_flags}
-}
-
-run_rc_command "$1"
diff --git a/libexec/rc/rc.d/netif b/libexec/rc/rc.d/netif
index ff6962a1198e..bf7bfcee1353 100755
--- a/libexec/rc/rc.d/netif
+++ b/libexec/rc/rc.d/netif
@@ -26,9 +26,9 @@
 #
 
 # PROVIDE: netif
-# REQUIRE: FILESYSTEMS iovctl serial sppp sysctl
-# REQUIRE: hostid ipfs
-# KEYWORD: nojailvnet
+# REQUIRE: FILESYSTEMS iovctl serial sysctl
+# REQUIRE: hostid
+# KEYWORD: nojailvnet shutdown
 
 . /etc/rc.subr
 . /etc/network.subr
diff --git a/libexec/rc/rc.d/routing b/libexec/rc/rc.d/routing
index e909523ab709..f65de7be30d2 100755
--- a/libexec/rc/rc.d/routing
+++ b/libexec/rc/rc.d/routing
@@ -6,7 +6,7 @@
 #
 
 # PROVIDE: routing
-# REQUIRE: netif ppp stf
+# REQUIRE: netif stf
 # KEYWORD: nojailvnet
 
 . /etc/rc.subr
diff --git a/libexec/rc/rc.d/securelevel b/libexec/rc/rc.d/securelevel
index 8bb09dd920bd..f25841afcffd 100755
--- a/libexec/rc/rc.d/securelevel
+++ b/libexec/rc/rc.d/securelevel
@@ -4,7 +4,7 @@
 #
 
 # PROVIDE: securelevel
-# REQUIRE: adjkerntz ipfw pf sysctl_lastload
+# REQUIRE: adjkerntz pf sysctl_lastload
 
 . /etc/rc.subr
 
-- 
2.32.0