mirror of
https://github.com/truenas/scale-build.git
synced 2026-02-15 07:29:12 +00:00
Merge pull request #244 from truenas/NAS-115041
NAS-115041 / 22.12 / Proper way of obtaining /dev in chroot
This commit is contained in:
@@ -1,6 +1,5 @@
|
||||
# -*- coding=utf-8 -*-
|
||||
import contextlib
|
||||
import glob
|
||||
import itertools
|
||||
import json
|
||||
import logging
|
||||
@@ -384,6 +383,9 @@ def main():
|
||||
|
||||
undo = []
|
||||
try:
|
||||
run_command(["mount", "-t", "devtmpfs", "udev", f"{root}/dev"])
|
||||
undo.append(["umount", f"{root}/dev"])
|
||||
|
||||
run_command(["mount", "-t", "proc", "none", f"{root}/proc"])
|
||||
undo.append(["umount", f"{root}/proc"])
|
||||
|
||||
@@ -393,11 +395,6 @@ def main():
|
||||
run_command(["mount", "-t", "zfs", f"{pool_name}/grub", f"{root}/boot/grub"])
|
||||
undo.append(["umount", f"{root}/boot/grub"])
|
||||
|
||||
for device in sum([glob.glob(f"/dev/{disk}*") for disk in disks], []) + ["/dev/zfs"]:
|
||||
run_command(["touch", f"{root}{device}"])
|
||||
run_command(["mount", "-o", "bind", device, f"{root}{device}"])
|
||||
undo.append(["umount", f"{root}{device}"])
|
||||
|
||||
# Set bootfs before running update-grub
|
||||
run_command(["zpool", "set", f"bootfs={dataset_name}", pool_name])
|
||||
if is_freebsd_upgrade:
|
||||
|
||||
Reference in New Issue
Block a user