[Midnightbsd-cvs] src: etc/rc.d: switch to stop_boot switch to FILE_SYSTEMS
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Fri Oct 26 11:20:25 EDT 2007
Log Message:
-----------
switch to stop_boot
switch to FILE_SYSTEMS
Modified Files:
--------------
src/etc/rc.d:
ipmon (r1.2 -> r1.3)
ipsec (r1.2 -> r1.3)
isdnd (r1.3 -> r1.4)
kldxref (r1.2 -> r1.3)
mountcritlocal (r1.2 -> r1.3)
mountcritremote (r1.3 -> r1.4)
netif (r1.2 -> r1.3)
netoptions (r1.2 -> r1.3)
pf (r1.2 -> r1.3)
pflog (r1.3 -> r1.4)
pfsync (r1.2 -> r1.3)
power_profile (r1.2 -> r1.3)
root (r1.4 -> r1.5)
-------------- next part --------------
Index: isdnd
===================================================================
RCS file: /home/cvs/src/etc/rc.d/isdnd,v
retrieving revision 1.3
retrieving revision 1.4
diff -Letc/rc.d/isdnd -Letc/rc.d/isdnd -u -r1.3 -r1.4
--- etc/rc.d/isdnd
+++ etc/rc.d/isdnd
@@ -8,7 +8,7 @@
#
# PROVIDE: isdnd
-# REQUIRE: netif mountcritlocal cleanvar
+# REQUIRE: netif FILESYSTEMS cleanvar
# KEYWORD: nojail
. /etc/rc.subr
Index: kldxref
===================================================================
RCS file: /home/cvs/src/etc/rc.d/kldxref,v
retrieving revision 1.2
retrieving revision 1.3
diff -Letc/rc.d/kldxref -Letc/rc.d/kldxref -u -r1.2 -r1.3
--- etc/rc.d/kldxref
+++ etc/rc.d/kldxref
@@ -4,7 +4,7 @@
# $MidnightBSD$
# PROVIDE: kldxref
-# REQUIRE: root mountcritlocal
+# REQUIRE: FILESYSTEMS
# BEFORE: netif
# KEYWORD: nojail
Index: power_profile
===================================================================
RCS file: /home/cvs/src/etc/rc.d/power_profile,v
retrieving revision 1.2
retrieving revision 1.3
diff -Letc/rc.d/power_profile -Letc/rc.d/power_profile -u -r1.2 -r1.3
--- etc/rc.d/power_profile
+++ etc/rc.d/power_profile
@@ -10,7 +10,7 @@
#
# PROVIDE: power_profile
-# REQUIRE: mountcritlocal syslogd
+# REQUIRE: FILESYSTEMS syslogd
# KEYWORD: nojail nostart
. /etc/rc.subr
Index: pf
===================================================================
RCS file: /home/cvs/src/etc/rc.d/pf,v
retrieving revision 1.2
retrieving revision 1.3
diff -Letc/rc.d/pf -Letc/rc.d/pf -u -r1.2 -r1.3
--- etc/rc.d/pf
+++ etc/rc.d/pf
@@ -4,7 +4,7 @@
# $MidnightBSD$
# PROVIDE: pf
-# REQUIRE: root mountcritlocal netif pflog pfsync
+# REQUIRE: FILESYSTEMS netif pflog pfsync
# BEFORE: routing
# KEYWORD: nojail
Index: netoptions
===================================================================
RCS file: /home/cvs/src/etc/rc.d/netoptions,v
retrieving revision 1.2
retrieving revision 1.3
diff -Letc/rc.d/netoptions -Letc/rc.d/netoptions -u -r1.2 -r1.3
--- etc/rc.d/netoptions
+++ etc/rc.d/netoptions
@@ -4,7 +4,7 @@
# $MidnightBSD$
# PROVIDE: netoptions
-# REQUIRE: localpkg
+# REQUIRE: FILESYSTEMS
# BEFORE: securelevel
# KEYWORD: nojail
Index: ipsec
===================================================================
RCS file: /home/cvs/src/etc/rc.d/ipsec,v
retrieving revision 1.2
retrieving revision 1.3
diff -Letc/rc.d/ipsec -Letc/rc.d/ipsec -u -r1.2 -r1.3
--- etc/rc.d/ipsec
+++ etc/rc.d/ipsec
@@ -5,7 +5,7 @@
# $MidnightBSD$
# PROVIDE: ipsec
-# REQUIRE: root mountcritlocal
+# REQUIRE: FILESYSTEMS
# BEFORE: DAEMON mountcritremote
# KEYWORD: nojail
@@ -26,15 +26,7 @@
{
if [ ! -f "$ipsec_file" ]; then
warn "$ipsec_file not readable; ipsec start aborted."
- #
- # If booting directly to multiuser, send SIGTERM to
- # the parent (/etc/rc) to abort the boot
- #
- if [ "$autoboot" = yes ]; then
- echo "ERROR: ABORTING BOOT (sending SIGTERM to parent)!"
- kill -TERM $$
- exit 1
- fi
+ stop_boot
return 1
fi
return 0
Index: ipmon
===================================================================
RCS file: /home/cvs/src/etc/rc.d/ipmon,v
retrieving revision 1.2
retrieving revision 1.3
diff -Letc/rc.d/ipmon -Letc/rc.d/ipmon -u -r1.2 -r1.3
--- etc/rc.d/ipmon
+++ etc/rc.d/ipmon
@@ -5,7 +5,7 @@
# $MidnightBSD$
# PROVIDE: ipmon
-# REQUIRE: mountcritlocal hostname sysctl cleanvar ipfilter
+# REQUIRE: FILESYSTEMS hostname sysctl cleanvar ipfilter
# BEFORE: SERVERS
# KEYWORD: nojail
Index: mountcritremote
===================================================================
RCS file: /home/cvs/src/etc/rc.d/mountcritremote,v
retrieving revision 1.3
retrieving revision 1.4
diff -Letc/rc.d/mountcritremote -Letc/rc.d/mountcritremote -u -r1.3 -r1.4
--- etc/rc.d/mountcritremote
+++ etc/rc.d/mountcritremote
@@ -1,10 +1,10 @@
-#!/bin/sh
+#/bin/sh
#
# $FreeBSD: src/etc/rc.d/mountcritremote,v 1.11.2.2 2006/01/08 09:21:53 rse Exp $
# $MidnightBSD$
# PROVIDE: mountcritremote
-# REQUIRE: NETWORKING root mountcritlocal cleanvar ipsec
+# REQUIRE: NETWORKING FILESYSTEMS cleanvar ipsec
# KEYWORD: nojail
. /etc/rc.subr
Index: pfsync
===================================================================
RCS file: /home/cvs/src/etc/rc.d/pfsync,v
retrieving revision 1.2
retrieving revision 1.3
diff -Letc/rc.d/pfsync -Letc/rc.d/pfsync -u -r1.2 -r1.3
--- etc/rc.d/pfsync
+++ etc/rc.d/pfsync
@@ -5,7 +5,7 @@
#
# PROVIDE: pfsync
-# REQUIRE: root mountcritlocal netif
+# REQUIRE: FILESYSTEMS netif
# KEYWORD: nojail
. /etc/rc.subr
Index: mountcritlocal
===================================================================
RCS file: /home/cvs/src/etc/rc.d/mountcritlocal,v
retrieving revision 1.2
retrieving revision 1.3
diff -Letc/rc.d/mountcritlocal -Letc/rc.d/mountcritlocal -u -r1.2 -r1.3
--- etc/rc.d/mountcritlocal
+++ etc/rc.d/mountcritlocal
@@ -41,7 +41,7 @@
*)
echo 'Mounting /etc/fstab filesystems failed,' \
' startup aborted'
- kill -QUIT $$
+ stop_boot true
;;
esac
}
Index: root
===================================================================
RCS file: /home/cvs/src/etc/rc.d/root,v
retrieving revision 1.4
retrieving revision 1.5
diff -Letc/rc.d/root -Letc/rc.d/root -u -r1.4 -r1.5
--- etc/rc.d/root
+++ etc/rc.d/root
@@ -24,7 +24,7 @@
*)
if ! mount -uw /; then
echo 'Mounting root filesystem rw failed, startup aborted'
- /bin/kill -QUIT $$
+ stop_boot true
fi
;;
esac
Index: pflog
===================================================================
RCS file: /home/cvs/src/etc/rc.d/pflog,v
retrieving revision 1.3
retrieving revision 1.4
diff -Letc/rc.d/pflog -Letc/rc.d/pflog -u -r1.3 -r1.4
--- etc/rc.d/pflog
+++ etc/rc.d/pflog
@@ -4,7 +4,7 @@
# $MidnightBSD$
# PROVIDE: pflog
-# REQUIRE: root mountcritlocal netif cleanvar
+# REQUIRE: FILESYSTEMS netif cleanvar
# KEYWORD: nojail
. /etc/rc.subr
Index: netif
===================================================================
RCS file: /home/cvs/src/etc/rc.d/netif,v
retrieving revision 1.2
retrieving revision 1.3
diff -Letc/rc.d/netif -Letc/rc.d/netif -u -r1.2 -r1.3
--- etc/rc.d/netif
+++ etc/rc.d/netif
@@ -26,7 +26,7 @@
# $MidnightBSD$
# PROVIDE: netif
-# REQUIRE: atm1 ipfilter mountcritlocal pccard serial sppp sysctl
+# REQUIRE: atm1 cleanvar ipfilter FILESYSTEMS pccard serial sppp sysctl
# KEYWORD: nojail
. /etc/rc.subr
More information about the Midnightbsd-cvs
mailing list