Administration/pmbootstrap-meow
2
0
Fork 0
forked from Mirror/pmbootstrap
Code Pull requests Activity Actions

pmb.netboot: Use NonBugError for nonexistent rootfs code path (MR 2540)

Browse source 
We fully expect to reach this code path within normal use of
pmbootstrap. It's not a bug if we get here. As such, use NonBugError to
indicate that and clean up the output.
This commit is contained in:
Newbyte 2025-01-28 12:03:45 +01:00 • committed by Oliver Smith
parent d01f6b9079
commit 3ef25e1467
No known key found for this signature in database
GPG key ID: 5AE7F5513E0885CB
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
pmb/netboot/__init__.py
View file

@ -2,6 +2,7 @@
# SPDX-License-Identifier: GPL-3.0-or-later # SPDX-License-Identifier: GPL-3.0-or-later
from pmb.core.context import get_context from pmb.core.context import get_context
from pmb.helpers import logging from pmb.helpers import logging
from pmb.helpers.exceptions import NonBugError
from pathlib import Path from pathlib import Path
import socket import socket
import time import time
@ -24,7 +25,7 @@ def start_nbd_server(device: str, replace: bool, ip: str = "172.16.42.2", port:
if not (chroot / rootfs_path).exists() or replace: if not (chroot / rootfs_path).exists() or replace:
rootfs_path2 = Path("/home/pmos/rootfs") / f"{device}.img" rootfs_path2 = Path("/home/pmos/rootfs") / f"{device}.img"
if not (chroot / rootfs_path2).exists(): if not (chroot / rootfs_path2).exists():
raise RuntimeError( raise NonBugError(
"The rootfs has not been generated yet, please run 'pmbootstrap install' first." "The rootfs has not been generated yet, please run 'pmbootstrap install' first."
) )
if replace and not pmb.helpers.cli.confirm( if replace and not pmb.helpers.cli.confirm(