[Midnightbsd-cvs] src [11925] trunk/usr.bin/cpuset: add jail support

[laffer1 at midnightbsd.org]

Revision: 11925
          http://svnweb.midnightbsd.org/src/?rev=11925
Author:   laffer1
Date:     2018-07-20 09:42:27 -0400 (Fri, 20 Jul 2018)
Log Message:
-----------
add jail support

Modified Paths:
--------------
    trunk/usr.bin/cpuset/Makefile
    trunk/usr.bin/cpuset/cpuset.1
    trunk/usr.bin/cpuset/cpuset.c

Modified: trunk/usr.bin/cpuset/Makefile
===================================================================
--- trunk/usr.bin/cpuset/Makefile	2018-07-20 12:47:33 UTC (rev 11924)
+++ trunk/usr.bin/cpuset/Makefile	2018-07-20 13:42:27 UTC (rev 11925)
@@ -1,6 +1,9 @@
 # $MidnightBSD$
-# $FreeBSD: stable/10/usr.bin/cpuset/Makefile 201386 2010-01-02 10:27:05Z ed $
+# $FreeBSD: stable/10/usr.bin/cpuset/Makefile 336039 2018-07-06 19:10:07Z jamie $
 
 PROG=   cpuset
 
+DPADD=	${LIBJAIL}
+LDADD=	-ljail
+
 .include <bsd.prog.mk>

Modified: trunk/usr.bin/cpuset/cpuset.1
===================================================================
--- trunk/usr.bin/cpuset/cpuset.1	2018-07-20 12:47:33 UTC (rev 11924)
+++ trunk/usr.bin/cpuset/cpuset.1	2018-07-20 13:42:27 UTC (rev 11925)
@@ -1,4 +1,3 @@
-.\" $MidnightBSD$
 .\" Copyright (c) 2008 Christian Brueffer
 .\" Copyright (c) 2008 Jeffrey Roberson
 .\" All rights reserved.
@@ -24,9 +23,10 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: stable/10/usr.bin/cpuset/cpuset.1 217416 2011-01-14 19:57:28Z jhb $
+.\" $FreeBSD: stable/10/usr.bin/cpuset/cpuset.1 336039 2018-07-06 19:10:07Z jamie $
+.\" $MidnightBSD$
 .\"
-.Dd January 14, 2011
+.Dd July 3, 2018
 .Dt CPUSET 1
 .Os
 .Sh NAME
@@ -49,10 +49,10 @@
 .Nm
 .Op Fl cr
 .Op Fl l Ar cpu-list
-.Op Fl j Ar jailid | Fl p Ar pid | Fl t Ar tid | Fl s Ar setid | Fl x Ar irq
+.Op Fl j Ar jail | Fl p Ar pid | Fl t Ar tid | Fl s Ar setid | Fl x Ar irq
 .Nm
 .Op Fl cgir
-.Op Fl j Ar jailid | Fl p Ar pid | Fl t Ar tid | Fl s Ar setid | Fl x Ar irq
+.Op Fl j Ar jail | Fl p Ar pid | Fl t Ar tid | Fl s Ar setid | Fl x Ar irq
 .Sh DESCRIPTION
 The
 .Nm
@@ -63,7 +63,7 @@
 .Nm
 requires a target to modify or query.
 The target may be specified as a command, process id, thread id, a
-cpuset id, an irq or a jail id.
+cpuset id, an irq or a jail.
 Using
 .Fl g
 the target's set id or mask may be queried.
@@ -119,8 +119,8 @@
 When used with the
 .Fl g
 option print the id rather than the valid mask of the target.
-.It Fl j Ar jailid
-Specifies a jail id as the target of the operation.
+.It Fl j Ar jail
+Specifies a jail id or name as the target of the operation.
 .It Fl l Ar cpu-list
 Specifies a list of CPUs to apply to a target.
 Specification may include

Modified: trunk/usr.bin/cpuset/cpuset.c
===================================================================
--- trunk/usr.bin/cpuset/cpuset.c	2018-07-20 12:47:33 UTC (rev 11924)
+++ trunk/usr.bin/cpuset/cpuset.c	2018-07-20 13:42:27 UTC (rev 11925)
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: stable/10/usr.bin/cpuset/cpuset.c 227160 2011-11-06 08:14:40Z ed $");
+__FBSDID("$FreeBSD: stable/10/usr.bin/cpuset/cpuset.c 336039 2018-07-06 19:10:07Z jamie $");
 
 #include <sys/param.h>
 #include <sys/types.h>
@@ -40,6 +40,7 @@
 #include <ctype.h>
 #include <err.h>
 #include <errno.h>
+#include <jail.h>
 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -227,7 +228,9 @@
 		case 'j':
 			jflag = 1;
 			which = CPU_WHICH_JAIL;
-			id = atoi(optarg);
+			id = jail_getid(optarg);
+			if (id < 0)
+				errx(EXIT_FAILURE, "%s", jail_errmsg);
 			break;
 		case 'l':
 			lflag = 1;