From owner-svn-soc-all@freebsd.org Sun Nov 5 09:12:18 2017 Return-Path: Delivered-To: svn-soc-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C9CA3E66280 for ; Sun, 5 Nov 2017 09:12:18 +0000 (UTC) (envelope-from kneitinger@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id AE65B74176 for ; Sun, 5 Nov 2017 09:12:18 +0000 (UTC) (envelope-from kneitinger@FreeBSD.org) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.15.2/8.15.2) with ESMTP id vA59CIR8071693 for ; Sun, 5 Nov 2017 09:12:18 GMT (envelope-from kneitinger@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id vA59CHqB070528 for svn-soc-all@FreeBSD.org; Sun, 5 Nov 2017 09:12:17 GMT (envelope-from kneitinger@FreeBSD.org) Date: Sun, 5 Nov 2017 09:12:17 GMT Message-Id: <201711050912.vA59CHqB070528@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to kneitinger@FreeBSD.org using -f From: kneitinger@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r329069 - soc2017/kneitinger/libbe-head/sbin/be MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Nov 2017 09:12:18 -0000 Author: kneitinger Date: Sun Nov 5 09:12:17 2017 New Revision: 329069 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=329069 Log: Change `be init` command to `be add` Modified: soc2017/kneitinger/libbe-head/sbin/be/Makefile soc2017/kneitinger/libbe-head/sbin/be/be.c Modified: soc2017/kneitinger/libbe-head/sbin/be/Makefile ============================================================================== --- soc2017/kneitinger/libbe-head/sbin/be/Makefile Sun Nov 5 08:31:25 2017 (r329068) +++ soc2017/kneitinger/libbe-head/sbin/be/Makefile Sun Nov 5 09:12:17 2017 (r329069) @@ -5,5 +5,6 @@ MAN= be.1 LIBADD+= be +LIBADD+= nv .include Modified: soc2017/kneitinger/libbe-head/sbin/be/be.c ============================================================================== --- soc2017/kneitinger/libbe-head/sbin/be/be.c Sun Nov 5 08:31:25 2017 (r329068) +++ soc2017/kneitinger/libbe-head/sbin/be/be.c Sun Nov 5 09:12:17 2017 (r329069) @@ -32,11 +32,13 @@ #include #include #include +#include #include #include #include #include +#include #include static int be_cmd_activate(int argc, char *argv[]); @@ -44,7 +46,7 @@ static int be_cmd_destroy(int argc, char *argv[]); static int be_cmd_export(int argc, char *argv[]); static int be_cmd_import(int argc, char *argv[]); -static int be_cmd_init(int argc, char *argv[]); +static int be_cmd_add(int argc, char *argv[]); static int be_cmd_jail(int argc, char *argv[]); static int be_cmd_list(int argc, char *argv[]); static int be_cmd_mount(int argc, char *argv[]); @@ -67,7 +69,7 @@ "\tbe destroy [-F] beName | beName@snapshot⟩\n" "\tbe export sourceBe\n" "\tbe import targetBe\n" - "\tbe init (path)*\n" + "\tbe add (path)*\n" "\tbe jail bootenv\n" "\tbe list [-a] [-D] [-H] [-s]\n" "\tbe mount beName [mountpoint]\n" @@ -95,7 +97,7 @@ { "destroy", be_cmd_destroy }, { "export", be_cmd_export }, { "import", be_cmd_import }, - { "init", be_cmd_init }, + { "add", be_cmd_add }, { "jail", be_cmd_jail }, { "list", be_cmd_list }, { "mount", be_cmd_mount }, @@ -301,12 +303,12 @@ static int -be_cmd_init(int argc, char *argv[]) +be_cmd_add(int argc, char *argv[]) { char *bootenv; if (argc < 2) { - fprintf(stderr, "be init: must provide at least one path\n"); + fprintf(stderr, "be add: must provide at least one path\n"); return (usage(false)); } @@ -418,6 +420,7 @@ int opt; bool show_all_datasets, show_space, hide_headers, show_snaps; char *bootenv; + nvlist_t *props; show_all_datasets = show_space = hide_headers = show_snaps = false; while ((opt = getopt(argc, argv, "aDHs")) != -1) { @@ -448,6 +451,8 @@ return (usage(false)); } + //props = be_get_bootenv_props(be); + return (0); }