diff options
| author |   ajacoutot <ajacoutot@openbsd.org> | 2015-12-21 10:54:49 +0000 |
|---|---|---|
| committer | ajacoutot <ajacoutot@openbsd.org> | 2015-12-21 10:54:49 +0000 |
| commit | ca6d9a0e4ec959434c1b57f54891ac650e3bc40a (patch) | |
| tree | e8bf6d60ce18cb52accdd591b739a7603048a2bb /usr.sbin/sysmerge | |
| parent | Pass the destination and mask to rtable_mpath_reprio() in order to not (diff) | |
| download | wireguard-openbsd-ca6d9a0e4ec959434c1b57f54891ac650e3bc40a.tar.xz wireguard-openbsd-ca6d9a0e4ec959434c1b57f54891ac650e3bc40a.zip | |
Only run newaliases(8) if we already have an aliases db.
Diffstat (limited to 'usr.sbin/sysmerge')
| -rw-r--r-- | usr.sbin/sysmerge/sysmerge.sh | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/usr.sbin/sysmerge/sysmerge.sh b/usr.sbin/sysmerge/sysmerge.sh index f3f2c0587a1..cf5f321e7b6 100644 --- a/usr.sbin/sysmerge/sysmerge.sh +++ b/usr.sbin/sysmerge/sysmerge.sh @@ -1,6 +1,6 @@ #!/bin/ksh - # -# $OpenBSD: sysmerge.sh,v 1.217 2015/11/28 02:42:22 deraadt Exp $ +# $OpenBSD: sysmerge.sh,v 1.218 2015/12/21 10:54:49 ajacoutot Exp $ # # Copyright (c) 2008-2014 Antoine Jacoutot <ajacoutot@openbsd.org> # Copyright (c) 1998-2003 Douglas Barton <DougB@FreeBSD.org> @@ -337,8 +337,12 @@ sm_install() { fi ;; /etc/mail/aliases) - echo " (running newaliases(8))" - sm_warn $(newaliases 2>&1 >/dev/null) + if [[ -f /etc/mail/aliases.db ]]; then + echo " (running newaliases(8))" + sm_warn $(newaliases 2>&1 >/dev/null) + else + echo + fi ;; *) echo |