diff options
| author | Irina Gómez <irinagomez@us.es> | 2019-10-21 13:38:19 +0200 |
|---|---|---|
| committer | Irina Gómez <irinagomez@us.es> | 2019-10-21 13:38:19 +0200 |
| commit | dd890f1f3973c74f8205c673984fbbd3404f8c7c (patch) | |
| tree | 66fa5a661d4b0f9b2b9b73bb13682ff024ea69c8 /client/engine | |
| parent | 86795cf27c0a8588b0906e3f0d37b1a963f807ce (diff) | |
#802 #890 Linux boot: PXE and rEFInd use grubx64.efi (it's copied as ogloader.efi). NVRAM, bootOs and start operating system from console use shimx64.efi.signed.
Diffstat (limited to 'client/engine')
| -rwxr-xr-x | client/engine/Boot.lib | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/client/engine/Boot.lib b/client/engine/Boot.lib index 23bd5659..e6a07bc5 100755 --- a/client/engine/Boot.lib +++ b/client/engine/Boot.lib @@ -890,9 +890,9 @@ EVAL=$? if ogIsEfiActive; then mv ${EFISECONDSTAGE}/EFI/$EFISUBDIR/EFI/BOOT/* ${EFISECONDSTAGE}/EFI/$EFISUBDIR/Boot rm -rf ${EFISECONDSTAGE}/EFI/$EFISUBDIR/EFI - cp /usr/lib/shim/shimx64.efi.signed ${EFISECONDSTAGE}/EFI/$EFISUBDIR/Boot + cp /usr/lib/shim/shimx64.efi.signed ${EFISECONDSTAGE}/EFI/$EFISUBDIR/Boot/shimx64.efi # Nombre OpenGnsys para cargador - cp ${EFISECONDSTAGE}/EFI/$EFISUBDIR/Boot/{shimx64.efi.signed,ogloader.efi} + cp ${EFISECONDSTAGE}/EFI/$EFISUBDIR/Boot/{grubx64.efi,ogloader.efi} fi return $EVAL @@ -1028,7 +1028,7 @@ if ogIsEfiActive; then rm -rf ${EFISECONDSTAGE}/EFI/$EFISUBDIR/EFI cp /usr/lib/shim/shimx64.efi.signed ${EFISECONDSTAGE}/EFI/$EFISUBDIR/Boot/shimx64.efi # Nombre OpenGnsys para cargador - cp ${EFISECONDSTAGE}/EFI/$EFISUBDIR/Boot/{shimx64.efi,ogloader.efi} + cp ${EFISECONDSTAGE}/EFI/$EFISUBDIR/Boot/{grubx64.efi,ogloader.efi} fi return $EVAL @@ -2771,13 +2771,9 @@ else # Configuración para sistemas restaurados con OpenGnsys for DIR in $(ls -d /mnt/sda1/EFI/Part-*-* 2>/dev/null); do echo "menuentry \"${DIR##*/}\" {" >> $CFGFILE - if [ -f $DIR/Boot/grubx64.efi ]; then - echo " loader /EFI/${DIR##*/}/Boot/grubx64.efi" >> $CFGFILE - echo " icon /EFI/refind/icons/os_linux.png" >> $CFGFILE - else - echo " loader /EFI/${DIR##*/}/Boot/ogloader.efi" >> $CFGFILE - [ -f $DIR/Boot/bootmgfw.efi ] && echo " icon /EFI/refind/icons/os_win8.png" >> $CFGFILE - fi + echo " loader /EFI/${DIR##*/}/Boot/ogloader.efi" >> $CFGFILE + [ -f $DIR/Boot/bootmgfw.efi ] && echo " icon /EFI/refind/icons/os_win8.png" >> $CFGFILE + [ -f $DIR/Boot/grubx64.efi ] && echo " icon /EFI/refind/icons/os_linux.png" >> $CFGFILE echo "}" >> $CFGFILE done # Configuración ogLive si secureboot no está activado |