diff options
| author |   ajacoutot <ajacoutot@openbsd.org> | 2016-01-14 19:58:32 +0000 |
|---|---|---|
| committer | ajacoutot <ajacoutot@openbsd.org> | 2016-01-14 19:58:32 +0000 |
| commit | fc5695554c533aee2d5e23c01b376dfb7ec36456 (patch) | |
| tree | 2caa6be1c13b163b2252be59b0025a0ef0f86826 /usr.sbin/sysmerge/sysmerge.sh | |
| parent | Prevent a NULL dereference when detaching a USB device with ugen(4) (diff) | |
| download | wireguard-openbsd-fc5695554c533aee2d5e23c01b376dfb7ec36456.tar.xz wireguard-openbsd-fc5695554c533aee2d5e23c01b376dfb7ec36456.zip | |
No more /etc/mail/aliases.db.
Diffstat (limited to 'usr.sbin/sysmerge/sysmerge.sh')
| -rw-r--r-- | usr.sbin/sysmerge/sysmerge.sh | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/usr.sbin/sysmerge/sysmerge.sh b/usr.sbin/sysmerge/sysmerge.sh index 04bca667dd1..879d917859c 100644 --- a/usr.sbin/sysmerge/sysmerge.sh +++ b/usr.sbin/sysmerge/sysmerge.sh @@ -1,6 +1,6 @@ #!/bin/ksh - # -# $OpenBSD: sysmerge.sh,v 1.219 2015/12/23 10:01:58 ajacoutot Exp $ +# $OpenBSD: sysmerge.sh,v 1.220 2016/01/14 19:58:32 ajacoutot Exp $ # # Copyright (c) 2008-2014 Antoine Jacoutot <ajacoutot@openbsd.org> # Copyright (c) 1998-2003 Douglas Barton <DougB@FreeBSD.org> @@ -240,7 +240,6 @@ sm_run() { # files we don't want/need to deal with _ignorefiles="/etc/group /etc/localtime - /etc/mail/aliases.db /etc/master.passwd /etc/motd /etc/passwd |