svn commit: r246723 - in stable/9: cddl/contrib/opensolaris/cmd/zfs cddl/sbin/zfs rescue/rescue

[Baptiste Daroussin]

Author: bapt
Date: Tue Feb 12 23:01:21 2013
New Revision: 246723
URL: http://svnweb.freebsd.org/changeset/base/246723

Log:
  MFC: r240696, r240698, r240740
  
  Allow zfs jail and zfs unjail to use both jailnames and jailid

Modified:
  stable/9/cddl/contrib/opensolaris/cmd/zfs/zfs.8
  stable/9/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
  stable/9/cddl/sbin/zfs/Makefile
  stable/9/rescue/rescue/Makefile
Directory Properties:
  stable/9/cddl/   (props changed)
  stable/9/cddl/contrib/opensolaris/   (props changed)
  stable/9/cddl/contrib/opensolaris/cmd/zfs/   (props changed)
  stable/9/rescue/   (props changed)
  stable/9/rescue/rescue/   (props changed)

Modified: stable/9/cddl/contrib/opensolaris/cmd/zfs/zfs.8
==============================================================================
--- stable/9/cddl/contrib/opensolaris/cmd/zfs/zfs.8	Tue Feb 12 22:35:14 2013	(r246722)
+++ stable/9/cddl/contrib/opensolaris/cmd/zfs/zfs.8	Tue Feb 12 23:01:21 2013	(r246723)
@@ -256,10 +256,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: stable/9/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
==============================================================================
--- stable/9/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c	Tue Feb 12 22:35:14 2013	(r246722)
+++ stable/9/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c	Tue Feb 12 23:01:21 2013	(r246723)
@@ -240,9 +240,9 @@ get_usage(zfs_help_t idx)
 		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 @@ do_jail(int argc, char **argv, int attac
 		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: stable/9/cddl/sbin/zfs/Makefile
==============================================================================
--- stable/9/cddl/sbin/zfs/Makefile	Tue Feb 12 22:35:14 2013	(r246722)
+++ stable/9/cddl/sbin/zfs/Makefile	Tue Feb 12 23:01:21 2013	(r246723)
@@ -21,8 +21,8 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/
 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: stable/9/rescue/rescue/Makefile
==============================================================================
--- stable/9/rescue/rescue/Makefile	Tue Feb 12 22:35:14 2013	(r246722)
+++ stable/9/rescue/rescue/Makefile	Tue Feb 12 23:01:21 2013	(r246723)
@@ -123,7 +123,7 @@ CRUNCH_LIBS+= -lalias -lcam -lcurses -ld
 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