summaryrefslogtreecommitdiffstats
path: root/usr.sbin/sysmerge
diff options
context:
space:
mode:
authorderaadt <deraadt@openbsd.org>2015-11-28 02:42:22 +0000
committerderaadt <deraadt@openbsd.org>2015-11-28 02:42:22 +0000
commitffe10cb9dd09baea351e78f680dbbd1d70141888 (patch)
tree716eb1e7bea0de65dd7d64d7ec9187aa74a680a9 /usr.sbin/sysmerge
parentadd missing "log" bits (diff)
downloadwireguard-openbsd-ffe10cb9dd09baea351e78f680dbbd1d70141888.tar.xz
wireguard-openbsd-ffe10cb9dd09baea351e78f680dbbd1d70141888.zip
chflags -l flag went away. Noticed this myself 15 minutes
before Chris Hettrick did.
Diffstat (limited to 'usr.sbin/sysmerge')
-rw-r--r--usr.sbin/sysmerge/sysmerge.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/sysmerge/sysmerge.sh b/usr.sbin/sysmerge/sysmerge.sh
index f8b525069ab..f3f2c0587a1 100644
--- a/usr.sbin/sysmerge/sysmerge.sh
+++ b/usr.sbin/sysmerge/sysmerge.sh
@@ -1,6 +1,6 @@
#!/bin/ksh -
#
-# $OpenBSD: sysmerge.sh,v 1.216 2015/10/18 04:45:21 ajacoutot Exp $
+# $OpenBSD: sysmerge.sh,v 1.217 2015/11/28 02:42:22 deraadt Exp $
#
# Copyright (c) 2008-2014 Antoine Jacoutot <ajacoutot@openbsd.org>
# Copyright (c) 1998-2003 Douglas Barton <DougB@FreeBSD.org>
@@ -365,7 +365,7 @@ sm_add_user_grp() {
if [[ ${_u} != root ]]; then
if ! grep -Eq "^${_u}:" /etc/master.passwd; then
echo "===> Adding the ${_u} user"
- chpass -la "${_l}"
+ chpass -a "${_l}"
fi
fi
done <${_pw}