Module Name: src
Committed By: christos
Date: Mon Nov 23 19:56:47 UTC 2015
Modified Files:
src/distrib/sets/lists/base: mi
src/etc/mtree: NetBSD.dist.base special
src/etc/rc.d: ntpd
Log Message:
PR/49380: KAMADA Ken'ichi: ntpd_chrootdir does not work on NetBSD 7.0_BETA
Provide /etc/resolv.conf so that it can resolve names. This is needed because
of deferred name resolution.
XXX: pullup -7
To generate a diff of this commit:
cvs rdiff -u -r1.1117 -r1.1118 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.149 -r1.150 src/etc/mtree/NetBSD.dist.base
cvs rdiff -u -r1.152 -r1.153 src/etc/mtree/special
cvs rdiff -u -r1.15 -r1.16 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/distrib/sets/lists/base/mi
diff -u src/distrib/sets/lists/base/mi:1.1117 src/distrib/sets/lists/base/mi:1.1118
--- src/distrib/sets/lists/base/mi:1.1117 Wed Nov 11 02:48:41 2015
+++ src/distrib/sets/lists/base/mi Mon Nov 23 14:56:47 2015
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1117 2015/11/11 07:48:41 ozaki-r Exp $
+# $NetBSD: mi,v 1.1118 2015/11/23 19:56:47 christos Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -5877,6 +5877,7 @@
./var/chroot/named/var/tmp base-bind-root
./var/chroot/ntpd base-ntp-root
./var/chroot/ntpd/dev base-ntp-root
+./var/chroot/ntpd/etc base-ntp-root
./var/chroot/ntpd/var base-ntp-root
./var/chroot/ntpd/var/db base-ntp-root
./var/chroot/ntpd/var/run base-ntp-root
Index: src/etc/mtree/NetBSD.dist.base
diff -u src/etc/mtree/NetBSD.dist.base:1.149 src/etc/mtree/NetBSD.dist.base:1.150
--- src/etc/mtree/NetBSD.dist.base:1.149 Thu Sep 3 18:24:02 2015
+++ src/etc/mtree/NetBSD.dist.base Mon Nov 23 14:56:47 2015
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.dist.base,v 1.149 2015/09/03 22:24:02 youri Exp $
+# $NetBSD: NetBSD.dist.base,v 1.150 2015/11/23 19:56:47 christos Exp $
# @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93
# Do not customize this file as it may be overwritten on upgrades.
@@ -1268,6 +1268,7 @@
./var/chroot/named/var/tmp mode=01775 gname=named
./var/chroot/ntpd
./var/chroot/ntpd/dev
+./var/chroot/ntpd/etc
./var/chroot/ntpd/var
./var/chroot/ntpd/var/db mode=0775 gname=ntpd
./var/chroot/ntpd/var/run mode=0775 gname=ntpd
Index: src/etc/mtree/special
diff -u src/etc/mtree/special:1.152 src/etc/mtree/special:1.153
--- src/etc/mtree/special:1.152 Sat Mar 21 15:10:43 2015
+++ src/etc/mtree/special Mon Nov 23 14:56:47 2015
@@ -1,4 +1,4 @@
-# $NetBSD: special,v 1.152 2015/03/21 19:10:43 jmcneill Exp $
+# $NetBSD: special,v 1.153 2015/11/23 19:56:47 christos Exp $
# @(#)special 8.2 (Berkeley) 1/23/94
#
# This file may be overwritten on upgrades.
@@ -400,6 +400,7 @@
./var/chroot/named/var/tmp type=dir mode=01775 gname=named
./var/chroot/ntpd type=dir mode=0755
./var/chroot/ntpd/dev type=dir mode=0755
+./var/chroot/ntpd/etc type=dir mode=0755
./var/chroot/ntpd/var type=dir mode=0755
./var/chroot/ntpd/var/db type=dir mode=0775 gname=ntpd
./var/chroot/ntpd/var/run type=dir mode=0775 gname=ntpd
Index: src/etc/rc.d/ntpd
diff -u src/etc/rc.d/ntpd:1.15 src/etc/rc.d/ntpd:1.16
--- src/etc/rc.d/ntpd:1.15 Thu Dec 25 18:00:18 2014
+++ src/etc/rc.d/ntpd Mon Nov 23 14:56:47 2015
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: ntpd,v 1.15 2014/12/25 23:00:18 spz Exp $
+# $NetBSD: ntpd,v 1.16 2015/11/23 19:56:47 christos Exp $
#
# PROVIDE: ntpd
@@ -53,6 +53,13 @@ ntpd_precmd()
if [ ! -d "${ntpd_chrootdir}/etc" ]; then
mkdir "${ntpd_chrootdir}/etc"
fi
+
+ for f in resolv.conf; do
+ if ! cmp -s "/etc/$f" "${ntpd_chrootdir}/etc/$f"; then
+ cp -p "/etc/$f" "${ntpd_chrootdir}/etc/$f"
+ fi
+ done
+
if [ ! -f "${ntpd_chrootdir}/etc/services" ]; then
getent services ntp/udp ntp/tcp \
> "${ntpd_chrootdir}/etc/services"
