Date: Sat, 29 Apr 2006 18:21:44 +0000 (UTC) From: Gordon Tetlow <gordon@FreeBSD.org> To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/usr.sbin/mergemaster mergemaster.8 mergemaster.sh Message-ID: <200604291821.k3TILije020756@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
gordon 2006-04-29 18:21:44 UTC
FreeBSD src repository
Modified files:
usr.sbin/mergemaster mergemaster.8 mergemaster.sh
Log:
Add auto upgrade capability to mergemaster.
An mtree description of all non-zero files that make
distribution installs (only size and md5) is built from the
temproot. When the user completes a mergemaster run, the
mtree description file gets installed into /var/db for
safe-keeping.
When the user then decides to do a subsequent upgrade (with
the -U flag), the existing mtree description from /var/db
is called into service looking for files that are different in
DESTDIR. This is stashed away until a file that would normally
end up prompting the user to look at changes is encountered.
Since there are no user modified changes, the new file is
installed without bothering the user.
Looked at by: dougb
MFC after: 6 weeks
Revision Changes Path
1.35 +2 -0 src/usr.sbin/mergemaster/mergemaster.8
1.54 +86 -1 src/usr.sbin/mergemaster/mergemaster.sh
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200604291821.k3TILije020756>