summaryrefslogtreecommitdiffstats
path: root/client
diff options
context:
space:
mode:
authorIrina Gómez <irinagomez@us.es>2019-03-26 10:36:36 +0100
committerIrina Gómez <irinagomez@us.es>2019-03-26 10:36:36 +0100
commit5fd45d159c150abfd1c878f613a43ab9d1cbe610 (patch)
tree19c41fc57683babeedd90fa80bfd4edbb52c4370 /client
parent2ab002c258a3b773efbc74aacccbabd3d3f3e6aa (diff)
#802 #889 #890 Fix UEFI postconf: configureOs does not use ogFixBootSector for Windows. ogGrubInstall does not change boot order in NVRAM.
Diffstat (limited to 'client')
-rwxr-xr-xclient/engine/Boot.lib4
-rwxr-xr-xclient/shared/scripts/configureOs2
2 files changed, 2 insertions, 4 deletions
diff --git a/client/engine/Boot.lib b/client/engine/Boot.lib
index 280d4351..61e90afe 100755
--- a/client/engine/Boot.lib
+++ b/client/engine/Boot.lib
@@ -850,7 +850,7 @@ if ogIsEfiActive; then
# Borramos la configuración anterior
[ -d ${EFISECONDSTAGE}/EFI/$EFISUBDIR ] && rm -rf ${EFISECONDSTAGE}/EFI/$EFISUBDIR
mkdir -p ${EFISECONDSTAGE}/EFI/$EFISUBDIR/Boot
- EFIOPTGRUB=" --target x86_64-efi --efi-directory=${EFISECONDSTAGE}/EFI/$EFISUBDIR "
+ EFIOPTGRUB=" --no-nvram --target x86_64-efi --efi-directory=${EFISECONDSTAGE}/EFI/$EFISUBDIR "
else
EFIOPTGRUB=""
fi
@@ -995,7 +995,7 @@ if ogIsEfiActive; then
# Borramos la configuración anterior
[ -d ${EFISECONDSTAGE}/EFI/$EFISUBDIR ] && rm -rf ${EFISECONDSTAGE}/EFI/$EFISUBDIR
mkdir -p ${EFISECONDSTAGE}/EFI/$EFISUBDIR/Boot
- EFIOPTGRUB=" --target x86_64-efi --efi-directory=${EFISECONDSTAGE}/EFI/$EFISUBDIR "
+ EFIOPTGRUB=" --no-nvram --target x86_64-efi --efi-directory=${EFISECONDSTAGE}/EFI/$EFISUBDIR "
else
EFIOPTGRUB=""
fi
diff --git a/client/shared/scripts/configureOs b/client/shared/scripts/configureOs
index 388cc0f6..1ecf8ac9 100755
--- a/client/shared/scripts/configureOs
+++ b/client/shared/scripts/configureOs
@@ -73,8 +73,6 @@ case "$OSTYPE" in
# Si es UEFI copio el cargador de arranque a la partición EFI
if ogIsEfiActive; then
ogRestoreEfiBootLoader $1 $2
- # Configurar el boot sector de la partición Windows.
- ogFixBootSector $(ogGetEsp)
else
# Configurar el boot sector de la partición Windows.
ogFixBootSector $1 $2