diff --git a/software/service-files/starlingx-GA-metadata.xml b/software/service-files/starlingx-GA-metadata.xml index fa001197..4c82b65e 100644 --- a/software/service-files/starlingx-GA-metadata.xml +++ b/software/service-files/starlingx-GA-metadata.xml @@ -10,6 +10,7 @@ REL Y Y + N diff --git a/software/software/release_data.py b/software/software/release_data.py index 85de7d74..6f6088a2 100644 --- a/software/software/release_data.py +++ b/software/software/release_data.py @@ -158,6 +158,10 @@ class SWRelease(object): def reboot_required(self): return self._get_by_key('reboot_required') == "Y" + @property + def prepatched_iso(self): + return self._get_by_key('prepatched_iso') == "Y" + @property def requires_release_ids(self): return self._get_by_key('requires') or [] @@ -255,6 +259,7 @@ class SWRelease(object): "install_instructions": self.install_instructions, "warnings": self.warnings, "reboot_required": self.reboot_required, + "prepatched_iso": self.prepatched_iso, "requires": self.requires_release_ids[:], "packages": self.packages[:]} return data diff --git a/software/software/software_functions.py b/software/software/software_functions.py index c9d354ee..8bce6b54 100644 --- a/software/software/software_functions.py +++ b/software/software/software_functions.py @@ -365,6 +365,13 @@ class ReleaseData(object): else: self.metadata[release_id]["reboot_required"] = "N" + # Default prepatched_iso to N + prepatched_iso = root.findtext("prepatched_iso") + if prepatched_iso is None or prepatched_iso != "Y": + self.metadata[release_id]["prepatched_iso"] = "N" + else: + self.metadata[release_id]["prepatched_iso"] = "Y" + release_sw_version = utils.get_major_release_version( self.metadata[release_id]["sw_version"]) global package_dir