[Midnightbsd-cvs] src: etc/rc.d: run the firewall script in another shell
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Fri Oct 26 10:12:40 EDT 2007
Log Message:
-----------
run the firewall script in another shell
Modified Files:
--------------
src/etc/rc.d:
Makefile (r1.7 -> r1.8)
NETWORKING (r1.2 -> r1.3)
addswap (r1.2 -> r1.3)
adjkerntz (r1.2 -> r1.3)
amd (r1.4 -> r1.5)
bootconf.sh (r1.2 -> r1.3)
fsck (r1.2 -> r1.3)
geli2 (r1.2 -> r1.3)
hostname (r1.2 -> r1.3)
ip6addrctl (r1.2 -> r1.3)
ipfilter (r1.2 -> r1.3)
ipfw (r1.4 -> r1.5)
-------------- next part --------------
Index: NETWORKING
===================================================================
RCS file: /home/cvs/src/etc/rc.d/NETWORKING,v
retrieving revision 1.2
retrieving revision 1.3
diff -Letc/rc.d/NETWORKING -Letc/rc.d/NETWORKING -u -r1.2 -r1.3
--- etc/rc.d/NETWORKING
+++ etc/rc.d/NETWORKING
@@ -5,8 +5,8 @@
# $MidnightBSD$
# PROVIDE: NETWORKING NETWORK
-# REQUIRE: netif routing network_ipv6 isdnd ppp
-# REQUIRE: routed mrouted route6d mroute6d
+# REQUIRE: netif netoptions routing network_ipv6 isdnd ppp
+# REQUIRE: routed mrouted route6d mroute6d resolv
# This is a dummy dependency, for services which require networking
# to be operational before starting.
Index: geli2
===================================================================
RCS file: /home/cvs/src/etc/rc.d/geli2,v
retrieving revision 1.2
retrieving revision 1.3
diff -Letc/rc.d/geli2 -Letc/rc.d/geli2 -u -r1.2 -r1.3
--- etc/rc.d/geli2
+++ etc/rc.d/geli2
@@ -28,7 +28,7 @@
# $MidnightBSD$
# PROVIDE: geli2
-# REQUIRE: mountcritlocal
+# REQUIRE: FILESYSTEMS
# KEYWORD: nojail
. /etc/rc.subr
Index: hostname
===================================================================
RCS file: /home/cvs/src/etc/rc.d/hostname,v
retrieving revision 1.2
retrieving revision 1.3
diff -Letc/rc.d/hostname -Letc/rc.d/hostname -u -r1.2 -r1.3
--- etc/rc.d/hostname
+++ etc/rc.d/hostname
@@ -27,7 +27,7 @@
# $MidnightBSD$
# PROVIDE: hostname
-# REQUIRE: mountcritlocal
+# REQUIRE: FILESYSTEMS
# BEFORE: netif
. /etc/rc.subr
Index: fsck
===================================================================
RCS file: /home/cvs/src/etc/rc.d/fsck,v
retrieving revision 1.2
retrieving revision 1.3
diff -Letc/rc.d/fsck -Letc/rc.d/fsck -u -r1.2 -r1.3
--- etc/rc.d/fsck
+++ etc/rc.d/fsck
@@ -14,17 +14,6 @@
start_cmd="fsck_start"
stop_cmd=":"
-stop_boot()
-{
- # Terminate the process (which may include the parent /etc/rc)
- # if booting directly to multiuser mode.
- #
- if [ "$autoboot" = yes ]; then
- kill -TERM $$
- fi
- exit 1
-}
-
fsck_start()
{
if [ "$autoboot" = no ]; then
Index: addswap
===================================================================
RCS file: /home/cvs/src/etc/rc.d/addswap,v
retrieving revision 1.2
retrieving revision 1.3
diff -Letc/rc.d/addswap -Letc/rc.d/addswap -u -r1.2 -r1.3
--- etc/rc.d/addswap
+++ etc/rc.d/addswap
@@ -7,7 +7,7 @@
#
# PROVIDE: addswap
-# REQUIRE: mountcritlocal
+# REQUIRE: FILESYSTEMS
# BEFORE: sysctl
# KEYWORD: nojail
Index: ip6addrctl
===================================================================
RCS file: /home/cvs/src/etc/rc.d/ip6addrctl,v
retrieving revision 1.2
retrieving revision 1.3
diff -Letc/rc.d/ip6addrctl -Letc/rc.d/ip6addrctl -u -r1.2 -r1.3
--- etc/rc.d/ip6addrctl
+++ etc/rc.d/ip6addrctl
@@ -4,7 +4,7 @@
# $MidnightBSD$
# PROVIDE: ip6addrctl
-# REQUIRE: mountcritlocal netif
+# REQUIRE: FILESYSTEMS netif
# BEFORE: network_ipv6
# KEYWORD: nojail
Index: amd
===================================================================
RCS file: /home/cvs/src/etc/rc.d/amd,v
retrieving revision 1.4
retrieving revision 1.5
diff -Letc/rc.d/amd -Letc/rc.d/amd -u -r1.4 -r1.5
--- etc/rc.d/amd
+++ etc/rc.d/amd
@@ -34,7 +34,7 @@
[Nn][Oo] | '')
;;
*)
- rc_flags="${rc_flags} `eval ${amd_map_program}`"
+ rc_flags="${rc_flags} `echo $(eval ${amd_map_program})`"
;;
esac
@@ -46,7 +46,8 @@
fi
;;
*)
- rc_flags="-p ${rc_flags} > /var/run/amd.pid 2> /dev/null"
+ rc_flags="-p ${rc_flags}"
+ command_args=" > /var/run/amd.pid 2> /dev/null"
;;
esac
return 0
Index: ipfilter
===================================================================
RCS file: /home/cvs/src/etc/rc.d/ipfilter,v
retrieving revision 1.2
retrieving revision 1.3
diff -Letc/rc.d/ipfilter -Letc/rc.d/ipfilter -u -r1.2 -r1.3
--- etc/rc.d/ipfilter
+++ etc/rc.d/ipfilter
@@ -5,7 +5,7 @@
# $MidnightBSD$
# PROVIDE: ipfilter
-# REQUIRE: root mountcritlocal
+# REQUIRE: FILESYSTEMS
# BEFORE: netif
# KEYWORD: nojail
Index: ipfw
===================================================================
RCS file: /home/cvs/src/etc/rc.d/ipfw,v
retrieving revision 1.4
retrieving revision 1.5
diff -Letc/rc.d/ipfw -Letc/rc.d/ipfw -u -r1.4 -r1.5
--- etc/rc.d/ipfw
+++ etc/rc.d/ipfw
@@ -38,7 +38,7 @@
if [ -f /etc/rc.d/natd ] ; then
/etc/rc.d/natd start
fi
- . "${firewall_script}"
+ /bin/sh "${firewall_script}"
echo 'Firewall rules loaded.'
elif [ "`ipfw list 65535`" = "65535 deny ip from any to any" ]; then
echo 'Warning: kernel has firewall functionality, but' \
Index: adjkerntz
===================================================================
RCS file: /home/cvs/src/etc/rc.d/adjkerntz,v
retrieving revision 1.2
retrieving revision 1.3
diff -Letc/rc.d/adjkerntz -Letc/rc.d/adjkerntz -u -r1.2 -r1.3
--- etc/rc.d/adjkerntz
+++ etc/rc.d/adjkerntz
@@ -5,7 +5,7 @@
#
# PROVIDE: adjkerntz
-# REQUIRE: mountcritlocal random
+# REQUIRE: FILESYSTEMS random
# BEFORE: netif
# KEYWORD: nojail
Index: Makefile
===================================================================
RCS file: /home/cvs/src/etc/rc.d/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -Letc/rc.d/Makefile -Letc/rc.d/Makefile -u -r1.7 -r1.8
--- etc/rc.d/Makefile
+++ etc/rc.d/Makefile
@@ -2,9 +2,9 @@
# $FreeBSD: src/etc/rc.d/Makefile,v 1.53.2.8 2006/02/12 22:13:15 flz Exp $
# $MidnightBSD$
-FILES= DAEMON LOGIN NETWORKING SERVERS \
+FILES= DAEMON FILESYSTEMS LOGIN NETWORKING SERVERS \
abi accounting addswap adjkerntz amd \
- apm apmd archdep atm1 atm2 atm3 \
+ apm apmd archdep atm1 atm2 atm3 auto_linklocal \
bgfsck bluetooth bootparams bsnmpd \
ccd cleanvar cleartmp cron \
devd devfs dhclient \
Index: bootconf.sh
===================================================================
RCS file: /home/cvs/src/etc/rc.d/bootconf.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -Letc/rc.d/bootconf.sh -Letc/rc.d/bootconf.sh -u -r1.2 -r1.3
--- etc/rc.d/bootconf.sh
+++ etc/rc.d/bootconf.sh
@@ -5,7 +5,7 @@
# $MidnightBSD$
# PROVIDE: bootconf
-# REQUIRE: mountcritlocal
+# REQUIRE: FILESYSTEMS
bootconf_start()
{
More information about the Midnightbsd-cvs
mailing list