synit
/
pmbootstrap
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

install: move setup_timezone to its own function 

Some refactoring for the next commit

Signed-off-by: Pablo Correa Gómez <ablocorrea@hotmail.com>
Tested-by: Clayton Craft <clayton@craftyguy.net>
Reviewed-by: Oliver Smith <ollieparanoid@postmarketos.org>
Link: https://lists.sr.ht/~postmarketos/pmbootstrap-devel/%3C20230611150743.23310-2-ablocorrea@hotmail.com%3E
This commit is contained in:
Pablo Correa Gómez 2023-06-11 17:07:40 +02:00 committed by Oliver Smith
parent 374d7779e9
commit 36d5bcbd3d
No known key found for this signature in database
GPG Key ID: 5AE7F5513E0885CB
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pmb/install/_install.py
View File

@ -354,6 +354,20 @@ def setup_keymap(args):
logging.info("NOTE: No valid keymap specified for device")
def setup_timezone(args):
suffix = f"rootfs_{args.device}"
arch = args.deviceinfo["arch"]
alpine_conf = pmb.helpers.package.get(args, "alpine-conf", arch)
version = alpine_conf["version"].split("-r")[0]
setup_tz_cmd = ["setup-timezone"]
if not pmb.parse.version.check_string(version, ">=3.14.0"):
setup_tz_cmd += ["-z"]
setup_tz_cmd += [args.timezone]
pmb.chroot.root(args, setup_tz_cmd, suffix)
def setup_hostname(args):
"""
Set the hostname and update localhost address in /etc/hosts
@ -1021,14 +1035,7 @@ def create_device_rootfs(args, step, steps):
setup_keymap(args)
# Set timezone
arch = args.deviceinfo["arch"]
package = pmb.helpers.package.get(args, "alpine-conf", arch)
version = package["version"].split("-r")[0]
if not pmb.parse.version.check_string(version, ">=3.14.0"):
pmb.chroot.root(args, ["setup-timezone", "-z", args.timezone], suffix)
else:
pmb.chroot.root(args, ["setup-timezone", args.timezone], suffix)
setup_timezone(args)
# Set locale
if locale_is_set: