Date: Wed, 11 May 2011 15:23:27 +0000 (UTC) From: Colin Percival <cperciva@FreeBSD.org> To: cvs-src-old@freebsd.org Subject: cvs commit: src/usr.sbin/freebsd-update freebsd-update.sh Message-ID: <201105111712.p4BHCZfA068822@repoman.freebsd.org>
index | next in thread | raw e-mail
cperciva 2011-05-11 15:23:27 UTC
FreeBSD src repository
Modified files:
usr.sbin/freebsd-update freebsd-update.sh
Log:
SVN rev 221780 on 2011-05-11 15:23:27Z by cperciva
Make freebsd-update(8) smarter in how it handles $FreeBSD$ tags in
configuration files.
If the current file differs from the canonical version from the old release
only due to differences in the $FreeBSD$ tag (which can happen if the system
was installed from source code, depending on how the src tree was checked out)
then freebsd-update will treat the file as "unmodified" and silently update
it to the "clean" version in the new release.
If the only change being made to a configuration file is in the $FreeBSD$
tag (e.g., for any configuration files which have been modified locally, now
that we're using SVN and the $FreeBSD$ tag changes when a branch is created),
freebsd-update will no longer print the diff and prompt "Does this look
reasonable (y/n)?".
Nagged by: pgollucci
MFC after: 1 month
Revision Changes Path
1.25 +33 -3 src/usr.sbin/freebsd-update/freebsd-update.sh
help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201105111712.p4BHCZfA068822>