Date: Wed, 13 Feb 2013 06:46:53 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r246750 - in stable/8: cddl/contrib/opensolaris/cmd/zfs cddl/sbin/zfs rescue/rescue Message-ID: <201302130646.r1D6krJw060054@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Wed Feb 13 06:46:53 2013 New Revision: 246750 URL: http://svnweb.freebsd.org/changeset/base/246750 Log: MFC: r240696, r240698, r240740 Allow zfs jail and zfs unjail to use both jailnames and jailid Modified: stable/8/cddl/contrib/opensolaris/cmd/zfs/zfs.8 stable/8/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c stable/8/cddl/sbin/zfs/Makefile stable/8/rescue/rescue/Makefile Directory Properties: stable/8/cddl/ (props changed) stable/8/cddl/contrib/opensolaris/ (props changed) stable/8/cddl/contrib/opensolaris/cmd/zfs/ (props changed) stable/8/cddl/sbin/ (props changed) stable/8/rescue/ (props changed) stable/8/rescue/rescue/ (props changed) Modified: stable/8/cddl/contrib/opensolaris/cmd/zfs/zfs.8 ============================================================================== --- stable/8/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Wed Feb 13 06:17:17 2013 (r246749) +++ stable/8/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Wed Feb 13 06:46:53 2013 (r246750) @@ -255,10 +255,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/8/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c ============================================================================== --- stable/8/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Wed Feb 13 06:17:17 2013 (r246749) +++ stable/8/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Wed Feb 13 06:46:53 2013 (r246750) @@ -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/8/cddl/sbin/zfs/Makefile ============================================================================== --- stable/8/cddl/sbin/zfs/Makefile Wed Feb 13 06:17:17 2013 (r246749) +++ stable/8/cddl/sbin/zfs/Makefile Wed Feb 13 06:46:53 2013 (r246750) @@ -20,8 +20,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/8/rescue/rescue/Makefile ============================================================================== --- stable/8/rescue/rescue/Makefile Wed Feb 13 06:17:17 2013 (r246749) +++ stable/8/rescue/rescue/Makefile Wed Feb 13 06:46:53 2013 (r246750) @@ -141,7 +141,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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201302130646.r1D6krJw060054>