Fix generated json for manual partitioning

crystal-linux · Sep 10, 2022 · a99a1c0 · a99a1c0
1 parent 6cb5ee1
commit a99a1c0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/classes/partition.py b/src/classes/partition.py
@@ -25,6 +25,6 @@ def __init__(self, partition, mountpoint, filesystem, size):
         self.size = size
 
     def generate_jade_entry(self):
-        return self.mountpoint+":"+self.partition[5:]+":"+self.filesystem
+        return "/mnt"+self.mountpoint+":/dev/"+self.partition[5:]+":"+self.filesystem
 
 
diff --git a/src/utils/disks.py b/src/utils/disks.py
@@ -48,8 +48,9 @@ def get_disk_size(disk: str):
     return str(math.floor(int(size)/1000**3))+" GB"
 
 def get_uefi():
-    output = CommandUtils.check_output(['-d', '/sys/firmware/efi'])
-    return "BIOS" if output == "0" else "UEFI"
+    command=subprocess.run(["bash", "-c", "bash -- /app/share/jade-gui/jade_gui/scripts/checkEFI.sh"], capture_output=True)
+    isEfi=True if command.stdout.decode('utf-8').strip('\n') == "UEFI" else False
+    return isEfi
 
 def get_disk_type(disk: str):
     output = CommandUtils.check_output(['lsblk', '-d', '-o', 'rota', disk])