cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sysutils/azure-agent: Workaround for detecting resource disk on gen2 VM

Browse Source 
Approved by:	whu (maintainer, implicitly)
MFH:		2021Q3
Sponsored by:	The FreeBSD Foundation
This commit is contained in:
Li-Wen Hsu 2021-07-28 04:57:30 +08:00
parent 629c7003d5
commit 828e370fe1
No known key found for this signature in database
GPG Key ID: 82B261B14D3BC7AF
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sysutils/azure-agent/Makefile
View File

@ -1,6 +1,7 @@
PORTNAME= azure-agent
PORTVERSION= 2.2.54.2
DISTVERSIONPREFIX= v
PORTREVISION= 1
CATEGORIES= sysutils
PATCH_SITES= https://github.com/Azure/WALinuxAgent/commit/

19
sysutils/azure-agent/files/patch-azurelinuxagent_daemon_resourcedisk_freebsd.py
View File

@ -1,4 +1,4 @@
--- azurelinuxagent/daemon/resourcedisk/freebsd.py.orig 2021-05-18 18:30:52 UTC
--- azurelinuxagent/daemon/resourcedisk/freebsd.py.orig 2021-06-24 22:08:50 UTC
+++ azurelinuxagent/daemon/resourcedisk/freebsd.py
@@ -1,6 +1,7 @@
# Microsoft Azure Linux Agent
@ -76,7 +76,22 @@
device = self.osutil.device_for_ide_port(1)
if device is None or device not in disks:
@@ -90,94 +101,195 @@ class FreeBSDResourceDiskHandler(ResourceDiskHandler):
@@ -74,8 +85,12 @@ class FreeBSDResourceDiskHandler(ResourceDiskHandler):
err, output = shellutil.run_get_output(
'camcontrol periphlist 3:1:0')
if err:
- raise ResourceDiskError(
- "Unable to detect resource disk device:{0}".format(output))
+ # try again on "0:0:1"
+ err, output = shellutil.run_get_output(
+ 'camcontrol periphlist 0:0:1')
+ if err:
+ raise ResourceDiskError(
+ "Unable to detect resource disk device:{0}".format(output))
# 'da1: generation: 4 index: 1 status: MORE\npass2: generation: 4 index: 2 status: LAST\n'
for line in output.split('\n'):
@@ -90,94 +105,195 @@ class FreeBSDResourceDiskHandler(ResourceDiskHandler):
raise ResourceDiskError("Unable to detect resource disk device.")
logger.info('Resource disk device {0} found.', device)