In message <201806282205.w5sm5t0c088...@repo.freebsd.org>, Ian Lepore writes: > Author: ian > Date: Thu Jun 28 22:05:29 2018 > New Revision: 335786 > URL: https://svnweb.freebsd.org/changeset/base/335786 > > Log: > Rename variable ntp_tmp_leapfile to have a leading underbar, to distinguish > it from variables with similar names which are set in rc.conf. This will > make more sense as the script grows more similar-name local variables in > some upcoming changes. > > Modified: > head/etc/rc.d/ntpd > > Modified: head/etc/rc.d/ntpd > ============================================================================= > = > --- head/etc/rc.d/ntpd Thu Jun 28 21:59:45 2018 (r335785) > +++ head/etc/rc.d/ntpd Thu Jun 28 22:05:29 2018 (r335786) > @@ -20,7 +20,7 @@ fetch_cmd="ntpd_fetch_leapfile" > needfetch_cmd="ntpd_needfetch_leapfile" > start_precmd="ntpd_precmd" > > -ntp_tmp_leapfile="/var/run/ntpd.leap-seconds.list" > +_ntp_tmp_leapfile="/var/run/ntpd.leap-seconds.list" > > load_rc_config $name > > @@ -56,7 +56,7 @@ ntpd_precmd() > ( cd /dev ; /bin/pax -rw -pe clockctl "${ntpd_chrootdir}/dev" ) > fi > ln -fs "${ntpd_chrootdir}/var/db/ntp.drift" /var/db/ntp.drift > - ln -fs "${ntpd_chrootdir}${ntp_tmp_leapfile}" ${ntp_tmp_leapfile} > + ln -fs "${ntpd_chrootdir}${_ntp_tmp_leapfile}" ${_ntp_tmp_leapfile} > > # Change run_rc_commands()'s internal copy of $ntpd_flags > # > @@ -140,15 +140,15 @@ ntpd_fetch_leapfile() { > if ntpd_needfetch_leapfile ; then > for url in $ntp_leapfile_sources ; do > $verbose fetching $url > - fetch $ntp_leapfile_fetch_opts -o $ntp_tmp_leapfile $ur > l && break > + fetch $ntp_leapfile_fetch_opts -o $_ntp_tmp_leapfile $u > rl && break > done > - ntp_ver_no_tmp=$(get_ntp_leapfile_ver $ntp_tmp_leapfile) > - ntp_expiry_tmp=$(get_ntp_leapfile_expiry $ntp_tmp_leapfile) > + ntp_ver_no_tmp=$(get_ntp_leapfile_ver $_ntp_tmp_leapfile) > + ntp_expiry_tmp=$(get_ntp_leapfile_expiry $_ntp_tmp_leapfile) > if [ "$ntp_expiry_tmp" -gt "$ntp_expiry_db" -o \ > "$ntp_expiry_tmp" -eq "$ntp_expiry_db" -a \ > "$ntp_ver_no_tmp" -gt "$ntp_ver_no_db" ]; then > $verbose using $url as $ntp_db_leapfile > - mv -f $ntp_tmp_leapfile $ntp_db_leapfile || > + mv -f $_ntp_tmp_leapfile $ntp_db_leapfile || > $verbose "warning: cannot replace $ntp_db_leapfile > (read-only fs?)" > else > $verbose using existing $ntp_db_leapfile >
Thank you Ian. -- Cheers, Cy Schubert <cy.schub...@cschubert.com> FreeBSD UNIX: <c...@freebsd.org> Web: http://www.FreeBSD.org The need of the many outweighs the greed of the few. _______________________________________________ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
