o Add support for detecting a jailed environment. If a script

  cannot or does not want to be executed in a jail the
  KEYWORDS line should contain the nojail keyword.
o Update Copyright

# I suggest people who use jails more extensively than I do
# make commits to the appropriate files.

1 files changed, 4 insertions, 2 deletions

diff --git a/etc/rc b/etc/rc
index 029c5f6..fa9a850 100644
--- a/etc/rc
+++ b/etc/rc
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (c) 2000  The FreeBSD Project
+# Copyright (c) 2000-2004  The FreeBSD Project
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -66,7 +66,9 @@ else
 fi
 
 os=`eval ${CMD_OSTYPE}`
-files=`rcorder -k ${os} -s nostart /etc/rc.d/* 2>/dev/null`
+skip="nostart"
+[ `/sbin/sysctl -n security.jail.jailed` -eq 1 ] && skip="$skip nojail"
+files=`rcorder -k ${os} -s ${skip} /etc/rc.d/* 2>/dev/null`
 
 for _rc_elem in ${files}; do
 	run_rc_script ${_rc_elem} ${_boot}