From b6388c86a4b0ffdde30f28b37599c956b9216605 Mon Sep 17 00:00:00 2001
From: bapt <bapt@FreeBSD.org>
Date: Thu, 9 Jan 2014 15:34:23 +0000
Subject: Import error message shown to the user when trying to load a module
 that is already loaded or compiled withing the kernel

MFC after:	1 week
---
 sbin/kldload/kldload.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'sbin/kldload/kldload.c')

diff --git a/sbin/kldload/kldload.c b/sbin/kldload/kldload.c
index 84589eb..dfde1f4 100644
--- a/sbin/kldload/kldload.c
+++ b/sbin/kldload/kldload.c
@@ -181,8 +181,14 @@ main(int argc, char** argv)
 						printf("%s is already "
 						    "loaded\n", argv[0]);
 				} else {
-					warn("can't load %s", argv[0]);
-					errors++;
+					if (errno == EEXIST) {
+						warnx("can't load %s: module "
+						    "already loaded or "
+						    "in kernel", argv[0]);
+					} else {
+						warn("can't load %s", argv[0]);
+						errors++;
+					}
 				}
 			} else {
 				if (verbose)
-- 
cgit v1.1