d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow zfs jail and zfs unjail to use both jailnames and jailid

Browse Source 
Reviewed by:	pjd
MFC after:	1 month
This commit is contained in:
Baptiste Daroussin 2012-09-19 16:20:49 +00:00
parent 6483d5a592
commit ec6ddea1a8
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cddl/contrib/opensolaris/cmd/zfs/zfs.8
View File

@ -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

6
cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
View File

@ -6300,9 +6300,9 @@ do_jail(int argc, char **argv, int attach)
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);
}

4
cddl/sbin/zfs/Makefile
View File

@ -21,8 +21,8 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs
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>