jailed-etc.patch

belczyk, 03/19/2006 09:23 PM

Download (24 KB)

View differences:

rc 19 Mar 2006 20:35:24 -0000
66 66
	_boot="start"
67 67
fi
68 68

  
69
files=`rcorder -s nostart /etc/rc.d/* 2>/dev/null`
69
skip="-s nostart"
70
[ `/sbin/sysctl -n jail.jailed` -eq 1 ] && skip="$skip -s nojail"
71
files=`rcorder ${skip} /etc/rc.d/* 2>/dev/null`
72

  
70 73

  
71 74
for _rc_elem in ${files}; do
72 75
	run_rc_script ${_rc_elem} ${_boot}
rc.d/abi 13 Mar 2006 18:30:58 -0000
7 7
# PROVIDE: abi
8 8
# REQUIRE: LOGIN
9 9
# BEFORE:  securelevel
10
# KEYWORD: nojail
10 11

  
11 12
. /etc/rc.subr
12 13

  
rc.d/accounting 13 Mar 2006 18:31:06 -0000
8 8
# PROVIDE: accounting
9 9
# REQUIRE: mountcritremote
10 10
# BEFORE: DAEMON
11
# KEYWORD: nojail
11 12

  
12 13
. /etc/rc.subr
13 14

  
rc.d/addswap 13 Mar 2006 18:31:12 -0000
9 9
# PROVIDE: addswap
10 10
# REQUIRE: mountcritlocal
11 11
# BEFORE: sysctl
12
# KEYWORD: nojail
12 13

  
13 14
. /etc/rc.subr
14 15

  
rc.d/adjkerntz 13 Mar 2006 18:31:18 -0000
7 7
# PROVIDE: adjkerntz
8 8
# REQUIRE: diskless mountcritlocal random
9 9
# BEFORE: netif
10
# KEYWORD: nojail
10 11

  
11 12
. /etc/rc.subr
12 13

  
rc.d/amd 13 Mar 2006 18:31:23 -0000
8 8
# PROVIDE: amd
9 9
# REQUIRE: rpcbind mountcritremote ypbind nfsclient
10 10
# BEFORE: DAEMON
11
# KEYWORD: nojail
11 12

  
12 13
. /etc/rc.subr
13 14

  
rc.d/apm 13 Mar 2006 18:31:29 -0000
7 7
# PROVIDE: apm
8 8
# REQUIRE: DAEMON
9 9
# BEFORE:  LOGIN
10
# KEYWORD: nojail
10 11

  
11 12
. /etc/rc.subr
12 13

  
rc.d/apmd 13 Mar 2006 18:31:34 -0000
8 8
# PROVIDE: apmd
9 9
# REQUIRE: DAEMON apm
10 10
# BEFORE:  LOGIN
11
# KEYWORD: nojail
11 12

  
12 13
. /etc/rc.subr
13 14

  
rc.d/archdep 13 Mar 2006 18:31:39 -0000
7 7
# PROVIDE: archdep
8 8
# REQUIRE: LOGIN
9 9
# BEFORE: abi
10
# KEYWORD: nojail
10 11

  
11 12
. /etc/rc.subr
12 13

  
rc.d/atm1 13 Mar 2006 18:31:48 -0000
31 31
# PROVIDE: atm1
32 32
# REQUIRE: root
33 33
# BEFORE: netif
34
# KEYWORD: nojail
34 35

  
35 36
. /etc/rc.subr
36 37

  
rc.d/battd 13 Mar 2006 18:31:52 -0000
6 6
# PROVIDE: battd
7 7
# REQUIRE: DAEMON apm
8 8
# BEFORE:  LOGIN
9
# KEYWORD: nojail
9 10

  
10 11
. /etc/rc.subr
11 12

  
rc.d/bootparams 13 Mar 2006 18:31:59 -0000
8 8
# PROVIDE: bootparams
9 9
# REQUIRE: rpcbind DAEMON
10 10
# BEFORE:  LOGIN
11
# KEYWORD: nojail
11 12

  
12 13
. /etc/rc.subr
13 14

  
rc.d/ccd 13 Mar 2006 18:32:03 -0000
6 6
#
7 7

  
8 8
# PROVIDE: disks
9
# KEYWORD: nojail
9 10

  
10 11
. /etc/rc.subr
11 12

  
rc.d/dhclient 13 Mar 2006 18:32:12 -0000
8 8
# PROVIDE: dhclient
9 9
# REQUIRE: netif mountcritlocal
10 10
# BEFORE:  NETWORKING
11
# KEYWORD: nojail
11 12
#
12 13
#	Note that there no syslog logging of dhclient messages at boot because
13 14
#	dhclient needs to start before services that syslog depends upon do.
rc.d/dmesg 13 Mar 2006 18:32:24 -0000
8 8
# PROVIDE: dmesg
9 9
# REQUIRE: mountcritremote
10 10
# BEFORE:  DAEMON
11
# KEYWORD: Daemon
11
# KEYWORD: Daemon nojail
12 12

  
13 13
. /etc/rc.subr
14 14

  
rc.d/dumpon 13 Mar 2006 18:32:33 -0000
7 7
# PROVIDE: dumpon
8 8
# REQUIRE: initrandom
9 9
# BEFORE: disks savecore
10
# KEYWORD: nojail
10 11

  
11 12
. /etc/rc.subr
12 13

  
rc.d/fsck 13 Mar 2006 18:32:38 -0000
7 7

  
8 8
# PROVIDE: fsck
9 9
# REQUIRE: localswap
10
# KEYWORD: nojail
10 11

  
11 12
. /etc/rc.subr
12 13

  
rc.d/initdiskless 13 Mar 2006 18:32:57 -0000
28 28
# $DragonFly: src/etc/rc.d/initdiskless,v 1.7 2005/11/19 21:47:32 swildner Exp $
29 29
#
30 30
# PROVIDE: initdiskless
31
# KEYWORD: nojail
31 32

  
32 33
. /etc/rc.subr
33 34
dummy_rc_command "$1"
rc.d/initrandom 13 Mar 2006 18:33:02 -0000
7 7
# PROVIDE: initrandom
8 8
# REQUIRE: initdiskless
9 9
# BEFORE: disks
10
# KEYWORD: nojail
10 11

  
11 12
. /etc/rc.subr
12 13

  
rc.d/ip6fw 13 Mar 2006 18:33:08 -0000
7 7
# PROVIDE: ip6fw
8 8
# REQUIRE: routing
9 9
# BEFORE: network_ipv6
10
# KEYWORD: nojail
10 11

  
11 12
. /etc/rc.subr
12 13

  
rc.d/ipfs 13 Mar 2006 18:33:23 -0000
8 8
# PROVIDE: ipfs
9 9
# REQUIRE: ipnat
10 10
# BEFORE:  netif
11
# KEYWORD: shutdown
11
# KEYWORD: shutdown nojail
12 12

  
13 13
. /etc/rc.subr
14 14

  
rc.d/ipfw 13 Mar 2006 18:33:28 -0000
7 7
# PROVIDE: ipfw
8 8
# REQUIRE: ppp-user
9 9
# BEFORE: NETWORKING
10
# KEYWORD: nojail
10 11

  
11 12
. /etc/rc.subr
12 13

  
rc.d/ipmon 13 Mar 2006 18:33:33 -0000
8 8
# PROVIDE: ipmon
9 9
# REQUIRE: mountcritlocal hostname sysctl cleanvar
10 10
# BEFORE:  SERVERS
11
# KEYWORD: nojail
11 12

  
12 13
. /etc/rc.subr
13 14

  
rc.d/ipnat 13 Mar 2006 18:33:38 -0000
8 8
# PROVIDE: ipnat
9 9
# REQUIRE: ipfilter
10 10
# BEFORE:  DAEMON netif
11
# KEYWORD: nojail
11 12

  
12 13
. /etc/rc.subr
13 14

  
rc.d/ipsec 13 Mar 2006 18:33:43 -0000
8 8
# PROVIDE: ipsec
9 9
# REQUIRE: root mountcritlocal tty
10 10
# BEFORE:  DAEMON
11
# KEYWORD: nojail
11 12

  
12 13
. /etc/rc.subr
13 14

  
rc.d/ipxrouted 13 Mar 2006 18:33:48 -0000
7 7
# PROVIDE: ipxrouted
8 8
# REQUIRE: SERVERS
9 9
# BEFORE: DAEMON
10
# KEYWORD: nojail
10 11

  
11 12
. /etc/rc.subr
12 13

  
rc.d/isdnd 13 Mar 2006 18:33:55 -0000
9 9

  
10 10
# PROVIDE: isdnd
11 11
# REQUIRE: netif mountcritlocal
12
# KEYWORD: nojail
12 13

  
13 14
. /etc/rc.subr
14 15

  
rc.d/jail 13 Mar 2006 18:34:08 -0000
7 7
# PROVIDE: jail
8 8
# REQUIRE: LOGIN
9 9
# BEFORE: securelevel
10
# KEYWORD: nojail
10 11

  
11 12
. /etc/rc.subr
12 13

  
rc.d/kldxref 13 Mar 2006 18:34:13 -0000
7 7
# PROVIDE: kldxref
8 8
# REQUIRE: root mountcritlocal
9 9
# BEFORE:  netif
10
# KEYWORD: nojail
10 11

  
11 12
. /etc/rc.subr
12 13

  
rc.d/mountcritlocal 13 Mar 2006 18:34:18 -0000
7 7

  
8 8
# PROVIDE: mountcritlocal
9 9
# REQUIRE: root
10
# KEYWORD: nojail
10 11

  
11 12
. /etc/rc.subr
12 13

  
rc.d/mountcritremote 13 Mar 2006 18:34:24 -0000
7 7

  
8 8
# PROVIDE: mountcritremote
9 9
# REQUIRE: NETWORKING root mountcritlocal
10
# KEYWORD: nojail
10 11

  
11 12
. /etc/rc.subr
12 13

  
rc.d/mountd 13 Mar 2006 18:34:28 -0000
7 7

  
8 8
# PROVIDE: mountd
9 9
# REQUIRE: NETWORKING mountcritremote nfsserver rpcbind quota
10
# KEYWORD: nojail
10 11

  
11 12
. /etc/rc.subr
12 13

  
rc.d/moused 13 Mar 2006 18:34:33 -0000
7 7

  
8 8
# PROVIDE: moused
9 9
# REQUIRE: DAEMON
10
# KEYWORD: nojail
10 11

  
11 12
. /etc/rc.subr
12 13

  
rc.d/mroute6d 13 Mar 2006 18:34:38 -0000
6 6

  
7 7
# PROVIDE: mroute6d
8 8
# REQUIRE: network_ipv6
9
# KEYWORD: nojail
9 10

  
10 11
. /etc/rc.subr
11 12

  
rc.d/mrouted 13 Mar 2006 18:34:43 -0000
7 7

  
8 8
# PROVIDE: mrouted
9 9
# REQUIRE: netif routing
10
# KEYWORD: nojail
10 11

  
11 12
. /etc/rc.subr
12 13

  
rc.d/netif 13 Mar 2006 18:34:49 -0000
28 28

  
29 29
# PROVIDE: netif
30 30
# REQUIRE: atm1 ipfilter mountcritlocal serial sppp sysctl tty
31
# KEYWORD: nojail
31 32

  
32 33
. /etc/rc.subr
33 34
. /etc/network.subr
rc.d/netoptions 13 Mar 2006 18:34:53 -0000
7 7
# PROVIDE: netoptions
8 8
# REQUIRE: localdaemons
9 9
# BEFORE:  securelevel
10
# KEYWORD: nojail
10 11

  
11 12
. /etc/rc.subr
12 13

  
rc.d/network_ipv6 13 Mar 2006 18:34:59 -0000
31 31

  
32 32
# PROVIDE: network_ipv6
33 33
# REQUIRE: routing
34
# KEYWORD: nojail
34 35

  
35 36
. /etc/rc.subr
36 37
. /etc/network.subr
rc.d/nfsclient 13 Mar 2006 18:35:06 -0000
7 7
# PROVIDE: nfsclient
8 8
# REQUIRE: NETWORKING mountcritremote rpcbind
9 9
# KEYWORD: shutdown
10
# KEYWORD: nojail
10 11

  
11 12
. /etc/rc.subr
12 13

  
rc.d/nfsd 13 Mar 2006 18:35:11 -0000
7 7

  
8 8
# PROVIDE: nfsd
9 9
# REQUIRE: mountd
10
# KEYWORD: nojail
10 11

  
11 12
. /etc/rc.subr
12 13

  
rc.d/nfslocking 13 Mar 2006 18:35:16 -0000
8 8
# PROVIDE: nfslocking
9 9
# REQUIRE: nfsserver nfsclient nfsd
10 10
# BEFORE:  DAEMON
11
# KEYWORD: nojail
11 12

  
12 13
. /etc/rc.subr
13 14

  
rc.d/nfsserver 13 Mar 2006 18:35:21 -0000
6 6

  
7 7
# PROVIDE: nfsserver
8 8
# REQUIRE: NETWORKING mountcritremote
9
# KEYWORD: nojail
9 10

  
10 11
. /etc/rc.subr
11 12

  
rc.d/ntpd 13 Mar 2006 18:35:25 -0000
8 8
# PROVIDE: ntpd
9 9
# REQUIRE: NETWORKING
10 10
# BEFORE:  LOGIN
11
# KEYWORD: nojail
11 12

  
12 13
. /etc/rc.subr
13 14

  
rc.d/ppp-user 13 Mar 2006 18:35:38 -0000
6 6

  
7 7
# PROVIDE: ppp-user
8 8
# REQUIRE: netif isdnd
9
# KEYWORD: nojail
9 10

  
10 11
. /etc/rc.subr
11 12

  
rc.d/pppoed 13 Mar 2006 18:35:43 -0000
7 7
# PROVIDE: pppoed
8 8
# REQUIRE: NETWORKING
9 9
# BEFORE: DAEMON
10
# KEYWORD: nojail
10 11

  
11 12
. /etc/rc.subr
12 13

  
rc.d/quota 13 Mar 2006 18:35:47 -0000
10 10
# PROVIDE: quota
11 11
# REQUIRE: mountcritremote
12 12
# BEFORE: DAEMON
13
# KEYWORD: nojail
13 14

  
14 15
. /etc/rc.subr
15 16

  
rc.d/random 13 Mar 2006 18:35:52 -0000
8 8
# REQUIRE: diskless mountcritlocal initrandom
9 9
# BEFORE: netif
10 10
# KEYWORD: shutdown
11
# KEYWORD: nojail
11 12

  
12 13
. /etc/rc.subr
13 14

  
rc.d/rarpd 13 Mar 2006 18:35:56 -0000
8 8
# PROVIDE: rarpd
9 9
# REQUIRE: DAEMON
10 10
# BEFORE:  LOGIN
11
# KEYWORD: nojail
11 12

  
12 13
. /etc/rc.subr
13 14

  
rc.d/rndcontrol 13 Mar 2006 18:36:01 -0000
6 6
# PROVIDE: rndcontrol
7 7
# REQUIRE: DAEMON
8 8
# BEFORE:  LOGIN
9
# KEYWORD: nojail
9 10

  
10 11
. /etc/rc.subr
11 12

  
rc.d/root 13 Mar 2006 18:36:06 -0000
7 7

  
8 8
# PROVIDE: root
9 9
# REQUIRE: fsck
10
# KEYWORD: nojail
10 11

  
11 12
. /etc/rc.subr
12 13

  
rc.d/route6d 13 Mar 2006 18:36:19 -0000
7 7

  
8 8
# PROVIDE: route6d
9 9
# REQUIRE: network_ipv6
10
# KEYWORD: nojail
10 11

  
11 12
. /etc/rc.subr
12 13

  
rc.d/routed 13 Mar 2006 18:36:24 -0000
7 7

  
8 8
# PROVIDE: routed
9 9
# REQUIRE: netif routing
10
# KEYWORD: nojail
10 11

  
11 12
. /etc/rc.subr
12 13

  
rc.d/routing 13 Mar 2006 18:36:28 -0000
8 8

  
9 9
# PROVIDE: routing
10 10
# REQUIRE: netif ppp-user
11
# KEYWORD: nojail
11 12

  
12 13
. /etc/rc.subr
13 14

  
rc.d/rtadvd 13 Mar 2006 18:36:33 -0000
8 8
# PROVIDE: rtadvd
9 9
# REQUIRE: DAEMON
10 10
# BEFORE:  LOGIN
11
# KEYWORD: nojail
11 12

  
12 13
. /etc/rc.subr
13 14

  
rc.d/savecore 13 Mar 2006 18:36:38 -0000
8 8
# PROVIDE: savecore
9 9
# REQUIRE: syslogd
10 10
# BEFORE:  SERVERS
11
# KEYWORD: nojail
11 12

  
12 13
. /etc/rc.subr
13 14

  
rc.d/serial 13 Mar 2006 18:36:43 -0000
30 30

  
31 31
# PROVIDE: serial
32 32
# REQUIRE: root
33
# KEYWORD: nojail
33 34

  
34 35
. /etc/rc.subr
35 36
dummy_rc_command "$1"   
rc.d/sppp 13 Mar 2006 18:36:48 -0000
7 7
# PROVIDE: sppp
8 8
# REQUIRE: root
9 9
# BEFORE: netif
10
# KEYWORD: nojail
10 11

  
11 12
. /etc/rc.subr
12 13

  
rc.d/swap1 13 Mar 2006 18:36:52 -0000
8 8
# PROVIDE: localswap
9 9
# REQUIRE: disks
10 10
# KEYWORD: shutdown
11
# KEYWORD: nojail
11 12

  
12 13
. /etc/rc.subr
13 14

  
rc.d/syscons 13 Mar 2006 18:36:58 -0000
30 30

  
31 31
# PROVIDE: syscons
32 32
# REQUIRE: LOGIN usbd
33
# KEYWORD: nojail
33 34

  
34 35
. /etc/rc.subr
35 36

  
rc.d/timed 13 Mar 2006 18:37:02 -0000
8 8
# PROVIDE: timed
9 9
# REQUIRE: DAEMON
10 10
# BEFORE:  LOGIN
11
# KEYWORD: nojail
11 12

  
12 13
. /etc/rc.subr
13 14

  
rc.d/usbd 13 Mar 2006 18:37:06 -0000
7 7
# PROVIDE: usbd
8 8
# REQUIRE: DAEMON
9 9
# BEFORE: LOGIN
10
# KEYWORD: nojail
10 11

  
11 12
. /etc/rc.subr
12 13

  
rc.d/vinum 13 Mar 2006 18:37:10 -0000
5 5
#
6 6

  
7 7
# PROVIDE: disks
8
# KEYWORD: nojail
8 9

  
9 10
. /etc/rc.subr
10 11

  
rc.d/watchdogd 13 Mar 2006 18:37:15 -0000
30 30

  
31 31
# PROVIDE: watchdogd
32 32
# REQUIRE: DAEMON
33
# KEYWORD: nojail
33 34

  
34 35
. /etc/rc.subr
35 36