diff options
| author |   ajacoutot <ajacoutot@openbsd.org> | 2016-04-28 16:42:29 +0000 |
|---|---|---|
| committer | ajacoutot <ajacoutot@openbsd.org> | 2016-04-28 16:42:29 +0000 |
| commit | 3c9c45fd161c5c8f4a793d53408003ea52b36625 (patch) | |
| tree | a9ff7593350a84741e133ca5e6a61ce58adad491 /usr.sbin/sysmerge | |
| parent | don't go into an unbreakable infinite loop during operations such (diff) | |
| download | wireguard-openbsd-3c9c45fd161c5c8f4a793d53408003ea52b36625.tar.xz wireguard-openbsd-3c9c45fd161c5c8f4a793d53408003ea52b36625.zip | |
Comment sm_check_an_eg().
Diffstat (limited to 'usr.sbin/sysmerge')
| -rw-r--r-- | usr.sbin/sysmerge/sysmerge.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/usr.sbin/sysmerge/sysmerge.sh b/usr.sbin/sysmerge/sysmerge.sh index 2e502462ee0..3d6168fe1fd 100644 --- a/usr.sbin/sysmerge/sysmerge.sh +++ b/usr.sbin/sysmerge/sysmerge.sh @@ -1,6 +1,6 @@ #!/bin/ksh - # -# $OpenBSD: sysmerge.sh,v 1.222 2016/04/26 11:19:35 ajacoutot Exp $ +# $OpenBSD: sysmerge.sh,v 1.223 2016/04/28 16:42:29 ajacoutot Exp $ # # Copyright (c) 2008-2014 Antoine Jacoutot <ajacoutot@openbsd.org> # Copyright (c) 1998-2003 Douglas Barton <DougB@FreeBSD.org> @@ -246,7 +246,8 @@ sm_run() { /etc/pwd.db /etc/spwd.db /var/db/locate.database - /var/mail/root" + /var/mail/root + /var/sysmerge/examplessum" # in case X(7) is not installed, xetcsum is not removed by the loop above _ignorefiles="${_ignorefiles} /var/sysmerge/xetcsum" [[ -f /etc/sysmerge.ignore ]] && \ @@ -292,7 +293,7 @@ sm_run() { sm_diff_loop done - sm_check_an_eg +# sm_check_an_eg } sm_install() { |