From owner-svn-src-stable@FreeBSD.ORG  Wed Jul 31 10:54:24 2013
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id B2BFB9C;
 Wed, 31 Jul 2013 10:54:24 +0000 (UTC)
 (envelope-from trasz@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 9F6382AD3;
 Wed, 31 Jul 2013 10:54:24 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6VAsO0u020439;
 Wed, 31 Jul 2013 10:54:24 GMT (envelope-from trasz@svn.freebsd.org)
Received: (from trasz@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6VAsOgP020438;
 Wed, 31 Jul 2013 10:54:24 GMT (envelope-from trasz@svn.freebsd.org)
Message-Id: <201307311054.r6VAsOgP020438@svn.freebsd.org>
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Wed, 31 Jul 2013 10:54:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r253835 - stable/9/usr.sbin/ctladm
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 31 Jul 2013 10:54:24 -0000

Author: trasz
Date: Wed Jul 31 10:54:24 2013
New Revision: 253835
URL: http://svnweb.freebsd.org/changeset/base/253835

Log:
  MFC r249328:
  
  Make ctladm(8) try to load ctl.ko kernel module if needed.
  
  Approved by:	re (delphij)

Modified:
  stable/9/usr.sbin/ctladm/ctladm.c
Directory Properties:
  stable/9/usr.sbin/ctladm/   (props changed)

Modified: stable/9/usr.sbin/ctladm/ctladm.c
==============================================================================
--- stable/9/usr.sbin/ctladm/ctladm.c	Wed Jul 31 07:09:35 2013	(r253834)
+++ stable/9/usr.sbin/ctladm/ctladm.c	Wed Jul 31 10:54:24 2013	(r253835)
@@ -47,6 +47,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/param.h>
+#include <sys/linker.h>
 #include <sys/queue.h>
 #include <sys/callout.h>
 #include <sys/sbuf.h>
@@ -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));