opengnsys
/
ogclone-engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refs #1630 fix bugs in ogGrubHidePartitions

pull/5/head
Natalia Serrano 2025-03-06 10:13:35 +01:00
parent 7e255b6c52
commit 41aa2c3a5f
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ogclient/lib/python3/BootLib.py
View File

@ -848,7 +848,7 @@ def ogBootLoaderHidePartitions (disk, par, datadisk=None, datapar=None):
#2:/dev/sda3 #2:/dev/sda3
awk_out = subprocess.run (f''' awk_out = subprocess.run (f'''
awk '/menuentry.*Windows/ {{gsub(/\\)"/, ""); gsub(/^.*dev/,""); print NR":/dev"$1}} ' {cfgfile} awk '/menuentry.*Windows/ {{gsub(/\\)"/, ""); gsub(/^.*dev/,""); print NR":/dev"$1}} ' {cfgfile}
''', shell=True, text=True).stdout ''', shell=True, text=True, capture_output=True).stdout
if awk_out: if awk_out:
winentry = awk_out.splitlines() winentry = awk_out.splitlines()
winentry.reverse() winentry.reverse()
@ -867,17 +867,17 @@ def ogBootLoaderHidePartitions (disk, par, datadisk=None, datapar=None):
for entry in winentry: for entry in winentry:
line, part = entry.split (':') line, part = entry.split (':')
# En cada entrada, oculto o muestro cada particion. # En cada entrada, oculto o muestro cada particion.
TEXT = '' text = ''
for parthidden in winpart: for parthidden in winpart:
# Muestro la particion de la entrada actual y la de datos. # Muestro la particion de la entrada actual y la de datos.
if parthidden == part or parthidden == partdata: if parthidden == part or parthidden == partdata:
HIDDEN = '-' hidden = '-'
else: else:
HIDDEN = '+' hidden = '+'
numdisk, numpart = DiskLib.ogDevToDisk (parthidden).split() numdisk, numpart = DiskLib.ogDevToDisk (parthidden).split()
numdisk = int (numdisk) numdisk = int (numdisk)
numpart = int (numpart) numpart = int (numpart)
TEXT = f'\tparttool (hd{numdisk-1},{parttabletype}{numpart}) hidden{hidden} \n{text}' text = f'\tparttool (hd{numdisk-1},{parttabletype}{numpart}) hidden{hidden} \n{text}'
subprocess.run (['sed', '-i', f'{line}a\\ {text}', cfgfile]) subprocess.run (['sed', '-i', f'{line}a\\ {text}', cfgfile])
# Activamos la particion que se inicia en todas las entradas de windows. # Activamos la particion que se inicia en todas las entradas de windows.
subprocess.run (['sed', '-i', '/chainloader/i\\\tparttool ${root} boot+', cfgfile]) subprocess.run (['sed', '-i', '/chainloader/i\\\tparttool ${root} boot+', cfgfile])