diff options
| author | John Estabrook <jestabro@vyos.io> | 2023-09-20 14:53:24 -0500 |
|---|---|---|
| committer | John Estabrook <jestabro@vyos.io> | 2023-12-16 20:37:10 -0600 |
| commit | c3d2e02898259190d107127d867f9e16a2b84f1f (patch) | |
| tree | 3bfe781056ccd8797fe465a5d123946760d8091e | |
| parent | a8f1ba3bb19de99f825525d3de98ec022c38d832 (diff) | |
| download | vyos-1x-c3d2e02898259190d107127d867f9e16a2b84f1f.tar.gz vyos-1x-c3d2e02898259190d107127d867f9e16a2b84f1f.zip | |
image: T5195: vyos.util -> vyos.utils package refactoring
(cherry picked from commit fcded7930b5426193e8490c6df2a70e300a60e31)
| -rw-r--r-- | python/vyos/system/disk.py | 2 | ||||
| -rw-r--r-- | python/vyos/system/grub.py | 2 | ||||
| -rwxr-xr-x | src/op_mode/image_installer.py | 2 | ||||
| -rwxr-xr-x | src/op_mode/image_manager.py | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/python/vyos/system/disk.py b/python/vyos/system/disk.py index e20cf32be..b78190c06 100644 --- a/python/vyos/system/disk.py +++ b/python/vyos/system/disk.py @@ -18,7 +18,7 @@ from os import sync from psutil import disk_partitions -from vyos.util import run, cmd +from vyos.utils.process import run, cmd def disk_cleanup(drive_path: str) -> None: diff --git a/python/vyos/system/grub.py b/python/vyos/system/grub.py index 11c214675..47c674de8 100644 --- a/python/vyos/system/grub.py +++ b/python/vyos/system/grub.py @@ -19,7 +19,7 @@ from typing import Union from uuid import uuid5, NAMESPACE_URL, UUID from vyos.template import render -from vyos.util import run, cmd +from vyos.utils.process import run, cmd from vyos.system import disk # Define variables diff --git a/src/op_mode/image_installer.py b/src/op_mode/image_installer.py index 972faef8c..12d32968c 100755 --- a/src/op_mode/image_installer.py +++ b/src/op_mode/image_installer.py @@ -32,7 +32,7 @@ from vyos.system import disk, grub, image from vyos.template import render from vyos.utils.io import ask_input, ask_yes_no from vyos.utils.file import chmod_2775 -from vyos.util import run +from vyos.utils.process import run # define text messages MSG_ERR_NOT_LIVE: str = 'The system is already installed. Please use "add system image" instead.' diff --git a/src/op_mode/image_manager.py b/src/op_mode/image_manager.py index ac889da38..76fc4367f 100755 --- a/src/op_mode/image_manager.py +++ b/src/op_mode/image_manager.py @@ -23,7 +23,7 @@ from shutil import rmtree from sys import exit from vyos.system import disk, grub, image -from vyos.util import ask_yes_no +from vyos.utils.io import ask_yes_no def delete_image(image_name: str) -> None: |