From owner-svn-src-head@freebsd.org Wed Jan 27 02:25:27 2016 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3171DA6EB6D; Wed, 27 Jan 2016 02:25:27 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id F38A6139C; Wed, 27 Jan 2016 02:25:26 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0R2PP87062223; Wed, 27 Jan 2016 02:25:25 GMT (envelope-from cy@FreeBSD.org) Received: (from cy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0R2PPah062221; Wed, 27 Jan 2016 02:25:25 GMT (envelope-from cy@FreeBSD.org) Message-Id: <201601270225.u0R2PPah062221@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org using -f From: Cy Schubert Date: Wed, 27 Jan 2016 02:25:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r294884 - in head/etc: defaults rc.d X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Jan 2016 02:25:27 -0000 Author: cy Date: Wed Jan 27 02:25:25 2016 New Revision: 294884 URL: https://svnweb.freebsd.org/changeset/base/294884 Log: Allow specification of fetch options for ntp leap-seconds fetch. MFC after: 1 week X-MFC with: r289421, r293037, r294773 Modified: head/etc/defaults/rc.conf head/etc/rc.d/ntpd Modified: head/etc/defaults/rc.conf ============================================================================== --- head/etc/defaults/rc.conf Wed Jan 27 02:23:54 2016 (r294883) +++ head/etc/defaults/rc.conf Wed Jan 27 02:25:25 2016 (r294884) @@ -368,6 +368,8 @@ ntp_db_leapfile="/var/db/ntpd.leap-secon # Working copy (updated weekly) leapfile ntp_leapfile_sources="https://www.ietf.org/timezones/data/leap-seconds.list" # Source from which to fetch leapfile +ntp_leapfile_fetch_opts="-mq" # Options to use for ntp leapfile fetch, + # e.g. --no-verify-peer ntp_leapfile_expiry_days=30 # Check for new leapfile 30 days prior to # expiry. ntp_leapfile_fetch_verbose="NO" # Be verbose during NTP leapfile fetch Modified: head/etc/rc.d/ntpd ============================================================================== --- head/etc/rc.d/ntpd Wed Jan 27 02:23:54 2016 (r294883) +++ head/etc/rc.d/ntpd Wed Jan 27 02:25:25 2016 (r294884) @@ -105,7 +105,7 @@ ntpd_fetch_leapfile() { $verbose Within ntp leapfile expiry limit, initiating fetch for url in $ntp_leapfile_sources ; do $verbose fetching $url - fetch -mqo $ntp_tmp_leapfile $url && break + fetch $ntp_leapfile_fetch_opts -o $ntp_tmp_leapfile $url && break done ntp_ver_no_tmp=$(get_ntp_leapfile_ver $ntp_tmp_leapfile) if [ "$ntp_ver_no_tmp" -gt "$ntp_ver_no_db" ]; then