From fb707cef0b1ebf22b7001613203d58c9e36f951f Mon Sep 17 00:00:00 2001
From: Alejandro Sirgo Rica <asirgo@soleta.eu>
Date: Tue, 22 Oct 2024 13:41:45 +0200
Subject: grub: move get_grub_boot_params() into grub.py

Move get_grub_boot_params() into the file related to all the grub
configuration.
---
 src/utils/bios.py | 16 ----------------
 src/utils/boot.py |  1 +
 src/utils/grub.py | 18 ++++++++++++++++++
 3 files changed, 19 insertions(+), 16 deletions(-)

(limited to 'src/utils')

diff --git a/src/utils/bios.py b/src/utils/bios.py
index 916f7d4..6ed0b76 100644
--- a/src/utils/bios.py
+++ b/src/utils/bios.py
@@ -11,22 +11,6 @@ import os
 from src.log import OgError
 
 
-def get_grub_boot_params(mountpoint, device):
-    grub_conf = f'{mountpoint}/etc/default/grub'
-    res = []
-
-    with open(grub_conf, 'r') as f:
-        for line in f:
-            if line.find('=') == -1:
-                continue
-            key, value = line.split('=', 1)
-            if key == 'GRUB_CMDLINE_LINUX' or key == 'GRUB_CMDLINE_LINUX_DEFAULT':
-                value = value.replace('\n', '')
-                value = value.strip('"')
-                res.append(value)
-    res.append(f'root={device}')
-    return " ".join(res)
-
 def get_vmlinuz_path(mountpoint):
     linuz_dir = os.path.join(mountpoint, 'boot')
     target_file = None
diff --git a/src/utils/boot.py b/src/utils/boot.py
index 244f994..5e337a4 100644
--- a/src/utils/boot.py
+++ b/src/utils/boot.py
@@ -13,6 +13,7 @@ import subprocess
 
 from src.utils.probe import OSFamily, get_os_family, get_linux_distro_id, os_probe
 from src.utils.disk import get_partition_device, get_efi_partition
+from src.utils.grub import get_grub_boot_params
 from src.utils.bios import *
 from src.utils.uefi import *
 from src.utils.fs import *
diff --git a/src/utils/grub.py b/src/utils/grub.py
index ca7eb86..4b403db 100644
--- a/src/utils/grub.py
+++ b/src/utils/grub.py
@@ -110,6 +110,24 @@ class MenuEntry:
         entry_name = entry_name.replace('!', r'\!')
         return entry_name
 
+
+def get_grub_boot_params(mountpoint, device):
+    grub_conf = f'{mountpoint}/etc/default/grub'
+    res = []
+
+    with open(grub_conf, 'r') as f:
+        for line in f:
+            if line.find('=') == -1:
+                continue
+            key, value = line.split('=', 1)
+            if key == 'GRUB_CMDLINE_LINUX' or key == 'GRUB_CMDLINE_LINUX_DEFAULT':
+                value = value.replace('\n', '')
+                value = value.strip('"')
+                res.append(value)
+    res.append(f'root={device}')
+    return " ".join(res)
+
+
 def _get_linux_data(disk_num, part_num, mountpoint):
     os_entry = {}
     os_entry['name'] = f'{os_probe(mountpoint)} ({disk_num}, {part_num})'
-- 
cgit v1.2.3-18-g5258