X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/waydroid.git/blobdiff_plain/eebdcec852186e21a4c44ab383380e3a0453464a..343cefea4e30de2f2c3a87054c105f5443602388:/tools/actions/initializer.py diff --git a/tools/actions/initializer.py b/tools/actions/initializer.py index 4a80bb9..158f6bc 100644 --- a/tools/actions/initializer.py +++ b/tools/actions/initializer.py @@ -5,6 +5,8 @@ import os from tools import helpers import tools.config +def is_initialized(args): + return os.path.isfile(args.config) and os.path.isdir(tools.config.defaults["rootfs"]) def get_vendor_type(args): vndk_str = helpers.props.host_get(args, "ro.vndk.version") @@ -71,6 +73,11 @@ def setup_config(args): args.vendor_ota = "None" args.vendor_type = get_vendor_type(args) + if args.system_ota != cfg["waydroid"].get("system_ota"): + cfg["waydroid"]["system_datetime"] = tools.config.defaults["system_datetime"] + if args.vendor_ota != cfg["waydroid"].get("vendor_ota"): + cfg["waydroid"]["vendor_datetime"] = tools.config.defaults["vendor_datetime"] + cfg["waydroid"]["vendor_type"] = args.vendor_type cfg["waydroid"]["system_ota"] = args.system_ota cfg["waydroid"]["vendor_ota"] = args.vendor_ota @@ -81,7 +88,7 @@ def setup_config(args): tools.config.save(args, cfg) def init(args): - if not os.path.isfile(args.config) or not os.path.isdir(tools.config.defaults["rootfs"]) or args.force: + if not is_initialized(args) or args.force: setup_config(args) status = "STOPPED" if os.path.exists(tools.config.defaults["lxc"] + "/waydroid"): @@ -101,5 +108,7 @@ def init(args): logging.info("Starting container") helpers.images.mount_rootfs(args, args.images_path) helpers.lxc.start(args) + + helpers.ipc.notify(channel="init", msg="done") else: logging.info("Already initialized")