Date: Mon, 29 Apr 2024 10:30:27 GMT From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= <des@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: edff88aee215 - stable/14 - adduser: Really fix a syntax error Message-ID: <202404291030.43TAURfG063424@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=edff88aee2150ad4e1e855f07f1eddbba7f193cd commit edff88aee2150ad4e1e855f07f1eddbba7f193cd Author: Dag-Erling Smørgrav <des@FreeBSD.org> AuthorDate: 2024-04-29 10:29:35 +0000 Commit: Dag-Erling Smørgrav <des@FreeBSD.org> CommitDate: 2024-04-29 10:30:20 +0000 adduser: Really fix a syntax error Fixes: 5cafc38f1129 Differential Revision: https://reviews.freebsd.org/D44871 (cherry picked from commit 9e8618276fada5c68cc64676fba2ae2abd0544f5) --- usr.sbin/adduser/adduser.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/usr.sbin/adduser/adduser.sh b/usr.sbin/adduser/adduser.sh index 9739b2e589fa..e9027b6b7876 100644 --- a/usr.sbin/adduser/adduser.sh +++ b/usr.sbin/adduser/adduser.sh @@ -477,7 +477,8 @@ get_zfs_home() { # check if zfs kernel module is loaded before attempting to run zfs to # prevent loading the kernel module on systems that don't use ZFS - if ! "$KLDSTATCMD" -q -m zfs || Zcreate="no"; then + if ! "$KLDSTATCMD" -q -m zfs; then + Zcreate="no" return fi if ! _prefix=$(${ZFSCMD} list -Ho name "${homeprefix}" 2>/dev/null) ||
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202404291030.43TAURfG063424>