From owner-svn-soc-all@freebsd.org  Thu Nov  9 16:40:14 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 81E46E556EA
 for <svn-soc-all@mailman.ysv.freebsd.org>;
 Thu,  9 Nov 2017 16:40:14 +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 73F7C6E8E5
 for <svn-soc-all@FreeBSD.org>; Thu,  9 Nov 2017 16:40:14 +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 vA9GeEmq023643
 for <svn-soc-all@FreeBSD.org>; Thu, 9 Nov 2017 16:40:14 GMT
 (envelope-from allanjude@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id vA9GeDAY023625
 for svn-soc-all@FreeBSD.org; Thu, 9 Nov 2017 16:40:13 GMT
 (envelope-from allanjude@FreeBSD.org)
Date: Thu, 9 Nov 2017 16:40:13 GMT
Message-Id: <201711091640.vA9GeDAY023625@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: r329245 - 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:40:14 -0000

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

Log:
  Fix the 'be create newbe@newsnap' case
  
  The snapshot name passed to be_create_from_existing_snap() must be canonical

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:39:17 2017	(r329244)
+++ soc2017/kneitinger/libbe-head/sbin/be/be.c	Thu Nov  9 16:40:13 2017	(r329245)
@@ -176,6 +176,7 @@
 	int err, opt;
 	char *snapname;
 	char *bootenv;
+	char *source;
 
 	snapname = NULL;
 	while ((opt = getopt(argc, argv, "e:")) != -1) {
@@ -211,12 +212,13 @@
 	} else {
 		if ((snapname = strchr(bootenv, '@')) != NULL) {
 			*(snapname++) = '\0';
-			if ((err = be_snapshot(be, bootenv, snapname, true, NULL))
-			    != BE_ERR_SUCCESS) {
+			if ((err = be_snapshot(be, (char *)be_active_path(be),
+			    snapname, true, NULL)) != BE_ERR_SUCCESS) {
 				fprintf(stderr, "failed to create snapshot\n");
 			}
+			asprintf(&source, "%s@%s", be_active_path(be), snapname);
 			err = be_create_from_existing_snap(be, bootenv,
-			    snapname);
+			    source);
 			return (err);
 		} else {
 			err = be_create(be, bootenv);