Module Name: src
Committed By: martin
Date: Mon Apr 17 18:41:49 UTC 2017
Modified Files:
src/usr.sbin/postinstall: postinstall
Log Message:
If -x (xsrc location) is passed for "check", display it also in the
"how to fix" invocation instructions.
To generate a diff of this commit:
cvs rdiff -u -r1.213 -r1.214 src/usr.sbin/postinstall/postinstall
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/postinstall/postinstall
diff -u src/usr.sbin/postinstall/postinstall:1.213 src/usr.sbin/postinstall/postinstall:1.214
--- src/usr.sbin/postinstall/postinstall:1.213 Sat Apr 1 20:14:53 2017
+++ src/usr.sbin/postinstall/postinstall Mon Apr 17 18:41:48 2017
@@ -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 @@ main()
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 @@ main()
[ "$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
