From 65d4bf1aff8713406d8f95131d3ed441080a529d Mon Sep 17 00:00:00 2001 From: mtm Date: Fri, 18 Apr 2003 17:55:05 +0000 Subject: o Hook the new files up to the build. o Make sure all the scripts reference rc.d/netif and not rc.d/network1 Approved by: markm (mentor) --- etc/rc.d/Makefile | 12 ++++++------ etc/rc.d/NETWORKING | 2 +- etc/rc.d/adjkerntz | 2 +- etc/rc.d/atm1 | 2 +- etc/rc.d/atm2 | 2 +- etc/rc.d/atm2.sh | 2 +- etc/rc.d/cleanvar | 2 +- etc/rc.d/isdnd | 2 +- etc/rc.d/kldxref | 2 +- etc/rc.d/mrouted | 2 +- etc/rc.d/network2 | 2 +- etc/rc.d/ppp | 2 +- etc/rc.d/ppp-user | 2 +- etc/rc.d/random | 2 +- etc/rc.d/routed | 2 +- etc/rc.d/routing | 2 +- etc/rc.d/sppp | 2 +- 17 files changed, 22 insertions(+), 22 deletions(-) (limited to 'etc') diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile index 64ccf76..190305f 100755 --- a/etc/rc.d/Makefile +++ b/etc/rc.d/Makefile @@ -5,12 +5,12 @@ FILES= DAEMON LOGIN NETWORKING SERVERS abi accounting addswap adjkerntz amd \ apm apmd atm1 atm2.sh atm3.sh archdep bgfsck bootparams ccd cleanvar \ - cleartmp cron devd devdb devfs diskless dmesg dumpon fsck inetd \ - initdiskless initrandom ip6fw ipfilter ipfw ipmon ipnat ipsec \ - ipxrouted isdnd jail kadmind kerberos keyserv kldxref ldconfig local \ - localdaemons lomac lpd motd mountcritlocal mountcritremote \ - mountd moused mroute6d mrouted msgs named network1 network2 \ - network3 network_ipv6 nfsclient nfsd nfslocking nfsserver ntpd \ + cleartmp cron devd devdb devfs dhclient diskless dmesg dumpon fsck \ + hostname inetd initdiskless initrandom ip6fw ipfilter ipfw ipmon ipnat \ + ipsec ipxrouted isdnd jail kadmind kerberos keyserv kldxref ldconfig \ + local localdaemons lomac lpd motd mountcritlocal mountcritremote \ + mountd moused mroute6d mrouted msgs named netif network2 network3 \ + network_ipv6 nfsclient nfsd nfslocking nfsserver nisdomain ntpd \ ntpdate othermta pccard pcvt ppp-user pppoed pwcheck quota random \ rarpd rcconf.sh root route6d routed rpcbind rtadvd rwho savecore \ securelevel sendmail serial sppp sshd swap1 syscons sysctl \ diff --git a/etc/rc.d/NETWORKING b/etc/rc.d/NETWORKING index abce689..0a3b2ae 100644 --- a/etc/rc.d/NETWORKING +++ b/etc/rc.d/NETWORKING @@ -5,7 +5,7 @@ # # PROVIDE: NETWORKING NETWORK -# REQUIRE: network dhclient altqd network1 network2 network_ipv6 isdnd ppp-user +# REQUIRE: network dhclient altqd netif network2 network_ipv6 isdnd ppp-user # REQUIRE: routed mrouted route6d mroute6d # KEYWORD: FreeBSD NetBSD diff --git a/etc/rc.d/adjkerntz b/etc/rc.d/adjkerntz index 654c157..c67784c 100644 --- a/etc/rc.d/adjkerntz +++ b/etc/rc.d/adjkerntz @@ -5,7 +5,7 @@ # PROVIDE: adjkerntz # REQUIRE: diskless mountcritlocal random -# BEFORE: network1 +# BEFORE: netif # KEYWORD: FreeBSD . /etc/rc.subr diff --git a/etc/rc.d/atm1 b/etc/rc.d/atm1 index eb3dc62..5c4426a 100644 --- a/etc/rc.d/atm1 +++ b/etc/rc.d/atm1 @@ -29,7 +29,7 @@ # PROVIDE: atm1 # REQUIRE: root -# BEFORE: network1 +# BEFORE: netif # KEYWORD: FreeBSD . /etc/rc.subr diff --git a/etc/rc.d/atm2 b/etc/rc.d/atm2 index 762c77c..12acdcd 100644 --- a/etc/rc.d/atm2 +++ b/etc/rc.d/atm2 @@ -28,7 +28,7 @@ # # PROVIDE: atm2 -# REQUIRE: atm1 network1 +# REQUIRE: atm1 netif # BEFORE: network2 # KEYWORD: FreeBSD diff --git a/etc/rc.d/atm2.sh b/etc/rc.d/atm2.sh index 762c77c..12acdcd 100644 --- a/etc/rc.d/atm2.sh +++ b/etc/rc.d/atm2.sh @@ -28,7 +28,7 @@ # # PROVIDE: atm2 -# REQUIRE: atm1 network1 +# REQUIRE: atm1 netif # BEFORE: network2 # KEYWORD: FreeBSD diff --git a/etc/rc.d/cleanvar b/etc/rc.d/cleanvar index 6ad92a2..65dcd48 100644 --- a/etc/rc.d/cleanvar +++ b/etc/rc.d/cleanvar @@ -5,7 +5,7 @@ # PROVIDE: cleanvar # REQUIRE: adjkerntz mountcritlocal -# BEFORE: network1 +# BEFORE: netif # KEYWORD: FreeBSD purgedir() diff --git a/etc/rc.d/isdnd b/etc/rc.d/isdnd index ce019a9..fb79579 100644 --- a/etc/rc.d/isdnd +++ b/etc/rc.d/isdnd @@ -7,7 +7,7 @@ # # PROVIDE: isdnd -# REQUIRE: network1 mountcritlocal +# REQUIRE: netif mountcritlocal # KEYWORD: FreeBSD NetBSD . /etc/rc.subr diff --git a/etc/rc.d/kldxref b/etc/rc.d/kldxref index 8b93e37..5ec5e8c 100644 --- a/etc/rc.d/kldxref +++ b/etc/rc.d/kldxref @@ -5,7 +5,7 @@ # PROVIDE: kldxref # REQUIRE: root mountcritlocal -# BEFORE: network1 +# BEFORE: netif # KEYWORD: FreeBSD . /etc/rc.subr diff --git a/etc/rc.d/mrouted b/etc/rc.d/mrouted index 2b7d675..b593988 100755 --- a/etc/rc.d/mrouted +++ b/etc/rc.d/mrouted @@ -5,7 +5,7 @@ # # PROVIDE: mrouted -# REQUIRE: network1 network2 +# REQUIRE: netif network2 # KEYWORD: FreeBSD NetBSD . /etc/rc.subr diff --git a/etc/rc.d/network2 b/etc/rc.d/network2 index abeea16..6478ab2 100644 --- a/etc/rc.d/network2 +++ b/etc/rc.d/network2 @@ -6,7 +6,7 @@ # # PROVIDE: network2 -# REQUIRE: network1 ppp-user +# REQUIRE: netif ppp-user # KEYWORD: FreeBSD . /etc/rc.subr diff --git a/etc/rc.d/ppp b/etc/rc.d/ppp index 37071d7..fa5c7c8 100644 --- a/etc/rc.d/ppp +++ b/etc/rc.d/ppp @@ -4,7 +4,7 @@ # # PROVIDE: ppp-user -# REQUIRE: network1 isdnd +# REQUIRE: netif isdnd # KEYWORD: FreeBSD . /etc/rc.subr diff --git a/etc/rc.d/ppp-user b/etc/rc.d/ppp-user index 37071d7..fa5c7c8 100644 --- a/etc/rc.d/ppp-user +++ b/etc/rc.d/ppp-user @@ -4,7 +4,7 @@ # # PROVIDE: ppp-user -# REQUIRE: network1 isdnd +# REQUIRE: netif isdnd # KEYWORD: FreeBSD . /etc/rc.subr diff --git a/etc/rc.d/random b/etc/rc.d/random index f024348..99de54b 100644 --- a/etc/rc.d/random +++ b/etc/rc.d/random @@ -5,7 +5,7 @@ # PROVIDE: random # REQUIRE: diskless mountcritlocal initrandom -# BEFORE: network1 +# BEFORE: netif # KEYWORD: FreeBSD shutdown . /etc/rc.subr diff --git a/etc/rc.d/routed b/etc/rc.d/routed index d41a117..892967c 100755 --- a/etc/rc.d/routed +++ b/etc/rc.d/routed @@ -5,7 +5,7 @@ # # PROVIDE: routed -# REQUIRE: network1 network2 +# REQUIRE: netif network2 # KEYWORD: FreeBSD NetBSD . /etc/rc.subr diff --git a/etc/rc.d/routing b/etc/rc.d/routing index abeea16..6478ab2 100644 --- a/etc/rc.d/routing +++ b/etc/rc.d/routing @@ -6,7 +6,7 @@ # # PROVIDE: network2 -# REQUIRE: network1 ppp-user +# REQUIRE: netif ppp-user # KEYWORD: FreeBSD . /etc/rc.subr diff --git a/etc/rc.d/sppp b/etc/rc.d/sppp index 0080fc7..4ade9cd 100644 --- a/etc/rc.d/sppp +++ b/etc/rc.d/sppp @@ -5,7 +5,7 @@ # PROVIDE: sppp # REQUIRE: root -# BEFORE: network1 +# BEFORE: netif # KEYWORD: FreeBSD . /etc/rc.subr -- cgit v1.1