From owner-svn-src-head@freebsd.org Thu Aug 16 18:26:44 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 135ED1071EDC; Thu, 16 Aug 2018 18:26:44 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id BA39471919; Thu, 16 Aug 2018 18:26:43 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9B0F21D1AC; Thu, 16 Aug 2018 18:26:43 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w7GIQh14039807; Thu, 16 Aug 2018 18:26:43 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w7GIQhfQ039806; Thu, 16 Aug 2018 18:26:43 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <201808161826.w7GIQhfQ039806@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Thu, 16 Aug 2018 18:26:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r337917 - head/sbin/bectl X-SVN-Group: head X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: head/sbin/bectl X-SVN-Commit-Revision: 337917 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Aug 2018 18:26:44 -0000 Author: kevans Date: Thu Aug 16 18:26:43 2018 New Revision: 337917 URL: https://svnweb.freebsd.org/changeset/base/337917 Log: bectl(8): Implement the 'create a snapshot' variant of create Modified: head/sbin/bectl/bectl.c Modified: head/sbin/bectl/bectl.c ============================================================================== --- head/sbin/bectl/bectl.c Thu Aug 16 17:59:49 2018 (r337916) +++ head/sbin/bectl/bectl.c Thu Aug 16 18:26:43 2018 (r337917) @@ -182,15 +182,19 @@ bectl_cmd_activate(int argc, char *argv[]) static int bectl_cmd_create(int argc, char *argv[]) { - char *bootenv, *snapname, *source; + char *atpos, *bootenv, *snapname, *source; int err, opt; + bool recursive; snapname = NULL; - while ((opt = getopt(argc, argv, "e:")) != -1) { + recursive = false; + while ((opt = getopt(argc, argv, "re:")) != -1) { switch (opt) { case 'e': snapname = optarg; break; + case 'r': + recursive = true; default: fprintf(stderr, "bectl create: unknown option '-%c'\n", optopt); @@ -207,8 +211,14 @@ bectl_cmd_create(int argc, char *argv[]) } bootenv = *argv; - - if (snapname != NULL) { + if ((atpos = strchr(bootenv, '@')) != NULL) { + /* + * This is the "create a snapshot variant". No new boot + * environment is to be created here. + */ + *atpos++ = '\0'; + err = be_snapshot(be, bootenv, atpos, recursive, NULL); + } else if (snapname != NULL) { if (strchr(snapname, '@') != NULL) err = be_create_from_existing_snap(be, bootenv, snapname); @@ -232,7 +242,11 @@ bectl_cmd_create(int argc, char *argv[]) case BE_ERR_SUCCESS: break; default: - if (snapname == NULL) + if (atpos != NULL) + fprintf(stderr, + "failed to create a snapshot '%s' of '%s'\n", + atpos, bootenv); + else if (snapname == NULL) fprintf(stderr, "failed to create bootenv %s\n", bootenv); else