aboutsummaryrefslogtreecommitdiff
path: root/sysutils
diff options
context:
space:
mode:
authorLi-Wen Hsu <lwhsu@FreeBSD.org>2021-07-27 20:57:30 +0000
committerLi-Wen Hsu <lwhsu@FreeBSD.org>2021-07-27 20:57:52 +0000
commit7a2b4e1ff1b723022123d0c187bd072cbe1b53f6 (patch)
tree4b2d88a95312a87df0785b35b8d30431a62a4fa7 /sysutils
parentac30770cdc198d98a5f0bce8a6c0391786ddf234 (diff)
downloadports-7a2b4e1ff1b723022123d0c187bd072cbe1b53f6.tar.gz
ports-7a2b4e1ff1b723022123d0c187bd072cbe1b53f6.zip
sysutils/azure-agent: Workaround for detecting resource disk on gen2 VM
Approved by: whu (maintainer, implicitly) MFH: 2021Q3 Sponsored by: The FreeBSD Foundation (cherry picked from commit 828e370fe13f3858073666df4fe68f8188b4ad57)
Diffstat (limited to 'sysutils')
-rw-r--r--sysutils/azure-agent/Makefile1
-rw-r--r--sysutils/azure-agent/files/patch-azurelinuxagent_daemon_resourcedisk_freebsd.py19
2 files changed, 18 insertions, 2 deletions
diff --git a/sysutils/azure-agent/Makefile b/sysutils/azure-agent/Makefile
index 8c4b2919ca9a..db657147b9ae 100644
--- a/sysutils/azure-agent/Makefile
+++ b/sysutils/azure-agent/Makefile
@@ -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/
diff --git a/sysutils/azure-agent/files/patch-azurelinuxagent_daemon_resourcedisk_freebsd.py b/sysutils/azure-agent/files/patch-azurelinuxagent_daemon_resourcedisk_freebsd.py
index 347ba8ab5641..e6cfe3ff726c 100644
--- a/sysutils/azure-agent/files/patch-azurelinuxagent_daemon_resourcedisk_freebsd.py
+++ b/sysutils/azure-agent/files/patch-azurelinuxagent_daemon_resourcedisk_freebsd.py
@@ -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)