diff options
| -rw-r--r-- | python/vyos/system/disk.py | 2 | ||||
| -rw-r--r-- | python/vyos/utils/process.py | 2 | ||||
| -rw-r--r-- | smoketest/scripts/cli/base_interfaces_test.py | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/python/vyos/system/disk.py b/python/vyos/system/disk.py index b8a2c0f35..7860d719f 100644 --- a/python/vyos/system/disk.py +++ b/python/vyos/system/disk.py @@ -78,7 +78,7 @@ def parttable_create(drive_path: str, root_size: int) -> None: run(command) # update partitons in kernel sync() - run(f'partprobe {drive_path}') + run(f'partx -u {drive_path}') partitions: list[str] = partition_list(drive_path) diff --git a/python/vyos/utils/process.py b/python/vyos/utils/process.py index cd58b4be2..bd0644bc0 100644 --- a/python/vyos/utils/process.py +++ b/python/vyos/utils/process.py @@ -204,7 +204,7 @@ def process_running(pid_file): pid = f.read().strip() return pid_exists(int(pid)) -def process_named_running(name, cmdline: str=None, timeout=0): +def process_named_running(name: str, cmdline: str=None, timeout: int=0): """ Checks if process with given name is running and returns its PID. If Process is not running, return None """ diff --git a/smoketest/scripts/cli/base_interfaces_test.py b/smoketest/scripts/cli/base_interfaces_test.py index 7219fe622..a40b762a8 100644 --- a/smoketest/scripts/cli/base_interfaces_test.py +++ b/smoketest/scripts/cli/base_interfaces_test.py @@ -127,9 +127,9 @@ class BasicInterfaceTest: # by also checking the cmd arguments passed to the daemon if self._interfaces: for tmp in self._interfaces: - self.assertFalse(process_named_running(daemon, tmp, timeout=10)) + self.assertFalse(process_named_running(daemon, tmp)) else: - self.assertFalse(process_named_running(daemon, timeout=10)) + self.assertFalse(process_named_running(daemon)) def test_dhcp_disable_interface(self): if not self._test_dhcp: |