CVS commit: [netbsd-5-1] src/etc/rc.d

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Wed Jan  7 18:42:14 UTC 2015

Modified Files:
src/etc/rc.d [netbsd-5-1]: ntpd

Log Message:
Pull up following revision(s) (requested by he in ticket #1940):
etc/rc.d/ntpd: revision 1.15
new ntpd wants to be able to translate ntp into a port number after chroot,
so give it its own small copy of /etc/services in the chroot


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.13.42.1 src/etc/rc.d/ntpd

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/etc/rc.d/ntpd
diff -u src/etc/rc.d/ntpd:1.13 src/etc/rc.d/ntpd:1.13.42.1
--- src/etc/rc.d/ntpd:1.13	Fri Aug 13 18:08:03 2004
+++ src/etc/rc.d/ntpd	Wed Jan  7 18:42:14 2015
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: ntpd,v 1.13 2004/08/13 18:08:03 mycroft Exp $
+# $NetBSD: ntpd,v 1.13.42.1 2015/01/07 18:42:14 msaitoh Exp $
 #
 
 # PROVIDE: ntpd
@@ -49,6 +49,21 @@ ntpd_precmd()
 	fi
 	ln -fs ${ntpd_chrootdir}/var/db/ntp.drift /var/db/ntp.drift
 
+	if [ ! -d ${ntpd_chrootdir}/etc ]; then
+		mkdir ${ntpd_chrootdir}/etc
+	fi
+	if [ ! -f ${ntpd_chrootdir}/etc/services ]; then
+		getent services ntp/udp ntp/tcp \
+			 ${ntpd_chrootdir}/etc/services
+	fi
+	if [ ! -d ${ntpd_chrootdir}/var/db ]; then
+		mkdir -p ${ntpd_chrootdir}/var/db
+	fi
+	if [ ! -f ${ntpd_chrootdir}/var/db/services.cdb ]; then
+		services_mkdb -o ${ntpd_chrootdir}/var/db/services.cdb \
+			${ntpd_chrootdir}/etc/services
+	fi
+
 	#	Change run_rc_commands()'s internal copy of $ntpd_flags
 	#
 	rc_flags=-u ntpd:ntpd -i ${ntpd_chrootdir} $rc_flags

CVS commit: [netbsd-5-1] src/etc/ssh

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Fri Sep 20 03:11:24 UTC 2013

Modified Files:
src/etc/ssh [netbsd-5-1]: ssh_known_hosts

Log Message:
Pull up following revision(s) (requested by spz in ticket #1878):
etc/ssh/ssh_known_hosts: revision 1.7
etc/ssh/ssh_known_hosts: revision 1.8
babylon5 ssh key changed (due to reinstall)
fix narn-names - mollari
add ecdsa keys (in many cases, pre-emptive strikes)


To generate a diff of this commit:
cvs rdiff -u -r1.4.26.1.2.1 -r1.4.26.1.2.2 src/etc/ssh/ssh_known_hosts

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/etc/ssh/ssh_known_hosts
diff -u src/etc/ssh/ssh_known_hosts:1.4.26.1.2.1 src/etc/ssh/ssh_known_hosts:1.4.26.1.2.2
--- src/etc/ssh/ssh_known_hosts:1.4.26.1.2.1	Sun Jan 16 12:43:15 2011
+++ src/etc/ssh/ssh_known_hosts	Fri Sep 20 03:11:24 2013
@@ -1,27 +1,51 @@
-#	$NetBSD: ssh_known_hosts,v 1.4.26.1.2.1 2011/01/16 12:43:15 bouyer Exp $
+#	$NetBSD: ssh_known_hosts,v 1.4.26.1.2.2 2013/09/20 03:11:24 riz Exp $
 #
 anoncvs.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEA3QiBl8leG9fqIJpKeNov0PKq5YryFFiroMWOPUv4hDFn8R0jC07YVaR/OSBrr37CTmGX5AFceXPzoFnLlwCqWR7rXg4NR75FTlTp9CG9EBAEtU8mee27KDrUFBTZdfVl2+aRYoAI5fTXA+0vpIO68Cq843vRWUZCcwinS4cNLUU=
 
+anoncvs.netbsd.org ecdsa-sha2-nistp521 E2VjZHNhLXNoYTItbmlzdHA1MjEIbmlzdHA1MjEAAACFBAFhP4E9+oDpCQZ9yVQA7OzDF0tHnL3eykrqEt3hS+rdHXA0Ak5uCaxi2Aj2JRnAKW1JYbjQ5hyKHYZ2o6SfDimqaQBAt18nWm4CCKc20UbSgyWaH/x+O3J68j5n43MY8gHycPKcLHly2FjhDhuhHuoYODfq9GYn3okYsMu2T/i6Tg+SKw==
+#
 cvs.netbsd.org,cvs4.netbsd.org,cvs6.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEA1b7MS3j0v6NzPr/Snh8OJTILvGLD9OA/zdrTfzQdq3doJjkLKJhD4WYj8SonaauEKuqzdJa1KVilj44GCrJBnjwbWg2BdJWLzB5YFmNgvmXwoqrl9kRyzMVk47UOxeREIipXldKajkCTc/nwa1mGrsCwVlC+TwAhWIyjyza6MOk=
 
+cvs.netbsd.org,cvs4.netbsd.org,cvs6.netbsd.org ecdsa-sha2-nistp521 E2VjZHNhLXNoYTItbmlzdHA1MjEIbmlzdHA1MjEAAACFBAGFloNiNSqIkMFVBUglnE9AgBI6J5cLh4hej8DZEtn4InWbFD3dxIFLvw8ZA3qLpVX/TCjFt++MEO3w5GJ2L7a2zQHGIn50E5KVcHuh9arVYRhLPqs9Vfl6ANJ6WiQ81f5k/dZ6ESI8BwqOyQY22/zTujyL8FGHvlZukNsB4iie7Wl+/Q==
+#
 ftp.netbsd.org,ftp4.netbsd.org,ftp6.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAv+tO1aHHsW1McwHgnJ28qsXn8gH8z/61yopJzmOKuHH07zBYOnhenAcni6E0+BRavSXXIuuTDdyxEyWcTqXoR0LEVShTzAFmZS3RyzTVl7A+Fp644lNnRaJh1380H+20uZjcKSPU0IudG5J7QllMbJY9RnIBFjGLzTb4vrC8GIc=
 
-mail.netbsd.org,homeworld.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAt8UJLhW8iou8Ack7V5XrzfCgzOkdK75+xDZePMBPg+CYDLnHbP1+KQaSrvfnvDzCvgOUXHOkGji1jbrtzDYwv7Itw0hRUo7TxR99c3bTomb9U0vWV5k4FDIyz4xJXWBJMVkKseAWAXgnc5FSdB6V/e21TAISJBl9dolhqOGVsxM=
+morden.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAv+tO1aHHsW1McwHgnJ28qsXn8gH8z/61yopJzmOKuHH07zBYOnhenAcni6E0+BRavSXXIuuTDdyxEyWcTqXoR0LEVShTzAFmZS3RyzTVl7A+Fp644lNnRaJh1380H+20uZjcKSPU0IudG5J7QllMbJY9RnIBFjGLzTb4vrC8GIc=
 
-www.netbsd.org,www4.netbsd.org,gnats.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAyBrlCbbZ2lQxWt7c9Ru0byoOktalLWKJ4t0kzWp6C2oVa+Ll1c1TO2FJb34DCZqULfSHaMmKgq647d75npk9GeXXLk8QwcX6kNl7QFnHo7GUHnHtiZAjTMbYmYOaNLi1PjwyQH+9yeRQYsGW7xejTsyK0yuRKROdCl/QU9gkB3s=
+ftp.netbsd.org,ftp4.netbsd.org,ftp6.netbsd.org ecdsa-sha2-nistp521 E2VjZHNhLXNoYTItbmlzdHA1MjEIbmlzdHA1MjEAAACFBAFp8B5B8/cosThWLYgZp0jQGIqduvJUlra4gyCCqKLnaTn44cPltjjDWp1UHRsdVjm8ka81EYSJ95ZgD8lbPE/XZwBBmisSzTVoQT+b2x7ENPz2BOAgjxX5Lljy6Z2vpky8Gtu2nNJlFtekPbAS4wyDxHuwR5SZMEYNPTWegtBcvm460A==
 
+morden.netbsd.org ecdsa-sha2-nistp521 E2VjZHNhLXNoYTItbmlzdHA1MjEIbmlzdHA1MjEAAACFBAFp8B5B8/cosThWLYgZp0jQGIqduvJUlra4gyCCqKLnaTn44cPltjjDWp1UHRsdVjm8ka81EYSJ95ZgD8lbPE/XZwBBmisSzTVoQT+b2x7ENPz2BOAgjxX5Lljy6Z2vpky8Gtu2nNJlFtekPbAS4wyDxHuwR5SZMEYNPTWegtBcvm460A==
+#
+mail.netbsd.org,homeworld.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAt8UJLhW8iou8Ack7V5XrzfCgzOkdK75+xDZePMBPg+CYDLnHbP1+KQaSrvfnvDzCvgOUXHOkGji1jbrtzDYwv7Itw0hRUo7TxR99c3bTomb9U0vWV5k4FDIyz4xJXWBJMVkKseAWAXgnc5FSdB6V/e21TAISJBl9dolhqOGVsxM=
+
+mail.netbsd.org,homeworld.netbsd.org ecdsa-sha2-nistp521 E2VjZHNhLXNoYTItbmlzdHA1MjEIbmlzdHA1MjEAAACFBADOK8FUImVH0iPCzfwBD9gT8AUELweTGWry8eBXFbxCDcOYW+4HRtUuY7OqP/sJ8tlYCNg9F+PjAIDqp72h6YgPcQH2/M/8ZXizAT7y7uCiysYxMKYbmuBHqVybaJd5rWUNL19JE6e3H+KBkwYQbf7Jrrs6RhDYMCguPmi6ppNEEEAAcQ==
+#
 pkgbuild.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAz2c3dFuPdL75gpvwiYinwQ5jiRlfe3HvbXbMkTvpZxLFBQWTVkcDr/yd+vCiWcqVKVENX2tIvT91gPM9/iw7Wl82rxZ54jjaL0pWPL0yjSVhSFxff9pH+as5hgX4l1HjmXLB6v+MWyYVmOSpB01NfVVV2Z9+BGp3Y7i+U5pCdf0=
 
+pkgbuild.netbsd.org ecdsa-sha2-nistp521 E2VjZHNhLXNoYTItbmlzdHA1MjEIbmlzdHA1MjEAAACFBAE7rzIErnIESapcXZJYCMmlNlS3cbeE9zbvraS0/woWexchdhVxLOi/qkfqM5U0Zkin1ooNsUfEYmaJ1k1T+LHbzAAGwZMo/aESnTEekYgBSwhHUj1EjIWeeN/bet9HJrz9Y4WGd2MOXHL88T+cUzfHLEneYrrVe6FDbAlMpSPw4OAOAQ==
+#
 build.netbsd.org ssh-rsa 

CVS commit: [netbsd-5-1] src/etc

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Sun Jun  9 16:12:46 UTC 2013

Modified Files:
src/etc [netbsd-5-1]: MAKEDEV.tmpl

Log Message:
Pull up following revision(s) (requested by apb in ticket #1848):
etc/MAKEDEV.tmpl: revision 1.161
The console major number is not always 0; when creating a temporary
console while populating a memory disk, use %CONSOLE_CMAJOR% instead
of 0, and let MAKEDEV.awk substitute the appropriate machine-dependent
major number.
This fixes a bug that I introduced in revision 1.82 dated 2007-03-11.


To generate a diff of this commit:
cvs rdiff -u -r1.113.2.7 -r1.113.2.7.2.1 src/etc/MAKEDEV.tmpl

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/etc/MAKEDEV.tmpl
diff -u src/etc/MAKEDEV.tmpl:1.113.2.7 src/etc/MAKEDEV.tmpl:1.113.2.7.2.1
--- src/etc/MAKEDEV.tmpl:1.113.2.7	Sat Sep 26 19:52:09 2009
+++ src/etc/MAKEDEV.tmpl	Sun Jun  9 16:12:46 2013
@@ -1,5 +1,5 @@
 #!/bin/sh -
-#	$NetBSD: MAKEDEV.tmpl,v 1.113.2.7 2009/09/26 19:52:09 snj Exp $
+#	$NetBSD: MAKEDEV.tmpl,v 1.113.2.7.2.1 2013/06/09 16:12:46 msaitoh Exp $
 #
 # Copyright (c) 2003,2007,2008 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -2129,7 +2129,7 @@ create_mfs_dev()
 
 	if $do_redirect; then
 		# Redirect stdout and stderr to console
-		mknod -m 600 -g 0 -u 0 temp_console c 0 0
+		mknod -m 600 -g 0 -u 0 temp_console c %CONSOLE_CMAJOR% 0
 		exec temp_console 21
 		rm temp_console
 	fi

CVS commit: [netbsd-5-1] src/etc/namedb

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Sun Jan 13 17:07:29 UTC 2013

Modified Files:
src/etc/namedb [netbsd-5-1]: root.cache

Log Message:
Pull up following revision(s) (requested by taca in ticket #1839):
etc/namedb/root.cache: revision 1.17
D.ROOT-SERVERS.NET changes IPv4 address.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.13.20.1 src/etc/namedb/root.cache

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/etc/namedb/root.cache
diff -u src/etc/namedb/root.cache:1.13 src/etc/namedb/root.cache:1.13.20.1
--- src/etc/namedb/root.cache:1.13	Tue Feb  5 09:19:06 2008
+++ src/etc/namedb/root.cache	Sun Jan 13 17:07:29 2013
@@ -1,4 +1,4 @@
-;	$NetBSD: root.cache,v 1.13 2008/02/05 09:19:06 tron Exp $
+;	$NetBSD: root.cache,v 1.13.20.1 2013/01/13 17:07:29 bouyer Exp $
 ;
 ;   This file holds the information on root name servers needed to
 ;   initialize cache of Internet domain name servers
@@ -33,7 +33,8 @@ C.ROOT-SERVERS.NET.  360  A 
 ; formerly TERP.UMD.EDU
 ;
 .360  NSD.ROOT-SERVERS.NET.
-D.ROOT-SERVERS.NET.  360  A 128.8.10.90
+D.ROOT-SERVERS.NET.  360  A 199.7.91.13
+D.ROOT-SERVERS.NET.	 360    2001:500:2D::D
 ;
 ; formerly NS.NASA.GOV
 ;

CVS commit: [netbsd-5-1] src/etc/ssh

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Sun Jan 16 12:43:16 UTC 2011

Modified Files:
src/etc/ssh [netbsd-5-1]: ssh_known_hosts

Log Message:
Pull up following revision(s) (requested by riz in ticket #1516):
etc/ssh/ssh_known_hosts: revision 1.6
releng has been on mollari for a while now. Also, add wiki


To generate a diff of this commit:
cvs rdiff -u -r1.4.26.1 -r1.4.26.1.2.1 src/etc/ssh/ssh_known_hosts

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/etc/ssh/ssh_known_hosts
diff -u src/etc/ssh/ssh_known_hosts:1.4.26.1 src/etc/ssh/ssh_known_hosts:1.4.26.1.2.1
--- src/etc/ssh/ssh_known_hosts:1.4.26.1	Sun Aug 30 02:49:08 2009
+++ src/etc/ssh/ssh_known_hosts	Sun Jan 16 12:43:15 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: ssh_known_hosts,v 1.4.26.1 2009/08/30 02:49:08 snj Exp $
+#	$NetBSD: ssh_known_hosts,v 1.4.26.1.2.1 2011/01/16 12:43:15 bouyer Exp $
 #
 anoncvs.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEA3QiBl8leG9fqIJpKeNov0PKq5YryFFiroMWOPUv4hDFn8R0jC07YVaR/OSBrr37CTmGX5AFceXPzoFnLlwCqWR7rXg4NR75FTlTp9CG9EBAEtU8mee27KDrUFBTZdfVl2+aRYoAI5fTXA+0vpIO68Cq843vRWUZCcwinS4cNLUU=
 
@@ -8,13 +8,13 @@
 
 mail.netbsd.org,homeworld.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAt8UJLhW8iou8Ack7V5XrzfCgzOkdK75+xDZePMBPg+CYDLnHbP1+KQaSrvfnvDzCvgOUXHOkGji1jbrtzDYwv7Itw0hRUo7TxR99c3bTomb9U0vWV5k4FDIyz4xJXWBJMVkKseAWAXgnc5FSdB6V/e21TAISJBl9dolhqOGVsxM=
 
-www.netbsd.org,www4.netbsd.org,gnats.netbsd.org,releng.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAyBrlCbbZ2lQxWt7c9Ru0byoOktalLWKJ4t0kzWp6C2oVa+Ll1c1TO2FJb34DCZqULfSHaMmKgq647d75npk9GeXXLk8QwcX6kNl7QFnHo7GUHnHtiZAjTMbYmYOaNLi1PjwyQH+9yeRQYsGW7xejTsyK0yuRKROdCl/QU9gkB3s=
+www.netbsd.org,www4.netbsd.org,gnats.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAyBrlCbbZ2lQxWt7c9Ru0byoOktalLWKJ4t0kzWp6C2oVa+Ll1c1TO2FJb34DCZqULfSHaMmKgq647d75npk9GeXXLk8QwcX6kNl7QFnHo7GUHnHtiZAjTMbYmYOaNLi1PjwyQH+9yeRQYsGW7xejTsyK0yuRKROdCl/QU9gkB3s=
 
 pkgbuild.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAz2c3dFuPdL75gpvwiYinwQ5jiRlfe3HvbXbMkTvpZxLFBQWTVkcDr/yd+vCiWcqVKVENX2tIvT91gPM9/iw7Wl82rxZ54jjaL0pWPL0yjSVhSFxff9pH+as5hgX4l1HjmXLB6v+MWyYVmOSpB01NfVVV2Z9+BGp3Y7i+U5pCdf0=
 
 build.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAzmmcuzoX0D/qDFdDJDyRgQGkUaNTEu7GdruMg1N+ajqvEoKQHQEEBrMdDbeYqCUYacHyhTRMrP6vZ27iX90rl9iS1lR2iPHp/mbnf+iV/BzdWROPvJWxp9/Am/DrYL+Idah5AYNnkC7fon9n+BeMqPDXYGYl/U+dAzp+8GHPhRc=
 
-blog.netbsd.org,rt.netbsd.org,monitor.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEArWf/facPOPEDY9ZfTpiNHK0HQFv05VtvR/LzgBAXnugAD87VdlkSKTj97UGkEjxIVFDMc2Wfh5THeCNvl38sScY9JGtKaE1VSCdmmVyG2d1Ky4XjARS3l4/ZYiBbZRNGm34+ZlpxgXOGSgNB72RrBVK6upAweXpR7egY6fpiwi0=
+blog.netbsd.org,rt.netbsd.org,monitor.netbsd.org,releng.netbsd.org,wiki.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEArWf/facPOPEDY9ZfTpiNHK0HQFv05VtvR/LzgBAXnugAD87VdlkSKTj97UGkEjxIVFDMc2Wfh5THeCNvl38sScY9JGtKaE1VSCdmmVyG2d1Ky4XjARS3l4/ZYiBbZRNGm34+ZlpxgXOGSgNB72RrBVK6upAweXpR7egY6fpiwi0=
 
 mollari.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEArWf/facPOPEDY9ZfTpiNHK0HQFv05VtvR/LzgBAXnugAD87VdlkSKTj97UGkEjxIVFDMc2Wfh5THeCNvl38sScY9JGtKaE1VSCdmmVyG2d1Ky4XjARS3l4/ZYiBbZRNGm34+ZlpxgXOGSgNB72RrBVK6upAweXpR7egY6fpiwi0=
 

CVS commit: [netbsd-5-1] src/etc

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Sun Jan 16 13:00:39 UTC 2011

Modified Files:
src/etc [netbsd-5-1]: named.conf
src/etc/mtree [netbsd-5-1]: special

Log Message:
Pull up following revision(s) (requested by spz in ticket #1528):
etc/named.conf: revision 1.6
etc/mtree/special: revision 1.133
Enable dnssec, and populate managed-keys.bind
Add directory for bind's managed keys.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.5.10.1 src/etc/named.conf
cvs rdiff -u -r1.121.2.3 -r1.121.2.3.2.1 src/etc/mtree/special

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/etc/named.conf
diff -u src/etc/named.conf:1.5 src/etc/named.conf:1.5.10.1
--- src/etc/named.conf:1.5	Wed Jul 23 05:47:48 2008
+++ src/etc/named.conf	Sun Jan 16 13:00:39 2011
@@ -1,10 +1,14 @@
-# $NetBSD: named.conf,v 1.5 2008/07/23 05:47:48 dholland Exp $
+# $NetBSD: named.conf,v 1.5.10.1 2011/01/16 13:00:39 bouyer Exp $
 
 # boot file for secondary name server
 # Note that there should be one primary entry for each SOA record.
 
 options {
 	directory /etc/namedb;
+	dnssec-enable yes;
+	dnssec-validation yes;
+	dnssec-lookaside auto;
+	managed-keys-directory keys;
 	allow-recursion { localhost; localnets; };
 
 	#

Index: src/etc/mtree/special
diff -u src/etc/mtree/special:1.121.2.3 src/etc/mtree/special:1.121.2.3.2.1
--- src/etc/mtree/special:1.121.2.3	Fri Sep 18 02:01:38 2009
+++ src/etc/mtree/special	Sun Jan 16 13:00:39 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: special,v 1.121.2.3 2009/09/18 02:01:38 snj Exp $
+#	$NetBSD: special,v 1.121.2.3.2.1 2011/01/16 13:00:39 bouyer Exp $
 #	@(#)special	8.2 (Berkeley) 1/23/94
 #
 # This file may be overwritten on upgrades.
@@ -381,6 +381,7 @@
 ./var/chroot/named/etc		type=dir  mode=0755
 ./var/chroot/named/etc/namedb	type=dir  mode=0755
 ./var/chroot/named/etc/namedb/cache	type=dir mode=0775 uname=named gname=named
+./var/chroot/named/etc/namedb/keys	type=dir mode=0775 uname=named gname=named
 ./var/chroot/named/usr		type=dir  mode=0755
 ./var/chroot/named/usr/libexec	type=dir  mode=0755
 ./var/chroot/named/var		type=dir  mode=0755

CVS commit: [netbsd-5-1] src/etc/rc.d

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Sun Jan  9 20:51:05 UTC 2011

Modified Files:
src/etc/rc.d [netbsd-5-1]: named

Log Message:
Pull up following revision(s) (requested by tron in ticket #1519):
etc/rc.d/named: revision 1.21
etc/rc.d/named: revision 1.19
Adjust for new default location of the pid file.
handle new directory structure.


To generate a diff of this commit:
cvs rdiff -u -r1.18.28.1 -r1.18.28.1.2.1 src/etc/rc.d/named

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/etc/rc.d/named
diff -u src/etc/rc.d/named:1.18.28.1 src/etc/rc.d/named:1.18.28.1.2.1
--- src/etc/rc.d/named:1.18.28.1	Sun Nov 15 06:05:52 2009
+++ src/etc/rc.d/named	Sun Jan  9 20:51:05 2011
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: named,v 1.18.28.1 2009/11/15 06:05:52 snj Exp $
+# $NetBSD: named,v 1.18.28.1.2.1 2011/01/09 20:51:05 riz Exp $
 #
 
 # PROVIDE: named
@@ -13,7 +13,7 @@
 name=named
 rcvar=$name
 command=/usr/sbin/${name}
-pidfile=/var/run/${name}.pid
+pidfile=/var/run/${name}/${name}.pid
 start_precmd=named_precmd
 extra_commands=reload
 required_dirs=$named_chrootdir	# if it is set, it must exist
@@ -114,7 +114,12 @@
 		cmp -s /etc/localtime ${named_chrootdir}/etc/localtime || \
 		cp -p /etc/localtime ${named_chrootdir}/etc/localtime
 	fi
-	ln -fs ${named_chrootdir}${pidfile} ${pidfile}
+
+	local piddir=$(dirname ${pidfile})
+	mkdir -p ${named_chrootdir}${piddir} ${piddir}
+	chmod 755 ${named_chrootdir}${piddir} ${piddir}
+	chown named:named ${named_chrootdir}${piddir} ${piddir}
+	ln -fs ${named_chrootdir}${pidfile} ${pidfile}
 
 	#	Change run_rc_commands()'s internal copy of $named_flags
 	#