svn commit: r224808 - stable/7/usr.sbin/mergemaster
Doug Barton
dougb at FreeBSD.org
Fri Aug 12 21:41:20 UTC 2011
Author: dougb
Date: Fri Aug 12 21:41:20 2011
New Revision: 224808
URL: http://svn.freebsd.org/changeset/base/224808
Log:
MFC r224726:
Make clear that the -U option can be dangerous.
In -p mode install the group file with the same permissions as normally
done in etc/Makefile.
Update the copyright.
Modified:
stable/7/usr.sbin/mergemaster/mergemaster.8
stable/7/usr.sbin/mergemaster/mergemaster.sh
Directory Properties:
stable/7/usr.sbin/mergemaster/ (props changed)
Modified: stable/7/usr.sbin/mergemaster/mergemaster.8
==============================================================================
--- stable/7/usr.sbin/mergemaster/mergemaster.8 Fri Aug 12 21:40:24 2011 (r224807)
+++ stable/7/usr.sbin/mergemaster/mergemaster.8 Fri Aug 12 21:41:20 2011 (r224808)
@@ -1,4 +1,4 @@
-.\" Copyright (c) 1998-2010 Douglas Barton
+.\" Copyright (c) 1998-2011 Douglas Barton
.\" All rights reserved.
.\"
.\" Redistribution and use in source and binary forms, with or without
@@ -24,7 +24,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd March 13, 2010
+.Dd August 9, 2011
.Dt MERGEMASTER 8
.Os
.Sh NAME
@@ -244,6 +244,8 @@ or another directory you specify in your
rc file.
.It Fl U
Attempt to auto upgrade files that have not been user modified.
+This option can be dangerous when there are critical changes
+in the new versions that affect your running system.
.It Fl m Ar /path/to/sources
Specify the path to the directory where you want to do the
.Xr make 1 .
@@ -361,6 +363,7 @@ with all values commented out:
#AUTO_INSTALL=
#
# Automatically upgrade files that have not been user modified (-U)
+# ***DANGEROUS***
#AUTO_UPGRADE=
#
# Compare /etc/rc.conf[.local] to /etc/defaults/rc.conf (-C)
@@ -462,7 +465,7 @@ temporary root environment comes from Ni
make world tutorial which is referenced above.
.Sh AUTHORS
This manual page and the script itself were written by
-.An Douglas Barton Aq DougB at FreeBSD.org .
+.An Douglas Barton Aq dougb at FreeBSD.org .
.Sh BUGS
There are no known bugs.
Please report any problems,
Modified: stable/7/usr.sbin/mergemaster/mergemaster.sh
==============================================================================
--- stable/7/usr.sbin/mergemaster/mergemaster.sh Fri Aug 12 21:40:24 2011 (r224807)
+++ stable/7/usr.sbin/mergemaster/mergemaster.sh Fri Aug 12 21:41:20 2011 (r224808)
@@ -5,8 +5,8 @@
# Compare files created by /usr/src/etc/Makefile (or the directory
# the user specifies) with the currently installed copies.
-# Copyright 1998-2010 Douglas Barton
-# DougB at FreeBSD.org
+# Copyright 1998-2011 Douglas Barton
+# dougb at FreeBSD.org
# $FreeBSD$
@@ -30,6 +30,7 @@ display_usage () {
echo ' -C Compare local rc.conf variables to the defaults'
echo ' -P Preserve files that are overwritten'
echo " -U Attempt to auto upgrade files that have not been user modified"
+ echo ' ***DANGEROUS***'
echo ''
echo " -m /path/directory Specify location of source to do the make in"
echo " -t /path/directory Specify temp root directory"
@@ -635,7 +636,7 @@ case "${RERUN}" in
# Only set up files that are crucial to {build|install}world
{ mkdir -p ${TEMPROOT}/etc &&
cp -p ${SOURCEDIR}/etc/master.passwd ${TEMPROOT}/etc &&
- cp -p ${SOURCEDIR}/etc/group ${TEMPROOT}/etc;} ||
+ install -p -o root -g wheel -m 0644 ${SOURCEDIR}/etc/group ${TEMPROOT}/etc;} ||
{ echo '';
echo ' *** FATAL ERROR: Cannot copy files to the temproot environment';
echo '';
More information about the svn-src-stable-7
mailing list