From 16a37c25cedda75263f3848869471c65b7f79755 Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Sat, 9 Aug 2014 12:34:05 +0000 Subject: [PATCH] sysctl.conf is an example. Tweak error output. Mention that `-S' has no effect when sets aren't used. --- usr.sbin/sysmerge/sysmerge.8 | 5 +++-- usr.sbin/sysmerge/sysmerge.sh | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/usr.sbin/sysmerge/sysmerge.8 b/usr.sbin/sysmerge/sysmerge.8 index f8ebc0095d5..75759ef4619 100644 --- a/usr.sbin/sysmerge/sysmerge.8 +++ b/usr.sbin/sysmerge/sysmerge.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: sysmerge.8,v 1.51 2014/08/08 17:04:55 ajacoutot Exp $ +.\" $OpenBSD: sysmerge.8,v 1.52 2014/08/09 12:34:05 ajacoutot Exp $ .\" .\" Copyright (c) 2008 Antoine Jacoutot .\" @@ -14,7 +14,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: August 8 2014 $ +.Dd $Mdocdate: August 9 2014 $ .Dt SYSMERGE 8 .Os .Sh NAME @@ -137,6 +137,7 @@ In this mode, will not take any automatic action, allowing for a full diff comparison. .It Fl S Do not verify signatures for tgz sets. +This option has no effect when sets aren't used. .It Fl s Op Ar src \*(Ba etcXX.tgz Specify a path to an .Ox diff --git a/usr.sbin/sysmerge/sysmerge.sh b/usr.sbin/sysmerge/sysmerge.sh index aeed5f36a8f..abf8304b9d9 100644 --- a/usr.sbin/sysmerge/sysmerge.sh +++ b/usr.sbin/sysmerge/sysmerge.sh @@ -1,6 +1,6 @@ #!/bin/ksh - # -# $OpenBSD: sysmerge.sh,v 1.145 2014/08/08 16:38:25 ajacoutot Exp $ +# $OpenBSD: sysmerge.sh,v 1.146 2014/08/09 12:34:05 ajacoutot Exp $ # # Copyright (c) 2008-2014 Antoine Jacoutot # Copyright (c) 1998-2003 Douglas Barton @@ -76,7 +76,7 @@ report() { # remove newly created work directory and exit with status 1 error_rm_wrkdir() { - (($#)) && echo "**** ERROR: $@" + (($#)) && echo "!!!! ERROR: $@" restore_sum clean_src # do not remove the entire WRKDIR in case sysmerge stopped half @@ -606,7 +606,7 @@ sm_compare() { # several files are generated from scripts so CVS ID is not a # reliable way of detecting changes; leave for a full diff. if [[ -z ${DIFFMODE} && \ - ${COMPFILE} != ./etc/@(fbtab|sysctl.conf|ttys) && \ + ${COMPFILE} != ./etc/@(fbtab|ttys) && \ -z ${IS_LINK} ]]; then CVSID1=$(sed -n "/[$]OpenBSD:.*Exp [$]/{p;q;}" ${DESTDIR}${COMPFILE#.} 2>/dev/null) CVSID2=$(sed -n "/[$]OpenBSD:.*Exp [$]/{p;q;}" ${COMPFILE} 2>/dev/null) || CVSID2=none -- 2.20.1