[Midnightbsd-cvs] src [8775] trunk: Allow zfs jail and zfs unjail to use both jailnames and jailid

[laffer1 at midnightbsd.org]

Revision: 8775
          http://svnweb.midnightbsd.org/src/?rev=8775
Author:   laffer1
Date:     2016-09-25 22:58:21 -0400 (Sun, 25 Sep 2016)
Log Message:
-----------
Allow zfs jail and zfs unjail to use both jailnames and jailid

Modified Paths:
--------------
    trunk/cddl/contrib/opensolaris/cmd/zfs/zfs.8
    trunk/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
    trunk/cddl/sbin/zfs/Makefile
    trunk/rescue/rescue/Makefile

Modified: trunk/cddl/contrib/opensolaris/cmd/zfs/zfs.8
===================================================================
--- trunk/cddl/contrib/opensolaris/cmd/zfs/zfs.8	2016-09-26 02:57:23 UTC (rev 8774)
+++ trunk/cddl/contrib/opensolaris/cmd/zfs/zfs.8	2016-09-26 02:58:21 UTC (rev 8775)
@@ -254,10 +254,10 @@
 .Op Ar snapshot Ns | Ns Ar filesystem
 .Nm
 .Cm jail
-.Ar jailid filesystem
+.Ar jailid Ns | Ns Ar jailname filesystem
 .Nm
 .Cm unjail
-.Ar jailid filesystem
+.Ar jailid Ns | Ns Ar jailname filesystem
 .Sh DESCRIPTION
 The
 .Nm

Modified: trunk/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
===================================================================
--- trunk/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c	2016-09-26 02:57:23 UTC (rev 8774)
+++ trunk/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c	2016-09-26 02:58:21 UTC (rev 8775)
@@ -240,9 +240,9 @@
 		return (gettext("\tupgrade [-v]\n"
 		    "\tupgrade [-r] [-V version] <-a | filesystem ...>\n"));
 	case HELP_JAIL:
-		return (gettext("\tjail <jailid> <filesystem>\n"));
+		return (gettext("\tjail <jailid|jailname> <filesystem>\n"));
 	case HELP_UNJAIL:
-		return (gettext("\tunjail <jailid> <filesystem>\n"));
+		return (gettext("\tunjail <jailid|jailname> <filesystem>\n"));
 	case HELP_LIST:
 		return (gettext("\tlist [-rH][-d max] "
 		    "[-o property[,...]] [-t type[,...]] [-s property] ...\n"
@@ -6289,9 +6289,9 @@
 		usage(B_FALSE);
 	}
 
-	jailid = atoi(argv[1]);
-	if (jailid == 0) {
-		(void) fprintf(stderr, gettext("invalid jailid\n"));
+	jailid = jail_getid(argv[1]);
+	if (jailid < 0) {
+		(void) fprintf(stderr, gettext("invalid jail id or name\n"));
 		usage(B_FALSE);
 	}
 

Modified: trunk/cddl/sbin/zfs/Makefile
===================================================================
--- trunk/cddl/sbin/zfs/Makefile	2016-09-26 02:57:23 UTC (rev 8774)
+++ trunk/cddl/sbin/zfs/Makefile	2016-09-26 02:58:21 UTC (rev 8775)
@@ -22,8 +22,8 @@
 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys
 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs
 
-DPADD=	${LIBGEOM} ${LIBNVPAIR} ${LIBUMEM} \
+DPADD=	${LIBGEOM} ${LIBJAIL} ${LIBNVPAIR} ${LIBUMEM} \
 	${LIBUTIL} ${LIBUUTIL} ${LIBZFS}
-LDADD=	-lgeom -lnvpair -lumem -lutil -luutil -lzfs
+LDADD=	-lgeom -ljail -lnvpair -lumem -lutil -luutil -lzfs
 
 .include <bsd.prog.mk>

Modified: trunk/rescue/rescue/Makefile
===================================================================
--- trunk/rescue/rescue/Makefile	2016-09-26 02:57:23 UTC (rev 8774)
+++ trunk/rescue/rescue/Makefile	2016-09-26 02:58:21 UTC (rev 8775)
@@ -123,7 +123,7 @@
 CRUNCH_LIBS+= -lipx
 .endif
 .if ${MK_ZFS} != "no"
-CRUNCH_LIBS+= -lavl -lzfs -lnvpair -lpthread -luutil -lumem
+CRUNCH_LIBS+= -lavl -ljail -lzfs -lnvpair -lpthread -luutil -lumem
 .endif
 CRUNCH_LIBS+= -lgeom -lbsdxml -ljail -lkiconv -lmd -lreadline -lsbuf -lufs -lz