Date: Sun, 5 Aug 2018 21:47:04 +0000 (UTC) From: Ryan Steinmetz <zi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r476479 - in branches/2018Q3/net/cloud-init: . files Message-ID: <201808052147.w75Ll4ws090795@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: zi Date: Sun Aug 5 21:47:03 2018 New Revision: 476479 URL: https://svnweb.freebsd.org/changeset/ports/476479 Log: MFH: r476313 - Fix auto-resize code - Bump PORTREVISION Approved by: ports-secteam (with hat) Added: branches/2018Q3/net/cloud-init/files/patch-cloudinit_config_cc__resizefs.py - copied unchanged from r476313, head/net/cloud-init/files/patch-cloudinit_config_cc__resizefs.py branches/2018Q3/net/cloud-init/files/patch-cloudinit_util.py - copied unchanged from r476313, head/net/cloud-init/files/patch-cloudinit_util.py Modified: branches/2018Q3/net/cloud-init/Makefile Directory Properties: branches/2018Q3/ (props changed) Modified: branches/2018Q3/net/cloud-init/Makefile ============================================================================== --- branches/2018Q3/net/cloud-init/Makefile Sun Aug 5 21:46:39 2018 (r476478) +++ branches/2018Q3/net/cloud-init/Makefile Sun Aug 5 21:47:03 2018 (r476479) @@ -2,7 +2,7 @@ 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} @@ -46,6 +46,6 @@ post-patch: @${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> Copied: branches/2018Q3/net/cloud-init/files/patch-cloudinit_config_cc__resizefs.py (from r476313, head/net/cloud-init/files/patch-cloudinit_config_cc__resizefs.py) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q3/net/cloud-init/files/patch-cloudinit_config_cc__resizefs.py Sun Aug 5 21:47:03 2018 (r476479, copy of r476313, head/net/cloud-init/files/patch-cloudinit_config_cc__resizefs.py) @@ -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": Copied: branches/2018Q3/net/cloud-init/files/patch-cloudinit_util.py (from r476313, head/net/cloud-init/files/patch-cloudinit_util.py) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q3/net/cloud-init/files/patch-cloudinit_util.py Sun Aug 5 21:47:03 2018 (r476479, copy of r476313, head/net/cloud-init/files/patch-cloudinit_util.py) @@ -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):
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201808052147.w75Ll4ws090795>