summaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
authorStuart Henderson <sthen@cvs.openbsd.org>2011-10-09 15:02:23 +0000
committerStuart Henderson <sthen@cvs.openbsd.org>2011-10-09 15:02:23 +0000
commitc36cddba913fdfd1aac227c5940168bd6a27d5f3 (patch)
treef11219724c781235fa578ef2e7e1788b0ca84a22 /usr.sbin
parentb427e7715fb9b4463e0c2c55a362e7a69ec75f8a (diff)
add a missing newline when you merge login.conf if login.conf.db doesn't exist
ok aja@
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/sysmerge/sysmerge.sh4
1 files changed, 3 insertions, 1 deletions
diff --git a/usr.sbin/sysmerge/sysmerge.sh b/usr.sbin/sysmerge/sysmerge.sh
index ee013a9618a..8ecc47c82ab 100644
--- a/usr.sbin/sysmerge/sysmerge.sh
+++ b/usr.sbin/sysmerge/sysmerge.sh
@@ -1,6 +1,6 @@
#!/bin/ksh -
#
-# $OpenBSD: sysmerge.sh,v 1.82 2011/09/01 07:52:46 ajacoutot Exp $
+# $OpenBSD: sysmerge.sh,v 1.83 2011/10/09 15:02:22 sthen Exp $
#
# Copyright (c) 1998-2003 Douglas Barton <DougB@FreeBSD.org>
# Copyright (c) 2008, 2009, 2010, 2011 Antoine Jacoutot <ajacoutot@openbsd.org>
@@ -201,6 +201,8 @@ mm_install() {
if [ -f ${DESTDIR}/etc/login.conf.db ]; then
echo " (running cap_mkdb(1))"
cap_mkdb ${DESTDIR}/etc/login.conf
+ else
+ echo ""
fi
export NEED_REBOOT=1
;;