Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src ntpd_chrootdir needs /dev/clockctl as well



details:   https://anonhg.NetBSD.org/src/rev/7ba544e3d64e
branches:  trunk
changeset: 532871:7ba544e3d64e
user:      lukem <lukem%NetBSD.org@localhost>
date:      Mon Jun 17 06:47:58 2002 +0000

description:
ntpd_chrootdir needs /dev/clockctl as well

diffstat:

 etc/defaults/rc.conf     |  7 ++++---
 etc/rc.d/ntpd            |  6 ++++--
 share/man/man5/rc.conf.5 |  8 +++++---
 3 files changed, 13 insertions(+), 8 deletions(-)

diffs (72 lines):

diff -r 050c080f5b72 -r 7ba544e3d64e etc/defaults/rc.conf
--- a/etc/defaults/rc.conf      Mon Jun 17 06:27:26 2002 +0000
+++ b/etc/defaults/rc.conf      Mon Jun 17 06:47:58 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: rc.conf,v 1.38 2002/06/15 01:55:44 lukem Exp $
+#      $NetBSD: rc.conf,v 1.39 2002/06/17 06:47:58 lukem Exp $
 #
 # /etc/defaults/rc.conf --
 #      default configuration of /etc/rc.conf
@@ -165,8 +165,9 @@
 #named_chrootdir="/var/chroot/named"
 
 # To run the ntpd(8) NTP server as an unprivileged user under a
-# chroot(2) cage, uncomment the following after installing a kernel
-# which has "pseudo-device clockctl" compiled in.
+# chroot(2) cage, uncomment the following, after ensuring that:
+#      - The kernel has "pseudo-device clockctl" compiled in
+#      - /dev/clockctl is present
 #
 #ntpd_chrootdir="/var/chroot/ntpd"
 
diff -r 050c080f5b72 -r 7ba544e3d64e etc/rc.d/ntpd
--- a/etc/rc.d/ntpd     Mon Jun 17 06:27:26 2002 +0000
+++ b/etc/rc.d/ntpd     Mon Jun 17 06:47:58 2002 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: ntpd,v 1.7 2002/06/15 01:55:44 lukem Exp $
+# $NetBSD: ntpd,v 1.8 2002/06/17 06:47:59 lukem Exp $
 #
 
 # PROVIDE: ntpd
@@ -31,7 +31,9 @@
        # exists and ntpd isn't running at this point (unless forcestart
        # is used).
        #
-       # This requires "pseudo-device clockctl" compiled in to kernel.
+       # Before enabling ntpd_chrootdir, ensure that:
+       #       - The kernel has "pseudo-device clockctl" compiled in
+       #       - /dev/clockctl is present
        #
        if [ ! -c "${ntpd_chrootdir}/dev/clockctl" ]; then
                rm -f "${ntpd_chrootdir}/dev/clockctl"
diff -r 050c080f5b72 -r 7ba544e3d64e share/man/man5/rc.conf.5
--- a/share/man/man5/rc.conf.5  Mon Jun 17 06:27:26 2002 +0000
+++ b/share/man/man5/rc.conf.5  Mon Jun 17 06:47:58 2002 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: rc.conf.5,v 1.62 2002/06/15 02:00:06 lukem Exp $
+.\"    $NetBSD: rc.conf.5,v 1.63 2002/06/17 06:47:59 lukem Exp $
 .\"
 .\" Copyright (c) 1996 Matthew R. Green
 .\" Copyright (c) 1997 Curt J. Sampson
@@ -32,7 +32,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd June 15, 2002
+.Dd June 17, 2002
 .Dt RC.CONF 5
 .Os
 .\" turn off hyphenation
@@ -686,7 +686,9 @@
 listens to.
 This option requires that the kernel has
 .Dl pseudo-device clockctl
-compiled in.
+compiled in, and that
+.Pa /dev/clockctl
+is present.
 .It Sy sendmail
 .Sq YES
 or



Home | Main Index | Thread Index | Old Index