usr/src/tools/scripts/acr.1
author Mark J. Nelson <Mark.J.Nelson@Sun.COM>
Wed, 06 Aug 2008 16:29:39 -0600
changeset 7298 b69e27387f74
parent 2364 bf1ecf500b07
permissions -rw-r--r--
6733918 Teamware has retired, please welcome your new manager, Mercurial 4758439 some files use "current date" sccs keywords 6560843 asm sources should not rely on .file "%M%" for naming STT_FILE symbols 6560958 Solaris:: perl modules should not use SCCS keywords in version information 6729074 webrev doesn't deal well with remote ssh hg parents

.\" " CDDL HEADER START
.\" "
.\" " The contents of this file are subject to the terms of the
.\" " Common Development and Distribution License (the "License").
.\" " You may not use this file except in compliance with the License.
.\" "
.\" " You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
.\" " or http://www.opensolaris.org/os/licensing.
.\" " See the License for the specific language governing permissions
.\" " and limitations under the License.
.\" "
.\" " When distributing Covered Code, include this CDDL HEADER in each
.\" " file and include the License file at usr/src/OPENSOLARIS.LICENSE.
.\" " If applicable, add the following below this CDDL HEADER, with the
.\" " fields enclosed by brackets "[]" replaced with your own identifying
.\" " information: Portions Copyright [yyyy] [name of copyright owner]
.\" "
.\" " CDDL HEADER END
.\" "
.\" " Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
.\" " Use is subject to license terms.
.TH acr 1 "July 13, 2006"
.SH NAME
.I acr
\- Automatically attempt BFU conflict resolution.
.SH SYNOPSIS
\fBacr [<root> [<archive-dir>]]\fP
.LP
.SH DESCRIPTION
.IX "OS-Net build tools" "acr" "" "\fBacr\fP"
.LP
.I acr 
may be used after 
.I bfu
reports that it has discovered conflicts (changes to editable files),
in order to automatically resolve these conflicts using the
same scripts which are used by regular packaging.
.LP
It unpacks and uses the contents of a special archive,
"conflict_resolution.gz" ,
constructed by
.I mkacr,
which is normally run whenver a
.I nightly
build creates archives.
.LP
If invoked with no arguments (the usual for an in-place BFU), it
looks at the archive directory used by the last BFU on this root.
.LP 
If given with the name of an alternate root directory as its first
argument, it resolves conflicts in that alternate root.
That directory can be either the root of a local zone, a mounted Live
Upgrade Boot Environment, or any other BFU'ed solaris install.
.LP
If given the name of an archive directory as its second argument, it
searches for the conflict resolution archive in that directory.
.LP 
When operating on /, acr also resolves conflicts for all installed
zones.
.SH LIMITATIONS
While this script is usually much more reliable than manual conflict
resolution, bugs in the packaging scripts it uses may still result in
brickification.   When in doubt, check its work.
.LP
Use extreme care when bfu'ing to bits older than currently installed.
.LP
If a system has multiple zones, it is necessary to invoke acr once
per zone with conflicts.
.LP
The class-action scripts are not extensively tested for build-to-build
updates.
.SH EXAMPLES
.LP
.B
# bfu /ws/on10-gate/archives/sparc/nightly
.br
 ...
.br
# acr
.br
 ...
.br
# acr /export/zones/a/root
.br
.SH BUGS
.LP
Positional arguments suck.
.LP
.SH SEE ALSO
.BR nightly "(1), " mkacr "(1), " cpio "(1), " lumount "(1)"