Make clear that the -U option can be dangerous. [1]
In -p mode install the group file with the same permissions as normally done in etc/Makefile. Update the copyright. Requested by: peter [1] Approved by: re (kib)
This commit is contained in:
parent
f35ec93778
commit
a2ca3bc171
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=224726
@ -1,4 +1,4 @@
|
|||||||
.\" Copyright (c) 1998-2010 Douglas Barton
|
.\" Copyright (c) 1998-2011 Douglas Barton
|
||||||
.\" All rights reserved.
|
.\" All rights reserved.
|
||||||
.\"
|
.\"
|
||||||
.\" Redistribution and use in source and binary forms, with or without
|
.\" Redistribution and use in source and binary forms, with or without
|
||||||
@ -24,7 +24,7 @@
|
|||||||
.\"
|
.\"
|
||||||
.\" $FreeBSD$
|
.\" $FreeBSD$
|
||||||
.\"
|
.\"
|
||||||
.Dd March 13, 2010
|
.Dd August 9, 2011
|
||||||
.Dt MERGEMASTER 8
|
.Dt MERGEMASTER 8
|
||||||
.Os
|
.Os
|
||||||
.Sh NAME
|
.Sh NAME
|
||||||
@ -244,6 +244,8 @@ or another directory you specify in your
|
|||||||
rc file.
|
rc file.
|
||||||
.It Fl U
|
.It Fl U
|
||||||
Attempt to auto upgrade files that have not been user modified.
|
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
|
.It Fl m Ar /path/to/sources
|
||||||
Specify the path to the directory where you want to do the
|
Specify the path to the directory where you want to do the
|
||||||
.Xr make 1 .
|
.Xr make 1 .
|
||||||
@ -360,6 +362,7 @@ with all values commented out:
|
|||||||
#AUTO_INSTALL=
|
#AUTO_INSTALL=
|
||||||
#
|
#
|
||||||
# Automatically upgrade files that have not been user modified (-U)
|
# Automatically upgrade files that have not been user modified (-U)
|
||||||
|
# ***DANGEROUS***
|
||||||
#AUTO_UPGRADE=
|
#AUTO_UPGRADE=
|
||||||
#
|
#
|
||||||
# Compare /etc/rc.conf[.local] to /etc/defaults/rc.conf (-C)
|
# Compare /etc/rc.conf[.local] to /etc/defaults/rc.conf (-C)
|
||||||
@ -461,7 +464,7 @@ temporary root environment comes from Nik Clayton's
|
|||||||
make world tutorial which is referenced above.
|
make world tutorial which is referenced above.
|
||||||
.Sh AUTHORS
|
.Sh AUTHORS
|
||||||
This manual page and the script itself were written by
|
This manual page and the script itself were written by
|
||||||
.An Douglas Barton Aq DougB@FreeBSD.org .
|
.An Douglas Barton Aq dougb@FreeBSD.org .
|
||||||
.Sh BUGS
|
.Sh BUGS
|
||||||
There are no known bugs.
|
There are no known bugs.
|
||||||
Please report any problems,
|
Please report any problems,
|
||||||
|
@ -5,8 +5,8 @@
|
|||||||
# Compare files created by /usr/src/etc/Makefile (or the directory
|
# Compare files created by /usr/src/etc/Makefile (or the directory
|
||||||
# the user specifies) with the currently installed copies.
|
# the user specifies) with the currently installed copies.
|
||||||
|
|
||||||
# Copyright 1998-2010 Douglas Barton
|
# Copyright 1998-2011 Douglas Barton
|
||||||
# DougB@FreeBSD.org
|
# dougb@FreeBSD.org
|
||||||
|
|
||||||
# $FreeBSD$
|
# $FreeBSD$
|
||||||
|
|
||||||
@ -30,6 +30,7 @@ display_usage () {
|
|||||||
echo ' -C Compare local rc.conf variables to the defaults'
|
echo ' -C Compare local rc.conf variables to the defaults'
|
||||||
echo ' -P Preserve files that are overwritten'
|
echo ' -P Preserve files that are overwritten'
|
||||||
echo " -U Attempt to auto upgrade files that have not been user modified"
|
echo " -U Attempt to auto upgrade files that have not been user modified"
|
||||||
|
echo ' ***DANGEROUS***'
|
||||||
echo ''
|
echo ''
|
||||||
echo " -m /path/directory Specify location of source to do the make in"
|
echo " -m /path/directory Specify location of source to do the make in"
|
||||||
echo " -t /path/directory Specify temp root directory"
|
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
|
# Only set up files that are crucial to {build|install}world
|
||||||
{ mkdir -p ${TEMPROOT}/etc &&
|
{ mkdir -p ${TEMPROOT}/etc &&
|
||||||
cp -p ${SOURCEDIR}/etc/master.passwd ${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 '';
|
||||||
echo ' *** FATAL ERROR: Cannot copy files to the temproot environment';
|
echo ' *** FATAL ERROR: Cannot copy files to the temproot environment';
|
||||||
echo '';
|
echo '';
|
||||||
|
Loading…
Reference in New Issue
Block a user