mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-17 08:01:36 +00:00
Code Issues Releases Activity

- Fix auto-resize code

Browse Source 
- Bump PORTREVISION
This commit is contained in:
Ryan Steinmetz 2018-08-03 17:36:44 +00:00
parent c3e9777c4c
commit 0d35359389
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=476313
3 changed files with 51 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/cloud-init/Makefile
View File

@ -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>

20
net/cloud-init/files/patch-cloudinit_config_cc__resizefs.py Normal file
View File

@ -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":

29
net/cloud-init/files/patch-cloudinit_util.py Normal file
View File

@ -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):