Hello,
the attached patches make it a bit easier to setup jails (no fake /etc/fstab,
no additional network_interfaces="" in jails' /etc/rc.conf, etc) since some
services are not supposed to run inside jail.
--
Michal Belczyk
Index: rc
===================================================================
RCS file: /home/dcvs/src/etc/rc,v
retrieving revision 1.4
diff -u -r1.4 rc
--- rc 19 Nov 2005 18:34:02 -0000 1.4
+++ rc 19 Mar 2006 20:35:24 -0000
@@ -66,7 +66,10 @@
_boot="start"
fi
-files=`rcorder -s nostart /etc/rc.d/* 2>/dev/null`
+skip="-s nostart"
+[ `/sbin/sysctl -n jail.jailed` -eq 1 ] && skip="$skip -s nojail"
+files=`rcorder ${skip} /etc/rc.d/* 2>/dev/null`
+
for _rc_elem in ${files}; do
run_rc_script ${_rc_elem} ${_boot}
Index: rc.d/abi
===================================================================
RCS file: /home/dcvs/src/etc/rc.d/abi,v
retrieving revision 1.3
diff -u -r1.3 abi
--- rc.d/abi 19 Nov 2005 21:47:32 -0000 1.3
+++ rc.d/abi 13 Mar 2006 18:30:58 -0000
@@ -7,6 +7,7 @@
# PROVIDE: abi
# REQUIRE: LOGIN
# BEFORE: securelevel
+# KEYWORD: nojail
. /etc/rc.subr
Index: rc.d/accounting
===================================================================
RCS file: /home/dcvs/src/etc/rc.d/accounting,v
retrieving revision 1.5
diff -u -r1.5 accounting
--- rc.d/accounting 19 Nov 2005 21:47:32 -0000 1.5
+++ rc.d/accounting 13 Mar 2006 18:31:06 -0000
@@ -8,6 +8,7 @@
# PROVIDE: accounting
# REQUIRE: mountcritremote
# BEFORE: DAEMON
+# KEYWORD: nojail
. /etc/rc.subr
Index: rc.d/addswap
===================================================================
RCS file: /home/dcvs/src/etc/rc.d/addswap,v
retrieving revision 1.4
diff -u -r1.4 addswap
--- rc.d/addswap 19 Nov 2005 21:47:32 -0000 1.4
+++ rc.d/addswap 13 Mar 2006 18:31:12 -0000
@@ -9,6 +9,7 @@
# PROVIDE: addswap
# REQUIRE: mountcritlocal
# BEFORE: sysctl
+# KEYWORD: nojail
. /etc/rc.subr
Index: rc.d/adjkerntz
===================================================================
RCS file: /home/dcvs/src/etc/rc.d/adjkerntz,v
retrieving revision 1.3
diff -u -r1.3 adjkerntz
--- rc.d/adjkerntz 19 Nov 2005 21:47:32 -0000 1.3
+++ rc.d/adjkerntz 13 Mar 2006 18:31:18 -0000
@@ -7,6 +7,7 @@
# PROVIDE: adjkerntz
# REQUIRE: diskless mountcritlocal random
# BEFORE: netif
+# KEYWORD: nojail
. /etc/rc.subr
Index: rc.d/amd
===================================================================
RCS file: /home/dcvs/src/etc/rc.d/amd,v
retrieving revision 1.5
diff -u -r1.5 amd
--- rc.d/amd 19 Nov 2005 21:47:32 -0000 1.5
+++ rc.d/amd 13 Mar 2006 18:31:23 -0000
@@ -8,6 +8,7 @@
# PROVIDE: amd
# REQUIRE: rpcbind mountcritremote ypbind nfsclient
# BEFORE: DAEMON
+# KEYWORD: nojail
. /etc/rc.subr
Index: rc.d/apm
===================================================================
RCS file: /home/dcvs/src/etc/rc.d/apm,v
retrieving revision 1.3
diff -u -r1.3 apm
--- rc.d/apm 19 Nov 2005 21:47:32 -0000 1.3
+++ rc.d/apm 13 Mar 2006 18:31:29 -0000
@@ -7,6 +7,7 @@
# PROVIDE: apm
# REQUIRE: DAEMON
# BEFORE: LOGIN
+# KEYWORD: nojail
. /etc/rc.subr
Index: rc.d/apmd
===================================================================
RCS file: /home/dcvs/src/etc/rc.d/apmd,v
retrieving revision 1.3
diff -u -r1.3 apmd
--- rc.d/apmd 19 Nov 2005 21:47:32 -0000 1.3
+++ rc.d/apmd 13 Mar 2006 18:31:34 -0000
@@ -8,6 +8,7 @@
# PROVIDE: apmd
# REQUIRE: DAEMON apm
# BEFORE: LOGIN
+# KEYWORD: nojail
. /etc/rc.subr
Index: rc.d/archdep
===================================================================
RCS file: /home/dcvs/src/etc/rc.d/archdep,v
retrieving revision 1.4
diff -u -r1.4 archdep
--- rc.d/archdep 19 Nov 2005 21:47:32 -0000 1.4
+++ rc.d/archdep 13 Mar 2006 18:31:39 -0000
@@ -7,6 +7,7 @@
# PROVIDE: archdep
# REQUIRE: LOGIN
# BEFORE: abi
+# KEYWORD: nojail
. /etc/rc.subr
Index: rc.d/atm1
===================================================================
RCS file: /home/dcvs/src/etc/rc.d/atm1,v
retrieving revision 1.3
diff -u -r1.3 atm1
--- rc.d/atm1 19 Nov 2005 21:47:32 -0000 1.3
+++ rc.d/atm1 13 Mar 2006 18:31:48 -0000
@@ -31,6 +31,7 @@
# PROVIDE: atm1
# REQUIRE: root
# BEFORE: netif
+# KEYWORD: nojail
. /etc/rc.subr
Index: rc.d/battd
===================================================================
RCS file: /home/dcvs/src/etc/rc.d/battd,v
retrieving revision 1.2
diff -u -r1.2 battd
--- rc.d/battd 19 Nov 2005 21:47:32 -0000 1.2
+++ rc.d/battd 13 Mar 2006 18:31:52 -0000
@@ -6,6 +6,7 @@
# PROVIDE: battd
# REQUIRE: DAEMON apm
# BEFORE: LOGIN
+# KEYWORD: nojail
. /etc/rc.subr
Index: rc.d/bootparams
===================================================================
RCS file: /home/dcvs/src/etc/rc.d/bootparams,v
retrieving revision 1.3
diff -u -r1.3 bootparams
--- rc.d/bootparams 19 Nov 2005 21:47:32 -0000 1.3
+++ rc.d/bootparams 13 Mar 2006 18:31:59 -0000
@@ -8,6 +8,7 @@
# PROVIDE: bootparams
# REQUIRE: rpcbind DAEMON
# BEFORE: LOGIN
+# KEYWORD: nojail
. /etc/rc.subr
Index: rc.d/ccd
===================================================================
RCS file: /home/dcvs/src/etc/rc.d/ccd,v
retrieving revision 1.3
diff -u -r1.3 ccd
--- rc.d/ccd 19 Nov 2005 21:47:32 -0000 1.3
+++ rc.d/ccd 13 Mar 2006 18:32:03 -0000
@@ -6,6 +6,7 @@
#
# PROVIDE: disks
+# KEYWORD: nojail
. /etc/rc.subr
Index: rc.d/dhclient
===================================================================
RCS file: /home/dcvs/src/etc/rc.d/dhclient,v
retrieving revision 1.7
diff -u -r1.7 dhclient
--- rc.d/dhclient 19 Nov 2005 21:47:32 -0000 1.7
+++ rc.d/dhclient 13 Mar 2006 18:32:12 -0000
@@ -8,6 +8,7 @@
# PROVIDE: dhclient
# REQUIRE: netif mountcritlocal
# BEFORE: NETWORKING
+# KEYWORD: nojail
#
# Note that there no syslog logging of dhclient messages at boot because
# dhclient needs to start before services that syslog depends upon do.
Index: rc.d/dmesg
===================================================================
RCS file: /home/dcvs/src/etc/rc.d/dmesg,v
retrieving revision 1.3
diff -u -r1.3 dmesg
--- rc.d/dmesg 19 Nov 2005 21:47:32 -0000 1.3
+++ rc.d/dmesg 13 Mar 2006 18:32:24 -0000
@@ -8,7 +8,7 @@
# PROVIDE: dmesg
# REQUIRE: mountcritremote
# BEFORE: DAEMON
-# KEYWORD: Daemon
+# KEYWORD: Daemon nojail
. /etc/rc.subr
Index: rc.d/dumpon
===================================================================
RCS file: /home/dcvs/src/etc/rc.d/dumpon,v
retrieving revision 1.3
diff -u -r1.3 dumpon
--- rc.d/dumpon 19 Nov 2005 21:47:32 -0000 1.3
+++ rc.d/dumpon 13 Mar 2006 18:32:33 -0000
@@ -7,6 +7,7 @@
# PROVIDE: dumpon
# REQUIRE: initrandom
# BEFORE: disks savecore
+# KEYWORD: nojail
. /etc/rc.subr
Index: rc.d/fsck
===================================================================
RCS file: /home/dcvs/src/etc/rc.d/fsck,v
retrieving revision 1.4
diff -u -r1.4 fsck
--- rc.d/fsck 19 Nov 2005 21:47:32 -0000 1.4
+++ rc.d/fsck 13 Mar 2006 18:32:38 -0000
@@ -7,6 +7,7 @@
# PROVIDE: fsck
# REQUIRE: localswap
+# KEYWORD: nojail
. /etc/rc.subr
Index: rc.d/initdiskless
===================================================================
RCS file: /home/dcvs/src/etc/rc.d/initdiskless,v
retrieving revision 1.7
diff -u -r1.7 initdiskless
--- rc.d/initdiskless 19 Nov 2005 21:47:32 -0000 1.7
+++ rc.d/initdiskless 13 Mar 2006 18:32:57 -0000
@@ -28,6 +28,7 @@
# $DragonFly: src/etc/rc.d/initdiskless,v 1.7 2005/11/19 21:47:32 swildner Exp
$
#
# PROVIDE: initdiskless
+# KEYWORD: nojail
. /etc/rc.subr
dummy_rc_command "$1"
Index: rc.d/initrandom
===================================================================
RCS file: /home/dcvs/src/etc/rc.d/initrandom,v
retrieving revision 1.5
diff -u -r1.5 initrandom
--- rc.d/initrandom 19 Nov 2005 21:47:32 -0000 1.5
+++ rc.d/initrandom 13 Mar 2006 18:33:02 -0000
@@ -7,6 +7,7 @@
# PROVIDE: initrandom
# REQUIRE: initdiskless
# BEFORE: disks
+# KEYWORD: nojail
. /etc/rc.subr
Index: rc.d/ip6fw
===================================================================
RCS file: /home/dcvs/src/etc/rc.d/ip6fw,v
retrieving revision 1.3
diff -u -r1.3 ip6fw
--- rc.d/ip6fw 19 Nov 2005 21:47:32 -0000 1.3
+++ rc.d/ip6fw 13 Mar 2006 18:33:08 -0000
@@ -7,6 +7,7 @@
# PROVIDE: ip6fw
# REQUIRE: routing
# BEFORE: network_ipv6
+# KEYWORD: nojail
. /etc/rc.subr
Index: rc.d/ipfs
===================================================================
RCS file: /home/dcvs/src/etc/rc.d/ipfs,v
retrieving revision 1.4
diff -u -r1.4 ipfs
--- rc.d/ipfs 19 Nov 2005 21:47:32 -0000 1.4
+++ rc.d/ipfs 13 Mar 2006 18:33:23 -0000
@@ -8,7 +8,7 @@
# PROVIDE: ipfs
# REQUIRE: ipnat
# BEFORE: netif
-# KEYWORD: shutdown
+# KEYWORD: shutdown nojail
. /etc/rc.subr
Index: rc.d/ipfw
===================================================================
RCS file: /home/dcvs/src/etc/rc.d/ipfw,v
retrieving revision 1.3
diff -u -r1.3 ipfw
--- rc.d/ipfw 19 Nov 2005 21:47:32 -0000 1.3
+++ rc.d/ipfw 13 Mar 2006 18:33:28 -0000
@@ -7,6 +7,7 @@
# PROVIDE: ipfw
# REQUIRE: ppp-user
# BEFORE: NETWORKING
+# KEYWORD: nojail
. /etc/rc.subr
Index: rc.d/ipmon
===================================================================
RCS file: /home/dcvs/src/etc/rc.d/ipmon,v
retrieving revision 1.4
diff -u -r1.4 ipmon
--- rc.d/ipmon 19 Nov 2005 21:47:32 -0000 1.4
+++ rc.d/ipmon 13 Mar 2006 18:33:33 -0000
@@ -8,6 +8,7 @@
# PROVIDE: ipmon
# REQUIRE: mountcritlocal hostname sysctl cleanvar
# BEFORE: SERVERS
+# KEYWORD: nojail
. /etc/rc.subr
Index: rc.d/ipnat
===================================================================
RCS file: /home/dcvs/src/etc/rc.d/ipnat,v
retrieving revision 1.3
diff -u -r1.3 ipnat
--- rc.d/ipnat 19 Nov 2005 21:47:32 -0000 1.3
+++ rc.d/ipnat 13 Mar 2006 18:33:38 -0000
@@ -8,6 +8,7 @@
# PROVIDE: ipnat
# REQUIRE: ipfilter
# BEFORE: DAEMON netif
+# KEYWORD: nojail
. /etc/rc.subr
Index: rc.d/ipsec
===================================================================
RCS file: /home/dcvs/src/etc/rc.d/ipsec,v
retrieving revision 1.5
diff -u -r1.5 ipsec
--- rc.d/ipsec 19 Nov 2005 21:47:32 -0000 1.5
+++ rc.d/ipsec 13 Mar 2006 18:33:43 -0000
@@ -8,6 +8,7 @@
# PROVIDE: ipsec
# REQUIRE: root mountcritlocal tty
# BEFORE: DAEMON
+# KEYWORD: nojail
. /etc/rc.subr
Index: rc.d/ipxrouted
===================================================================
RCS file: /home/dcvs/src/etc/rc.d/ipxrouted,v
retrieving revision 1.3
diff -u -r1.3 ipxrouted
--- rc.d/ipxrouted 19 Nov 2005 21:47:32 -0000 1.3
+++ rc.d/ipxrouted 13 Mar 2006 18:33:48 -0000
@@ -7,6 +7,7 @@
# PROVIDE: ipxrouted
# REQUIRE: SERVERS
# BEFORE: DAEMON
+# KEYWORD: nojail
. /etc/rc.subr
Index: rc.d/isdnd
===================================================================
RCS file: /home/dcvs/src/etc/rc.d/isdnd,v
retrieving revision 1.5
diff -u -r1.5 isdnd
--- rc.d/isdnd 19 Nov 2005 21:47:32 -0000 1.5
+++ rc.d/isdnd 13 Mar 2006 18:33:55 -0000
@@ -9,6 +9,7 @@
# PROVIDE: isdnd
# REQUIRE: netif mountcritlocal
+# KEYWORD: nojail
. /etc/rc.subr
Index: rc.d/jail
===================================================================
RCS file: /home/dcvs/src/etc/rc.d/jail,v
retrieving revision 1.4
diff -u -r1.4 jail
--- rc.d/jail 19 Nov 2005 21:47:32 -0000 1.4
+++ rc.d/jail 13 Mar 2006 18:34:08 -0000
@@ -7,6 +7,7 @@
# PROVIDE: jail
# REQUIRE: LOGIN
# BEFORE: securelevel
+# KEYWORD: nojail
. /etc/rc.subr
Index: rc.d/kldxref
===================================================================
RCS file: /home/dcvs/src/etc/rc.d/kldxref,v
retrieving revision 1.3
diff -u -r1.3 kldxref
--- rc.d/kldxref 19 Nov 2005 21:47:32 -0000 1.3
+++ rc.d/kldxref 13 Mar 2006 18:34:13 -0000
@@ -7,6 +7,7 @@
# PROVIDE: kldxref
# REQUIRE: root mountcritlocal
# BEFORE: netif
+# KEYWORD: nojail
. /etc/rc.subr
Index: rc.d/mountcritlocal
===================================================================
RCS file: /home/dcvs/src/etc/rc.d/mountcritlocal,v
retrieving revision 1.5
diff -u -r1.5 mountcritlocal
--- rc.d/mountcritlocal 19 Nov 2005 21:47:32 -0000 1.5
+++ rc.d/mountcritlocal 13 Mar 2006 18:34:18 -0000
@@ -7,6 +7,7 @@
# PROVIDE: mountcritlocal
# REQUIRE: root
+# KEYWORD: nojail
. /etc/rc.subr
Index: rc.d/mountcritremote
===================================================================
RCS file: /home/dcvs/src/etc/rc.d/mountcritremote,v
retrieving revision 1.6
diff -u -r1.6 mountcritremote
--- rc.d/mountcritremote 19 Nov 2005 21:47:32 -0000 1.6
+++ rc.d/mountcritremote 13 Mar 2006 18:34:24 -0000
@@ -7,6 +7,7 @@
# PROVIDE: mountcritremote
# REQUIRE: NETWORKING root mountcritlocal
+# KEYWORD: nojail
. /etc/rc.subr
Index: rc.d/mountd
===================================================================
RCS file: /home/dcvs/src/etc/rc.d/mountd,v
retrieving revision 1.6
diff -u -r1.6 mountd
--- rc.d/mountd 19 Nov 2005 21:47:32 -0000 1.6
+++ rc.d/mountd 13 Mar 2006 18:34:28 -0000
@@ -7,6 +7,7 @@
# PROVIDE: mountd
# REQUIRE: NETWORKING mountcritremote nfsserver rpcbind quota
+# KEYWORD: nojail
. /etc/rc.subr
Index: rc.d/moused
===================================================================
RCS file: /home/dcvs/src/etc/rc.d/moused,v
retrieving revision 1.4
diff -u -r1.4 moused
--- rc.d/moused 19 Nov 2005 21:47:32 -0000 1.4
+++ rc.d/moused 13 Mar 2006 18:34:33 -0000
@@ -7,6 +7,7 @@
# PROVIDE: moused
# REQUIRE: DAEMON
+# KEYWORD: nojail
. /etc/rc.subr
Index: rc.d/mroute6d
===================================================================
RCS file: /home/dcvs/src/etc/rc.d/mroute6d,v
retrieving revision 1.3
diff -u -r1.3 mroute6d
--- rc.d/mroute6d 19 Nov 2005 21:47:32 -0000 1.3
+++ rc.d/mroute6d 13 Mar 2006 18:34:38 -0000
@@ -6,6 +6,7 @@
# PROVIDE: mroute6d
# REQUIRE: network_ipv6
+# KEYWORD: nojail
. /etc/rc.subr
Index: rc.d/mrouted
===================================================================
RCS file: /home/dcvs/src/etc/rc.d/mrouted,v
retrieving revision 1.3
diff -u -r1.3 mrouted
--- rc.d/mrouted 19 Nov 2005 21:47:32 -0000 1.3
+++ rc.d/mrouted 13 Mar 2006 18:34:43 -0000
@@ -7,6 +7,7 @@
# PROVIDE: mrouted
# REQUIRE: netif routing
+# KEYWORD: nojail
. /etc/rc.subr
Index: rc.d/netif
===================================================================
RCS file: /home/dcvs/src/etc/rc.d/netif,v
retrieving revision 1.4.2.1
diff -u -r1.4.2.1 netif
--- rc.d/netif 29 Dec 2005 17:29:36 -0000 1.4.2.1
+++ rc.d/netif 13 Mar 2006 18:34:49 -0000
@@ -28,6 +28,7 @@
# PROVIDE: netif
# REQUIRE: atm1 ipfilter mountcritlocal serial sppp sysctl tty
+# KEYWORD: nojail
. /etc/rc.subr
. /etc/network.subr
Index: rc.d/netoptions
===================================================================
RCS file: /home/dcvs/src/etc/rc.d/netoptions,v
retrieving revision 1.4
diff -u -r1.4 netoptions
--- rc.d/netoptions 19 Nov 2005 21:47:32 -0000 1.4
+++ rc.d/netoptions 13 Mar 2006 18:34:53 -0000
@@ -7,6 +7,7 @@
# PROVIDE: netoptions
# REQUIRE: localdaemons
# BEFORE: securelevel
+# KEYWORD: nojail
. /etc/rc.subr
Index: rc.d/network_ipv6
===================================================================
RCS file: /home/dcvs/src/etc/rc.d/network_ipv6,v
retrieving revision 1.3
diff -u -r1.3 network_ipv6
--- rc.d/network_ipv6 19 Nov 2005 21:47:32 -0000 1.3
+++ rc.d/network_ipv6 13 Mar 2006 18:34:59 -0000
@@ -31,6 +31,7 @@
# PROVIDE: network_ipv6
# REQUIRE: routing
+# KEYWORD: nojail
. /etc/rc.subr
. /etc/network.subr
Index: rc.d/nfsclient
===================================================================
RCS file: /home/dcvs/src/etc/rc.d/nfsclient,v
retrieving revision 1.6
diff -u -r1.6 nfsclient
--- rc.d/nfsclient 19 Nov 2005 21:47:32 -0000 1.6
+++ rc.d/nfsclient 13 Mar 2006 18:35:06 -0000
@@ -7,6 +7,7 @@
# PROVIDE: nfsclient
# REQUIRE: NETWORKING mountcritremote rpcbind
# KEYWORD: shutdown
+# KEYWORD: nojail
. /etc/rc.subr
Index: rc.d/nfsd
===================================================================
RCS file: /home/dcvs/src/etc/rc.d/nfsd,v
retrieving revision 1.5
diff -u -r1.5 nfsd
--- rc.d/nfsd 19 Nov 2005 21:47:32 -0000 1.5
+++ rc.d/nfsd 13 Mar 2006 18:35:11 -0000
@@ -7,6 +7,7 @@
# PROVIDE: nfsd
# REQUIRE: mountd
+# KEYWORD: nojail
. /etc/rc.subr
Index: rc.d/nfslocking
===================================================================
RCS file: /home/dcvs/src/etc/rc.d/nfslocking,v
retrieving revision 1.4
diff -u -r1.4 nfslocking
--- rc.d/nfslocking 19 Nov 2005 21:47:32 -0000 1.4
+++ rc.d/nfslocking 13 Mar 2006 18:35:16 -0000
@@ -8,6 +8,7 @@
# PROVIDE: nfslocking
# REQUIRE: nfsserver nfsclient nfsd
# BEFORE: DAEMON
+# KEYWORD: nojail
. /etc/rc.subr
Index: rc.d/nfsserver
===================================================================
RCS file: /home/dcvs/src/etc/rc.d/nfsserver,v
retrieving revision 1.4
diff -u -r1.4 nfsserver
--- rc.d/nfsserver 19 Nov 2005 21:47:32 -0000 1.4
+++ rc.d/nfsserver 13 Mar 2006 18:35:21 -0000
@@ -6,6 +6,7 @@
# PROVIDE: nfsserver
# REQUIRE: NETWORKING mountcritremote
+# KEYWORD: nojail
. /etc/rc.subr
Index: rc.d/ntpd
===================================================================
RCS file: /home/dcvs/src/etc/rc.d/ntpd,v
retrieving revision 1.5
diff -u -r1.5 ntpd
--- rc.d/ntpd 19 Nov 2005 21:47:32 -0000 1.5
+++ rc.d/ntpd 13 Mar 2006 18:35:25 -0000
@@ -8,6 +8,7 @@
# PROVIDE: ntpd
# REQUIRE: NETWORKING
# BEFORE: LOGIN
+# KEYWORD: nojail
. /etc/rc.subr
Index: rc.d/ppp-user
===================================================================
RCS file: /home/dcvs/src/etc/rc.d/ppp-user,v
retrieving revision 1.4
diff -u -r1.4 ppp-user
--- rc.d/ppp-user 19 Nov 2005 21:47:32 -0000 1.4
+++ rc.d/ppp-user 13 Mar 2006 18:35:38 -0000
@@ -6,6 +6,7 @@
# PROVIDE: ppp-user
# REQUIRE: netif isdnd
+# KEYWORD: nojail
. /etc/rc.subr
Index: rc.d/pppoed
===================================================================
RCS file: /home/dcvs/src/etc/rc.d/pppoed,v
retrieving revision 1.3
diff -u -r1.3 pppoed
--- rc.d/pppoed 19 Nov 2005 21:47:32 -0000 1.3
+++ rc.d/pppoed 13 Mar 2006 18:35:43 -0000
@@ -7,6 +7,7 @@
# PROVIDE: pppoed
# REQUIRE: NETWORKING
# BEFORE: DAEMON
+# KEYWORD: nojail
. /etc/rc.subr
Index: rc.d/quota
===================================================================
RCS file: /home/dcvs/src/etc/rc.d/quota,v
retrieving revision 1.3
diff -u -r1.3 quota
--- rc.d/quota 19 Nov 2005 21:47:32 -0000 1.3
+++ rc.d/quota 13 Mar 2006 18:35:47 -0000
@@ -10,6 +10,7 @@
# PROVIDE: quota
# REQUIRE: mountcritremote
# BEFORE: DAEMON
+# KEYWORD: nojail
. /etc/rc.subr
Index: rc.d/random
===================================================================
RCS file: /home/dcvs/src/etc/rc.d/random,v
retrieving revision 1.3
diff -u -r1.3 random
--- rc.d/random 19 Nov 2005 21:47:32 -0000 1.3
+++ rc.d/random 13 Mar 2006 18:35:52 -0000
@@ -8,6 +8,7 @@
# REQUIRE: diskless mountcritlocal initrandom
# BEFORE: netif
# KEYWORD: shutdown
+# KEYWORD: nojail
. /etc/rc.subr
Index: rc.d/rarpd
===================================================================
RCS file: /home/dcvs/src/etc/rc.d/rarpd,v
retrieving revision 1.3
diff -u -r1.3 rarpd
--- rc.d/rarpd 19 Nov 2005 21:47:32 -0000 1.3
+++ rc.d/rarpd 13 Mar 2006 18:35:56 -0000
@@ -8,6 +8,7 @@
# PROVIDE: rarpd
# REQUIRE: DAEMON
# BEFORE: LOGIN
+# KEYWORD: nojail
. /etc/rc.subr
Index: rc.d/rndcontrol
===================================================================
RCS file: /home/dcvs/src/etc/rc.d/rndcontrol,v
retrieving revision 1.2
diff -u -r1.2 rndcontrol
--- rc.d/rndcontrol 19 Nov 2005 21:47:32 -0000 1.2
+++ rc.d/rndcontrol 13 Mar 2006 18:36:01 -0000
@@ -6,6 +6,7 @@
# PROVIDE: rndcontrol
# REQUIRE: DAEMON
# BEFORE: LOGIN
+# KEYWORD: nojail
. /etc/rc.subr
Index: rc.d/root
===================================================================
RCS file: /home/dcvs/src/etc/rc.d/root,v
retrieving revision 1.4
diff -u -r1.4 root
--- rc.d/root 19 Nov 2005 21:47:32 -0000 1.4
+++ rc.d/root 13 Mar 2006 18:36:06 -0000
@@ -7,6 +7,7 @@
# PROVIDE: root
# REQUIRE: fsck
+# KEYWORD: nojail
. /etc/rc.subr
Index: rc.d/route6d
===================================================================
RCS file: /home/dcvs/src/etc/rc.d/route6d,v
retrieving revision 1.4
diff -u -r1.4 route6d
--- rc.d/route6d 19 Nov 2005 21:47:32 -0000 1.4
+++ rc.d/route6d 13 Mar 2006 18:36:19 -0000
@@ -7,6 +7,7 @@
# PROVIDE: route6d
# REQUIRE: network_ipv6
+# KEYWORD: nojail
. /etc/rc.subr
Index: rc.d/routed
===================================================================
RCS file: /home/dcvs/src/etc/rc.d/routed,v
retrieving revision 1.5
diff -u -r1.5 routed
--- rc.d/routed 19 Nov 2005 21:47:32 -0000 1.5
+++ rc.d/routed 13 Mar 2006 18:36:24 -0000
@@ -7,6 +7,7 @@
# PROVIDE: routed
# REQUIRE: netif routing
+# KEYWORD: nojail
. /etc/rc.subr
Index: rc.d/routing
===================================================================
RCS file: /home/dcvs/src/etc/rc.d/routing,v
retrieving revision 1.3
diff -u -r1.3 routing
--- rc.d/routing 19 Nov 2005 21:47:32 -0000 1.3
+++ rc.d/routing 13 Mar 2006 18:36:28 -0000
@@ -8,6 +8,7 @@
# PROVIDE: routing
# REQUIRE: netif ppp-user
+# KEYWORD: nojail
. /etc/rc.subr
Index: rc.d/rtadvd
===================================================================
RCS file: /home/dcvs/src/etc/rc.d/rtadvd,v
retrieving revision 1.4
diff -u -r1.4 rtadvd
--- rc.d/rtadvd 19 Nov 2005 21:47:32 -0000 1.4
+++ rc.d/rtadvd 13 Mar 2006 18:36:33 -0000
@@ -8,6 +8,7 @@
# PROVIDE: rtadvd
# REQUIRE: DAEMON
# BEFORE: LOGIN
+# KEYWORD: nojail
. /etc/rc.subr
Index: rc.d/savecore
===================================================================
RCS file: /home/dcvs/src/etc/rc.d/savecore,v
retrieving revision 1.6
diff -u -r1.6 savecore
--- rc.d/savecore 19 Nov 2005 21:47:32 -0000 1.6
+++ rc.d/savecore 13 Mar 2006 18:36:38 -0000
@@ -8,6 +8,7 @@
# PROVIDE: savecore
# REQUIRE: syslogd
# BEFORE: SERVERS
+# KEYWORD: nojail
. /etc/rc.subr
Index: rc.d/serial
===================================================================
RCS file: /home/dcvs/src/etc/rc.d/serial,v
retrieving revision 1.4
diff -u -r1.4 serial
--- rc.d/serial 19 Nov 2005 21:47:32 -0000 1.4
+++ rc.d/serial 13 Mar 2006 18:36:43 -0000
@@ -30,6 +30,7 @@
# PROVIDE: serial
# REQUIRE: root
+# KEYWORD: nojail
. /etc/rc.subr
dummy_rc_command "$1"
Index: rc.d/sppp
===================================================================
RCS file: /home/dcvs/src/etc/rc.d/sppp,v
retrieving revision 1.3
diff -u -r1.3 sppp
--- rc.d/sppp 19 Nov 2005 21:47:32 -0000 1.3
+++ rc.d/sppp 13 Mar 2006 18:36:48 -0000
@@ -7,6 +7,7 @@
# PROVIDE: sppp
# REQUIRE: root
# BEFORE: netif
+# KEYWORD: nojail
. /etc/rc.subr
Index: rc.d/swap1
===================================================================
RCS file: /home/dcvs/src/etc/rc.d/swap1,v
retrieving revision 1.5
diff -u -r1.5 swap1
--- rc.d/swap1 19 Nov 2005 21:47:32 -0000 1.5
+++ rc.d/swap1 13 Mar 2006 18:36:52 -0000
@@ -8,6 +8,7 @@
# PROVIDE: localswap
# REQUIRE: disks
# KEYWORD: shutdown
+# KEYWORD: nojail
. /etc/rc.subr
Index: rc.d/syscons
===================================================================
RCS file: /home/dcvs/src/etc/rc.d/syscons,v
retrieving revision 1.5
diff -u -r1.5 syscons
--- rc.d/syscons 19 Nov 2005 21:47:32 -0000 1.5
+++ rc.d/syscons 13 Mar 2006 18:36:58 -0000
@@ -30,6 +30,7 @@
# PROVIDE: syscons
# REQUIRE: LOGIN usbd
+# KEYWORD: nojail
. /etc/rc.subr
Index: rc.d/timed
===================================================================
RCS file: /home/dcvs/src/etc/rc.d/timed,v
retrieving revision 1.3
diff -u -r1.3 timed
--- rc.d/timed 19 Nov 2005 21:47:32 -0000 1.3
+++ rc.d/timed 13 Mar 2006 18:37:02 -0000
@@ -8,6 +8,7 @@
# PROVIDE: timed
# REQUIRE: DAEMON
# BEFORE: LOGIN
+# KEYWORD: nojail
. /etc/rc.subr
Index: rc.d/usbd
===================================================================
RCS file: /home/dcvs/src/etc/rc.d/usbd,v
retrieving revision 1.3
diff -u -r1.3 usbd
--- rc.d/usbd 19 Nov 2005 21:47:32 -0000 1.3
+++ rc.d/usbd 13 Mar 2006 18:37:06 -0000
@@ -7,6 +7,7 @@
# PROVIDE: usbd
# REQUIRE: DAEMON
# BEFORE: LOGIN
+# KEYWORD: nojail
. /etc/rc.subr
Index: rc.d/vinum
===================================================================
RCS file: /home/dcvs/src/etc/rc.d/vinum,v
retrieving revision 1.3
diff -u -r1.3 vinum
--- rc.d/vinum 19 Nov 2005 21:47:32 -0000 1.3
+++ rc.d/vinum 13 Mar 2006 18:37:10 -0000
@@ -5,6 +5,7 @@
#
# PROVIDE: disks
+# KEYWORD: nojail
. /etc/rc.subr
Index: rc.d/watchdogd
===================================================================
RCS file: /home/dcvs/src/etc/rc.d/watchdogd,v
retrieving revision 1.3
diff -u -r1.3 watchdogd
--- rc.d/watchdogd 19 Nov 2005 21:47:32 -0000 1.3
+++ rc.d/watchdogd 13 Mar 2006 18:37:15 -0000
@@ -30,6 +30,7 @@
# PROVIDE: watchdogd
# REQUIRE: DAEMON
+# KEYWORD: nojail
. /etc/rc.subr
Index: kern_jail.c
===================================================================
RCS file: /home/dcvs/src/sys/kern/kern_jail.c,v
retrieving revision 1.9
diff -u -r1.9 kern_jail.c
--- kern_jail.c 8 Oct 2005 11:43:02 -0000 1.9
+++ kern_jail.c 19 Mar 2006 20:26:29 -0000
@@ -317,6 +317,20 @@
SYSCTL_OID(_jail, OID_AUTO, list, CTLTYPE_STRUCT | CTLFLAG_RD, NULL, 0,
sysctl_jail_list, "S", "List of active jails");
+static int
+sysctl_jail_jailed(SYSCTL_HANDLER_ARGS)
+{
+ struct proc *p = curthread->td_proc;
+ int error, injail;
+
+ injail = jailed(p->p_ucred);
+ error = SYSCTL_OUT(req, &injail, sizeof(injail));
+ return(error);
+}
+
+SYSCTL_PROC(_jail, OID_AUTO, jailed, CTLTYPE_INT | CTLFLAG_RD, NULL, 0,
+ sysctl_jail_jailed, "I", "Process in jail?");
+
void
prison_hold(struct prison *pr)
{
