From d40845d7c924b95d4770a02ebdbb318eb5044b80 Mon Sep 17 00:00:00 2001 From: Jeffrey Townsend Date: Wed, 8 Jun 2016 21:48:05 +0000 Subject: [PATCH] Auto upgrade policy inherited from subclass. Needs work. --- .../base/all/vendor-config-onl/src/boot.d/62.upgrade-loader | 5 ++++- .../all/vendor-config-onl/src/python/onl/upgrade/ubase.py | 6 +++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/packages/base/all/vendor-config-onl/src/boot.d/62.upgrade-loader b/packages/base/all/vendor-config-onl/src/boot.d/62.upgrade-loader index f7111744..94208553 100755 --- a/packages/base/all/vendor-config-onl/src/boot.d/62.upgrade-loader +++ b/packages/base/all/vendor-config-onl/src/boot.d/62.upgrade-loader @@ -20,6 +20,9 @@ class Loader_Upgrade(ubase.BaseUpgrade): current_version_key="Current Loader Version" next_version_key="Next Loader Version" + def auto_upgrade_default(self): + return sysconfig.upgrade.loader.auto + def init_versions(self): # @@ -68,7 +71,7 @@ class Loader_Upgrade_FIT(Loader_Upgrade): with OnlMountContextReadWrite("ONL-BOOT", self.logger) as d: self.copyfile(fit_image, os.path.join(d.directory, "%s.itb" % (self.platform.platform()))) - #self.reboot() + self.reboot() class Loader_Upgrade_x86_64(Loader_Upgrade): diff --git a/packages/base/all/vendor-config-onl/src/python/onl/upgrade/ubase.py b/packages/base/all/vendor-config-onl/src/python/onl/upgrade/ubase.py index 4c7784b7..b9653815 100644 --- a/packages/base/all/vendor-config-onl/src/python/onl/upgrade/ubase.py +++ b/packages/base/all/vendor-config-onl/src/python/onl/upgrade/ubase.py @@ -58,13 +58,17 @@ class BaseUpgrade(object): if os.getenv("DEBUG"): self.logger.setLevel(logging.DEBUG) + + def auto_upgrade_default(self): + return "advisory" + def init_argparser(self): self.ap = argparse.ArgumentParser("%s-upgrade" % self.name) self.ap.add_argument("--enable", action='store_true', help="Enable updates.") self.ap.add_argument("--force", action='store_true', help="Force update.") self.ap.add_argument("--no-reboot", action='store_true', help="Don't reboot.") self.ap.add_argument("--check", action='store_true', help="Check only.") - self.ap.add_argument("--auto-upgrade", help="Override auto-upgrade mode.", default='advisory') + self.ap.add_argument("--auto-upgrade", help="Override auto-upgrade mode.", default=self.auto_upgrade_default()) self.ap.add_argument("--summarize", action='store_true', help="Summarize only, no upgrades.") def banner(self):