Skip to content

Commit

Permalink
Restore progress reporting accidentally removed by e29b5d5
Browse files Browse the repository at this point in the history
  • Loading branch information
themylogin committed Nov 22, 2023
1 parent 70a3c68 commit f1a5547
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion truenas_install/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
CORE_BSD_LOADER_PATH = "/boot/efi/efi/boot/BOOTx64.efi"
SCALE_BSD_LOADER_PATH = "/boot/efi/efi/boot/FreeBSD.efi"

RE_UNSQUASHFS_PROGRESS = re.compile(r"\[.+\]\s+(?P<extracted>[0-9]+)/(?P<total>[0-9]+)\s+(?P<progress>[0-9]+)%")
RE_UNSQUASHFS_PROGRESS = re.compile(r"\[.+]\s+(?P<extracted>[0-9]+)/(?P<total>[0-9]+)\s+(?P<progress>[0-9]+)%")
run_kw = dict(check=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE, encoding="utf-8", errors="ignore")

IS_FREEBSD = platform.system().upper() == "FREEBSD"
Expand Down Expand Up @@ -597,6 +597,7 @@ def main():
if old_bootfs_prop != "-":
run_command(["zfs", "set", "truenas:12=1", old_bootfs_prop])

write_progress(0.6, "Preparing initramfs configuration")
cp = run_command([f"{root}/usr/local/bin/truenas-initrd.py", root], check=False)
if cp.returncode > 1:
raise subprocess.CalledProcessError(
Expand Down

0 comments on commit f1a5547

Please sign in to comment.