From owner-svn-soc-all@freebsd.org  Thu Nov  9 16:17:47 2017
Return-Path: <owner-svn-soc-all@freebsd.org>
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 35F60E54F87
 for <svn-soc-all@mailman.ysv.freebsd.org>;
 Thu,  9 Nov 2017 16:17:47 +0000 (UTC)
 (envelope-from allanjude@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 0FBF96DE4B
 for <svn-soc-all@FreeBSD.org>; Thu,  9 Nov 2017 16:17:47 +0000 (UTC)
 (envelope-from allanjude@FreeBSD.org)
Received: from socsvn.freebsd.org ([127.0.1.124])
 by socsvn.freebsd.org (8.15.2/8.15.2) with ESMTP id vA9GHkhE071552
 for <svn-soc-all@FreeBSD.org>; Thu, 9 Nov 2017 16:17:46 GMT
 (envelope-from allanjude@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id vA9GHkld071540
 for svn-soc-all@FreeBSD.org; Thu, 9 Nov 2017 16:17:46 GMT
 (envelope-from allanjude@FreeBSD.org)
Date: Thu, 9 Nov 2017 16:17:46 GMT
Message-Id: <201711091617.vA9GHkld071540@socsvn.freebsd.org>
X-Authentication-Warning: socsvn.freebsd.org: www set sender to
 allanjude@FreeBSD.org using -f
From: allanjude@FreeBSD.org
To: svn-soc-all@FreeBSD.org
Subject: socsvn commit: r329243 - 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
 <svn-soc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all/>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 09 Nov 2017 16:17:47 -0000

Author: allanjude
Date: Thu Nov  9 16:17:46 2017
New Revision: 329243
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=329243

Log:
  Chase be_snapshot changes on the consumer side
  
  Deal with the incomplete case 'be create newbe@non-existing-snapshot'
  It will now create the snapshot on the active BE, then close it ot create 'newbe'
  

Modified:
  soc2017/kneitinger/libbe-head/sbin/be/be.c

Modified: soc2017/kneitinger/libbe-head/sbin/be/be.c
==============================================================================
--- soc2017/kneitinger/libbe-head/sbin/be/be.c	Thu Nov  9 16:10:17 2017	(r329242)
+++ soc2017/kneitinger/libbe-head/sbin/be/be.c	Thu Nov  9 16:17:46 2017	(r329243)
@@ -174,14 +174,14 @@
 be_cmd_create(int argc, char *argv[])
 {
 	int err, opt;
-	char *existing;
+	char *snapname;
 	char *bootenv;
 
-	existing = NULL;
+	snapname = NULL;
 	while ((opt = getopt(argc, argv, "e:")) != -1) {
 		switch (opt) {
 		case 'e':
-			existing = optarg;
+			snapname = optarg;
 			break;
 		default:
 			fprintf(stderr, "be create: unknown option '-%c'\n",
@@ -201,22 +201,22 @@
 	bootenv = *argv;
 
 
-	if (existing != NULL) {
-		if (strchr(existing, '@') != NULL) {
-			err =
-			    be_create_from_existing_snap(be, bootenv, existing);
+	if (snapname != NULL) {
+		if (strchr(snapname, '@') != NULL) {
+			err = be_create_from_existing_snap(be, bootenv,
+			    snapname);
 		} else {
-			err = be_create_from_existing(be, bootenv, existing);
+			err = be_create_from_existing(be, bootenv, snapname);
 		}
 	} else {
-		/* char *existing, is unused in this case, so it can be
-		 * safely repurposed as snap name */
-		if ((existing = strchr(bootenv, '@')) != NULL) {
-			*(existing++) = '\0';
-			if ((err = be_snapshot(be, bootenv, existing, NULL))
+		if ((snapname = strchr(bootenv, '@')) != NULL) {
+			*(snapname++) = '\0';
+			if ((err = be_snapshot(be, bootenv, snapname, true, NULL))
 			    != BE_ERR_SUCCESS) {
 				fprintf(stderr, "failed to create snapshot\n");
 			}
+			err = be_create_from_existing_snap(be, bootenv,
+			    snapname);
 			return (err);
 		} else {
 			err = be_create(be, bootenv);
@@ -227,13 +227,13 @@
 	case BE_ERR_SUCCESS:
 		break;
 	default:
-		if (existing == NULL) {
+		if (snapname == NULL) {
 			fprintf(stderr,
 			    "failed to create bootenv %s\n", bootenv);
 		} else {
 			fprintf(stderr,
 			    "failed to create bootenv %s from snapshot %s\n",
-			    bootenv, existing);
+			    bootenv, snapname);
 		}
 	}