From 5c4cca9948b4ee8a71b2c783d234fc2597562bf1 Mon Sep 17 00:00:00 2001 From: trasz Date: Wed, 31 Jul 2013 10:54:24 +0000 Subject: [PATCH] MFC r249328: Make ctladm(8) try to load ctl.ko kernel module if needed. Approved by: re (delphij) git-svn-id: svn://svn.freebsd.org/base/stable/9@253835 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- usr.sbin/ctladm/ctladm.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/usr.sbin/ctladm/ctladm.c b/usr.sbin/ctladm/ctladm.c index 214bdb54f..10631bd94 100644 --- a/usr.sbin/ctladm/ctladm.c +++ b/usr.sbin/ctladm/ctladm.c @@ -47,6 +47,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -3816,6 +3817,7 @@ main(int argc, char **argv) int retval, fd; int retries; int initid; + int saved_errno; retval = 0; cmdargs = CTLADM_ARG_NONE; @@ -3965,6 +3967,14 @@ main(int argc, char **argv) if ((cmdargs & CTLADM_ARG_DEVICE) && (command != CTLADM_CMD_HELP)) { fd = open(device, O_RDWR); + if (fd == -1 && errno == ENOENT) { + saved_errno = errno; + retval = kldload("ctl"); + if (retval != -1) + fd = open(device, O_RDWR); + else + errno = saved_errno; + } if (fd == -1) { fprintf(stderr, "%s: error opening %s: %s\n", argv[0], device, strerror(errno)); -- 2.45.0