diff options
| author | George Kraft <george.kraft@calxeda.com> | 2013-06-21 16:01:13 -0500 |
|---|---|---|
| committer | George Kraft <george.kraft@calxeda.com> | 2013-06-21 16:01:13 -0500 |
| commit | fa3e1cb57879989197e8758521f6474ead954d22 (patch) | |
| tree | 6e63a1622203172a27fc1d64fef3d1203a28a044 | |
| parent | ba2c3157af10f43081464035184c94e2ebf65359 (diff) | |
| download | cxmanage-fa3e1cb57879989197e8758521f6474ead954d22.tar.gz | |
CXMAN-213: Allow firmware updates with a single UBOOTENV partition
If there's only one partition, just treat it like any other image.
This means the boot order won't be preserved.
| -rw-r--r-- | cxmanage_api/node.py | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/cxmanage_api/node.py b/cxmanage_api/node.py index 6f45ce4..50757f7 100644 --- a/cxmanage_api/node.py +++ b/cxmanage_api/node.py @@ -595,6 +595,8 @@ class Node(object): """ fwinfo = self.get_firmware_info() + num_ubootenv_partitions = len([x for x in fwinfo + if "UBOOTENV" in x.type]) # Get the new priority if (priority == None): @@ -603,7 +605,7 @@ class Node(object): updated_partitions = [] for image in package.images: - if (image.type == "UBOOTENV"): + if image.type == "UBOOTENV" and num_ubootenv_partitions >= 2: # Get partitions running_part = self._get_partition(fwinfo, image.type, "FIRST") factory_part = self._get_partition(fwinfo, image.type, @@ -687,10 +689,13 @@ class Node(object): # Reset ubootenv fwinfo = self.get_firmware_info() - running_part = self._get_partition(fwinfo, "UBOOTENV", "FIRST") - factory_part = self._get_partition(fwinfo, "UBOOTENV", "SECOND") - image = self._download_image(factory_part) - self._upload_image(image, running_part) + try: + running_part = self._get_partition(fwinfo, "UBOOTENV", "FIRST") + factory_part = self._get_partition(fwinfo, "UBOOTENV", "SECOND") + image = self._download_image(factory_part) + self._upload_image(image, running_part) + except NoPartitionError: + pass # Only one partition? Don't mess with it! # Clear SEL self.bmc.sel_clear() @@ -1350,6 +1355,8 @@ class Node(object): """Check if this host is ready for an update.""" info = self.get_versions() fwinfo = self.get_firmware_info() + num_ubootenv_partitions = len([x for x in fwinfo + if "UBOOTENV" in x.type]) # Check firmware version if package.version and info.firmware_version: @@ -1394,7 +1401,8 @@ class Node(object): # Check partitions for image in package.images: - if ((image.type == "UBOOTENV") or (partition_arg == "BOTH")): + if (image.type == "UBOOTENV" and num_ubootenv_partitions >= 2 + or partition_arg == "BOTH"): partitions = [self._get_partition(fwinfo, image.type, x) for x in ["FIRST", "SECOND"]] else: |