TrueNAS/scale-build
1
0
Fork 0
mirror of https://github.com/truenas/scale-build.git synced 2026-02-15 07:29:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #208 from truenas/NAS-113918

Browse Source 
NAS-113918 / 22.02 / Do not crash on upgrading FreeBSD installations without `bootfs` prop…
This commit is contained in:
themylogin
2021-12-23 21:05:27 +01:00
committed by GitHub
parent 48f071cd89 bac46ad5e5
commit d5e235c37f
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
truenas_install/__main__.py
View File

@@ -356,7 +356,8 @@ def main():
# Set bootfs before running update-grub
run_command(["zpool", "set", f"bootfs={dataset_name}", pool_name])
if is_freebsd_upgrade:
run_command(["zfs", "set", "truenas:12=1", old_bootfs_prop])
if old_bootfs_prop != "-":
run_command(["zfs", "set", "truenas:12=1", old_bootfs_prop])
cp = run_command([f"{root}/usr/local/bin/truenas-initrd.py", root], check=False)
if cp.returncode > 1: