Author: bapt
Date: Wed Sep 19 16:20:49 2012
New Revision: 240696
URL: http://svn.freebsd.org/changeset/base/240696
Log:
Allow zfs jail and zfs unjail to use both jailnames and jailid
Reviewed by: pjd
MFC after: 1 month
Modified:
head/cddl/contrib/opensolaris/cmd/zfs/zfs.8
head/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
head/cddl/sbin/zfs/Makefile
Modified: head/cddl/contrib/opensolaris/cmd/zfs/zfs.8
==============================================================================
--- head/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Wed Sep 19 15:43:30 2012
(r240695)
+++ head/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Wed Sep 19 16:20:49 2012
(r240696)
@@ -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: head/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
==============================================================================
--- head/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Wed Sep 19 15:43:30
2012 (r240695)
+++ head/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Wed Sep 19 16:20:49
2012 (r240696)
@@ -6300,9 +6300,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: head/cddl/sbin/zfs/Makefile
==============================================================================
--- head/cddl/sbin/zfs/Makefile Wed Sep 19 15:43:30 2012 (r240695)
+++ head/cddl/sbin/zfs/Makefile Wed Sep 19 16:20:49 2012 (r240696)
@@ -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>
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
