ident "%Z%%M% %I% %E% SMI"
" CDDL HEADER START
"
" The contents of this file are subject to the terms of the
" Common Development and Distribution License, Version 1.0 only
" (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 2005 Sun Microsystems, Inc. All rights reserved.
" Use is subject to license terms.
acr - Automatically attempt BFU conflict resolution. acr [<root> [<archive-dir>]]

"OS-Net build tools" "acr" "" "acr"

acr may be used after 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.

It unpacks and uses the contents of a special archive, "conflict_resolution.gz" , constructed by mkacr, which is normally run whenver a nightly build creates archives.

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.

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.

If given the name of an archive directory as its second argument, it searches for the conflict resolution archive in that directory.

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.

Use extreme care when bfu'ing to bits older than currently installed.

If a system has multiple zones, it is necessary to invoke acr once per zone with conflicts.

The class-action scripts are not extensively tested for build-to-build updates.

# bfu /ws/on10-gate/archives/sparc/nightly

...

# acr

...

# acr /export/zones/a/root

Positional arguments suck.

nightly "(1), " mkacr "(1), " cpio "(1), " lumount "(1)"