summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorapb <apb@NetBSD.org>2008-05-03 09:44:45 +0000
committerapb <apb@NetBSD.org>2008-05-03 09:44:45 +0000
commitbf49cd32add2611a0fd5fc8824e80671cc7dfd5b (patch)
treea969d9c15e2560b9056bf48e976bedcd7fa23e5e
parent005a75dd15410a1ea4c159a43c99d37d9423d136 (diff)
Try to make it clear that local changes will be overwritten
by "postinstall fix".
-rwxr-xr-xusr.sbin/postinstall/postinstall3
-rw-r--r--usr.sbin/postinstall/postinstall.817
2 files changed, 15 insertions, 5 deletions
diff --git a/usr.sbin/postinstall/postinstall b/usr.sbin/postinstall/postinstall
index 504f9d85c69..b9790d3e4a5 100755
--- a/usr.sbin/postinstall/postinstall
+++ b/usr.sbin/postinstall/postinstall
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: postinstall,v 1.60 2008/04/30 13:11:02 martin Exp $
+# $NetBSD: postinstall,v 1.61 2008/05/03 09:44:45 apb Exp $
#
# Copyright (c) 2002-2006 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -1428,6 +1428,7 @@ main()
cat <<_Fix_me_
To fix, run:
${0} -s ${SRC_ARG} -d ${DEST_DIR:-/}$m fix${items_failed}
+Note that this may overwrite local changes.
_Fix_me_
fi
fi
diff --git a/usr.sbin/postinstall/postinstall.8 b/usr.sbin/postinstall/postinstall.8
index 79460b75db3..3362c0a39c0 100644
--- a/usr.sbin/postinstall/postinstall.8
+++ b/usr.sbin/postinstall/postinstall.8
@@ -1,4 +1,4 @@
-.\" $NetBSD: postinstall.8,v 1.9 2008/04/30 13:11:02 martin Exp $
+.\" $NetBSD: postinstall.8,v 1.10 2008/05/03 09:44:46 apb Exp $
.\"
.\" Copyright (c) 2005 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -27,7 +27,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd June 2, 2007
+.Dd May 3, 2008
.Dt POSTINSTALL 8
.Os
.Sh NAME
@@ -133,9 +133,18 @@ Apply fixes that
.Cm check
determines need to be applied.
Not all items can be automatically fixed by
-.Nm .
+.Nm ,
+and in some cases an error will be reported,
+after which manual intervention will be required.
+.Pp
+Conflicts between existing files in the target file system
+and new files from the
+.Nx
+distribution are resolved by replacing the existing file
+with the new file; there is no attempt to merge the files.
+See
.Xr etcupdate 8
-may help, and in some cases manual intervention is required.
+for an alternative update method that is able to merge files.
.It Cm help
Display a short help.
.It Cm list