Index: branches/2018Q3/net/cloud-init/Makefile
===================================================================
--- branches/2018Q3/net/cloud-init/Makefile	(revision 476478)
+++ branches/2018Q3/net/cloud-init/Makefile	(revision 476479)
@@ -1,51 +1,51 @@
 # $FreeBSD$
 
 PORTNAME=	cloud-init
 PORTVERSION=	18.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net python
 MASTER_SITES=	http://launchpad.net/${PORTNAME}/trunk/${PORTVERSION}/+download/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	zi@FreeBSD.org
 COMMENT=	Init scripts for use on cloud images
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	dmidecode>0:sysutils/dmidecode \
 		sudo>0:security/sudo \
 		${PYTHON_PKGNAMEPREFIX}boto>0:devel/py-boto@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}configobj>0:devel/py-configobj@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}serial>0:comms/py-serial@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}oauthlib>0:security/py-oauthlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jsonpatch>0:devel/py-jsonpatch@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cheetah>0:devel/py-cheetah@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jsonschema>0:devel/py-jsonschema@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jsonpointer>0:devel/py-jsonpointer@${PY_FLAVOR}
 
 ETCDIR=		${PREFIX}/etc/cloud
 
 USES=		python:2.7 shebangfix
 SHEBANG_FILES=	tools/validate-yaml.py tools/read-dependencies \
 		tools/read-version
 USE_PYTHON=	autoplist distutils
 
 PYDISTUTILS_INSTALLARGS+=	"--init-system=sysvinit_freebsd"
 
 ONLY_FOR_ARCHS=		amd64 i386
 ONLY_FOR_ARCHS_REASON=	currently depends on dmidecode which is x86-only
 
 post-patch:
 	${REINPLACE_CMD} -e 's|"etc"|"${STAGEDIR}${PREFIX}/etc"|g' ${WRKSRC}/setup.py
 	${REINPLACE_CMD} -e 's|/etc/|${PREFIX}/etc/|g' ${WRKSRC}/cloudinit/settings.py
 	@${RM} ${WRKSRC}/sysvinit/freebsd/*.orig
 
 post-build:
-	@cd ${WRKSRC} && ${MV} sysvinit/freebsd/cloudconfig config/cloud.cfg
+	(cd ${WRKSRC} && ${MV} sysvinit/freebsd/cloudconfig config/cloud.cfg)
 
 .include <bsd.port.mk>
Index: branches/2018Q3/net/cloud-init/files/patch-cloudinit_config_cc__resizefs.py
===================================================================
--- branches/2018Q3/net/cloud-init/files/patch-cloudinit_config_cc__resizefs.py	(nonexistent)
+++ branches/2018Q3/net/cloud-init/files/patch-cloudinit_config_cc__resizefs.py	(revision 476479)
@@ -0,0 +1,20 @@
+--- cloudinit/config/cc_resizefs.py.orig	2018-08-03 17:33:27 UTC
++++ cloudinit/config/cc_resizefs.py
+@@ -81,7 +81,7 @@ def _resize_xfs(mount_point, devpth):
+ 
+ 
+ def _resize_ufs(mount_point, devpth):
+-    return ('growfs', '-y', devpth)
++    return ('growfs', '-y', mount_point)
+ 
+ 
+ def _resize_zfs(mount_point, devpth):
+@@ -110,7 +110,7 @@ def _can_skip_resize_ufs(mount_point, de
+     for line in dumpfs_res.splitlines():
+         if not line.startswith('#'):
+             newfs_cmd = shlex.split(line)
+-            opt_value = 'O:Ua:s:b:d:e:f:g:h:i:jk:m:o:'
++            opt_value = 'L:O:Ua:s:b:d:e:f:g:h:i:jk:m:o:'
+             optlist, _args = getopt.getopt(newfs_cmd[1:], opt_value)
+             for o, a in optlist:
+                 if o == "-s":

Property changes on: branches/2018Q3/net/cloud-init/files/patch-cloudinit_config_cc__resizefs.py
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2018Q3/net/cloud-init/files/patch-cloudinit_util.py
===================================================================
--- branches/2018Q3/net/cloud-init/files/patch-cloudinit_util.py	(nonexistent)
+++ branches/2018Q3/net/cloud-init/files/patch-cloudinit_util.py	(revision 476479)
@@ -0,0 +1,29 @@
+--- cloudinit/util.py.orig	2018-08-03 17:34:37 UTC
++++ cloudinit/util.py
+@@ -2291,7 +2291,7 @@ def parse_mtab(path):
+ 
+ 
+ def find_freebsd_part(label_part):
+-    if label_part.startswith("/dev/label/"):
++    if label_part.startswith("/dev/gpt/"):
+         target_label = label_part[5:]
+         (label_part, _err) = subp(['glabel', 'status', '-s'])
+         for labels in label_part.split("\n"):
+@@ -2300,7 +2300,7 @@ def find_freebsd_part(label_part):
+                 label_part = items[2]
+                 break
+         label_part = str(label_part)
+-    return label_part
++    return "/dev/" + label_part
+ 
+ 
+ def get_path_dev_freebsd(path, mnt_list):
+@@ -2324,7 +2324,7 @@ def get_mount_info_freebsd(path):
+         result = path_found
+     ret = result.split()
+     label_part = find_freebsd_part(ret[0])
+-    return "/dev/" + label_part, ret[2], ret[1]
++    return label_part, ret[2], ret[1]
+ 
+ 
+ def get_device_info_from_zpool(zpool):

Property changes on: branches/2018Q3/net/cloud-init/files/patch-cloudinit_util.py
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2018Q3
===================================================================
--- branches/2018Q3	(revision 476478)
+++ branches/2018Q3	(revision 476479)

Property changes on: branches/2018Q3
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r476313