Date: Fri, 30 Oct 2020 09:58:47 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r553676 - in head/net/cloud-init: . files Message-ID: <202010300958.09U9wlSr006490@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Fri Oct 30 09:58:47 2020 New Revision: 553676 URL: https://svnweb.freebsd.org/changeset/ports/553676 Log: - Amend the list of recognized newfs(8) options - Fix mounting of VFAT which FreeBSD calls "msdos[fs]" - GC `devel/py-six' dependency, unused since v20.2 PR: 250496 Added: head/net/cloud-init/files/ head/net/cloud-init/files/patch-cloudinit_config_cc__resizefs.py (contents, props changed) head/net/cloud-init/files/patch-cloudinit_util.py (contents, props changed) Modified: head/net/cloud-init/Makefile Modified: head/net/cloud-init/Makefile ============================================================================== --- head/net/cloud-init/Makefile Fri Oct 30 09:31:22 2020 (r553675) +++ head/net/cloud-init/Makefile Fri Oct 30 09:58:47 2020 (r553676) @@ -2,6 +2,7 @@ PORTNAME= cloud-init PORTVERSION= 20.3 +PORTREVISION= 1 CATEGORIES= net python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -22,7 +23,6 @@ RUN_DEPENDS= dmidecode>0:sysutils/dmidecode \ ${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}pyserial>0:comms/py-pyserial@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}oauthlib>0:security/py-oauthlib@${PY_FLAVOR} \ Added: head/net/cloud-init/files/patch-cloudinit_config_cc__resizefs.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/cloud-init/files/patch-cloudinit_config_cc__resizefs.py Fri Oct 30 09:58:47 2020 (r553676) @@ -0,0 +1,11 @@ +--- cloudinit/config/cc_resizefs.py.orig 2020-10-29 12:41:28 UTC ++++ cloudinit/config/cc_resizefs.py +@@ -110,7 +110,7 @@ def _can_skip_resize_ufs(mount_point, devpth): + 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:L:' ++ opt_value = 'O:Ua:s:b:d:e:f:g:h:i:jk:l:m:o:t:L:' + optlist, _args = getopt.getopt(newfs_cmd[1:], opt_value) + for o, a in optlist: + if o == "-s": Added: head/net/cloud-init/files/patch-cloudinit_util.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/cloud-init/files/patch-cloudinit_util.py Fri Oct 30 09:58:47 2020 (r553676) @@ -0,0 +1,16 @@ +--- cloudinit/util.py.orig 2020-10-29 12:40:41 UTC ++++ cloudinit/util.py +@@ -1652,10 +1652,12 @@ def mount_cb(device, callback, data=None, mtype=None, + mtypes = ["auto"] + elif platsys.endswith("bsd"): + if mtypes is None: +- mtypes = ['ufs', 'cd9660', 'vfat'] ++ mtypes = ['ufs', 'cd9660', 'msdos'] + for index, mtype in enumerate(mtypes): + if mtype == "iso9660": + mtypes[index] = "cd9660" ++ if mtype in ["vfat", "msdosfs", "msdos"]: ++ mtypes[index] = "msdos" + else: + # we cannot do a smart "auto", so just call 'mount' once with no -t + mtypes = ['']
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202010300958.09U9wlSr006490>