diff options
author | Ćukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com> | 2017-07-03 13:44:00 +0200 |
---|---|---|
committer | usd-importer <ubuntu-server@lists.ubuntu.com> | 2017-07-03 12:23:41 +0000 |
commit | 70c0ea1ac879b2e1cba0a8edb1f3fbe82652413b (patch) | |
tree | f168bb289117feb1c0d5b2c73604b44e85b064e2 /azurelinuxagent/daemon/resourcedisk/freebsd.py | |
parent | 68754fe67f1b3da2e6ca45885641941b3229698a (diff) | |
parent | 63aafec1b1a480947da7d5579c3ffc66b8fe5bdb (diff) | |
download | vyos-walinuxagent-70c0ea1ac879b2e1cba0a8edb1f3fbe82652413b.tar.gz vyos-walinuxagent-70c0ea1ac879b2e1cba0a8edb1f3fbe82652413b.zip |
Import patches-applied version 2.2.14-0ubuntu1 to applied/ubuntu/artful-proposed
Imported using git-ubuntu import.
Changelog parent: 68754fe67f1b3da2e6ca45885641941b3229698a
Unapplied parent: 63aafec1b1a480947da7d5579c3ffc66b8fe5bdb
New changelog entries:
* New upstream release (LP: #1701350).
* debian/copyright:
- Refreshed copyright content.
Diffstat (limited to 'azurelinuxagent/daemon/resourcedisk/freebsd.py')
-rw-r--r-- | azurelinuxagent/daemon/resourcedisk/freebsd.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/azurelinuxagent/daemon/resourcedisk/freebsd.py b/azurelinuxagent/daemon/resourcedisk/freebsd.py index e43d9c4..35ae06b 100644 --- a/azurelinuxagent/daemon/resourcedisk/freebsd.py +++ b/azurelinuxagent/daemon/resourcedisk/freebsd.py @@ -59,7 +59,7 @@ class FreeBSDResourceDiskHandler(ResourceDiskHandler): disks = self.parse_gpart_list(output) device = self.osutil.device_for_ide_port(1) - if device is None: + if device is None or not device in disks: # fallback logic to find device err, output = shellutil.run_get_output('camcontrol periphlist 2:1:0') if err: |