Attachment #219195 for bug #250496

Lines 2-7 Link Here

(-)Makefile (-1 / +1 lines)
2		2
3	PORTNAME= cloud-init	3	PORTNAME= cloud-init
4	PORTVERSION= 20.3	4	PORTVERSION= 20.3
		5	PORTREVISION= 1
5	CATEGORIES= net python	6	CATEGORIES= net python
6	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	7	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
7		8
Lines 22-28 Link Here
22	${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \	23	${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \
23	${PYTHON_PKGNAMEPREFIX}configobj>0:devel/py-configobj@${PY_FLAVOR} \	24	${PYTHON_PKGNAMEPREFIX}configobj>0:devel/py-configobj@${PY_FLAVOR} \
24	${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \	25	${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \
25	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
26	${PYTHON_PKGNAMEPREFIX}pyserial>0:comms/py-pyserial@${PY_FLAVOR} \	26	${PYTHON_PKGNAMEPREFIX}pyserial>0:comms/py-pyserial@${PY_FLAVOR} \
27	${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \	27	${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
28	${PYTHON_PKGNAMEPREFIX}oauthlib>0:security/py-oauthlib@${PY_FLAVOR} \	28	${PYTHON_PKGNAMEPREFIX}oauthlib>0:security/py-oauthlib@${PY_FLAVOR} \

Line 0 Link Here

(-)files/patch-cloudinit_config_cc-resizefs.py (+11 lines)
	1	--- cloudinit/config/cc_resizefs.py
	2	+++ cloudinit/config/cc_resizefs.py
	3	@@ -110,7 +110,7 @@ def _can_skip_resize_ufs(mount_point, devpth):
	4	for line in dumpfs_res.splitlines():
	5	if not line.startswith('#'):
	6	newfs_cmd = shlex.split(line)
	7	- opt_value = 'O:Ua:s:b:d:e:f:g:h:i:jk:m:o:L:'
	8	+ opt_value = 'O:Ua:s:b:d:e:f:g:h:i:jk:l:m:o:t:L:'
	9	optlist, _args = getopt.getopt(newfs_cmd[1:], opt_value)
	10	for o, a in optlist:
	11	if o == "-s":

Line 0 Link Here

(-)files/patch-cloudinit_util.py (+11 lines)
	1	--- cloudinit/util.py
	2	+++ cloudinit/util.py
	3	@@ -1667,7 +1667,7 @@ def mount_cb(device, callback, data=None, mtype=None,
	4	mtypes = ["auto"]
	5	elif platsys.endswith("bsd"):
	6	if mtypes is None:
	7	- mtypes = ['ufs', 'cd9660', 'vfat']
	8	+ mtypes = ['ufs', 'cd9660', 'msdosfs', 'msdos']
	9	for index, mtype in enumerate(mtypes):
	10	if mtype == "iso9660":
	11	mtypes[index] = "cd9660"

Return to bug 250496