Module Name: src
Committed By: martin
Date: Tue Apr 25 15:25:36 UTC 2023
Modified Files:
src/sbin/nvmectl [netbsd-10]: devlist.c
Log Message:
Pull up following revision(s) (requested by simonb in ticket #145):
sbin/nvmectl/devlist.c: revision 1.6
In "devlist" mode, exit with a 0 return code if any nvme devices are
found, rather than exiting with 1 return code always.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.5.12.1 src/sbin/nvmectl/devlist.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/nvmectl/devlist.c
diff -u src/sbin/nvmectl/devlist.c:1.5 src/sbin/nvmectl/devlist.c:1.5.12.1
--- src/sbin/nvmectl/devlist.c:1.5 Wed Apr 18 10:11:44 2018
+++ src/sbin/nvmectl/devlist.c Tue Apr 25 15:25:36 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: devlist.c,v 1.5 2018/04/18 10:11:44 nonaka Exp $ */
+/* $NetBSD: devlist.c,v 1.5.12.1 2023/04/25 15:25:36 martin Exp $ */
/*-
* SPDX-License-Identifier: BSD-2-Clause-FreeBSD
@@ -30,7 +30,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: devlist.c,v 1.5 2018/04/18 10:11:44 nonaka Exp $");
+__RCSID("$NetBSD: devlist.c,v 1.5.12.1 2023/04/25 15:25:36 martin Exp $");
#if 0
__FBSDID("$FreeBSD: head/sbin/nvmecontrol/devlist.c 329824 2018-02-22 13:32:31Z wma $");
#endif
@@ -118,8 +118,10 @@ devlist(int argc, char *argv[])
close(fd);
}
- if (found == 0)
+ if (found == 0) {
printf("No NVMe controllers found.\n");
+ exit(1);
+ }
- exit(1);
+ exit(0);
}
