Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.sbin/postinstall If -x (xsrc location) is passed for "ch...



details:   https://anonhg.NetBSD.org/src/rev/8be59c815e71
branches:  trunk
changeset: 823274:8be59c815e71
user:      martin <martin%NetBSD.org@localhost>
date:      Mon Apr 17 18:41:48 2017 +0000

description:
If -x (xsrc location) is passed for "check", display it also in the
"how to fix" invocation instructions.

diffstat:

 usr.sbin/postinstall/postinstall |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (28 lines):

diff -r 445dc50f5d19 -r 8be59c815e71 usr.sbin/postinstall/postinstall
--- a/usr.sbin/postinstall/postinstall  Mon Apr 17 18:06:30 2017 +0000
+++ b/usr.sbin/postinstall/postinstall  Mon Apr 17 18:41:48 2017 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: postinstall,v 1.213 2017/04/01 20:14:53 roy Exp $
+# $NetBSD: postinstall,v 1.214 2017/04/17 18:41:48 martin Exp $
 #
 # Copyright (c) 2002-2015 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -2402,6 +2402,7 @@
                        if [ -d "${OPTARG}" ]; then
                                # arg refers to a directory.
                                XSRC_DIR="${OPTARG}"
+                               XSRC_DIR_FIX="-x ${OPTARG} "
                        else
                                err 2 "Not a directory for -x option"
                        fi
@@ -2563,7 +2564,7 @@
                        [ "$MACHINE" = "$(uname -m)" ] && m= || m=" -m $MACHINE"
                        cat <<_Fix_me_
 To fix, run:
-    ${HOST_SH} ${0} ${SRC_ARGLIST} -d ${DEST_DIR:-/}$m fix${items_failed}
+    ${HOST_SH} ${0} ${SRC_ARGLIST} ${XSRC_DIR_FIX}-d ${DEST_DIR:-/}$m fix${items_failed}
 Note that this may overwrite local changes.
 _Fix_me_
                    fi



Home | Main Index | Thread Index | Old Index