summaryrefslogtreecommitdiffstats
path: root/src/utils
diff options
context:
space:
mode:
authorOpenGnSys Support Team <soporte-og@soleta.eu>2024-05-09 11:44:43 +0200
committerOpenGnSys Support Team <soporte-og@soleta.eu>2024-05-09 11:47:06 +0200
commitd109e99dbed453f2eb535e381ef807289f1040ac (patch)
tree5ab05ade7b0b479079c44f1dbaef061667e0f58b /src/utils
parent6bfbf6cc7b8b5425eb8922769755a6c1cc2fb376 (diff)
utils: rename cache_probe() to get_cache_dev_path()
This method reports the /dev path to cache partition, rename it. Add explicit check if blkid is successful. And add logging to report that device path to cache is not found.
Diffstat (limited to 'src/utils')
-rw-r--r--src/utils/cache.py4
-rw-r--r--src/utils/probe.py11
2 files changed, 9 insertions, 6 deletions
diff --git a/src/utils/cache.py b/src/utils/cache.py
index afdc75a..b60b5be 100644
--- a/src/utils/cache.py
+++ b/src/utils/cache.py
@@ -11,7 +11,7 @@ import os
from src.utils.fs import mount_mkdir, umount
from src.utils.net import getifaddr
-from src.utils.probe import cache_probe
+from src.utils.probe import get_cache_dev_path
OGIMG='/opt/opengnsys/images/'
OGCACHE_MOUNTPOINT='/opt/opengnsys/cache'
@@ -23,7 +23,7 @@ def mount_cache():
Returns the mountpoint or an empty string.
"""
- cache_dev = cache_probe()
+ cache_dev = get_cache_dev_path()
if cache_dev:
# cache_target = cache_dev.replace('dev', 'mnt')
diff --git a/src/utils/probe.py b/src/utils/probe.py
index 8c0e39a..b2ed5de 100644
--- a/src/utils/probe.py
+++ b/src/utils/probe.py
@@ -135,14 +135,17 @@ def get_linux_distro_id(mountpoint):
logging.error(f'os-release file not found at "{osrelease}"')
return 'linux'
-def cache_probe():
+def get_cache_dev_path():
"""
- Runs 'blkid -L CACHE' and returns stripped stdout
+ Runs 'blkid -L CACHE' and returns stripped path to device, eg. /dev/sda3
"""
proc_blkid = subprocess.run(['blkid', '-L', 'CACHE'],
stdout=subprocess.PIPE)
- stdout = proc_blkid.stdout.decode().strip()
- return stdout
+ if proc_blkid.returncode != 0:
+ logging.error('Cannot find device path to cache')
+ return ''
+
+ return proc_blkid.stdout.decode().strip()
def get_os_family(mountpoint):