summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIrina Gómez <irinagomez@us.es>2019-09-27 11:13:44 +0200
committerIrina Gómez <irinagomez@us.es>2019-09-27 11:13:44 +0200
commitb4d8d51e8d966798782ccdb691ae05b9d680e622 (patch)
tree6dbe0d137bc2f52963b4a4fb96560bb11ca8e015
parent84954097c4bce5b4eb700546c7b5c98c6a86a747 (diff)
#802 #888 opengnsys_update.sh: The names of PXE templates for BIOS are changed for compatibility with UEFI computers.
-rw-r--r--admin/Database/ogAdmBD-1.1.1pre-1.1.1.sql2
-rwxr-xr-xinstaller/opengnsys_update.sh12
2 files changed, 13 insertions, 1 deletions
diff --git a/admin/Database/ogAdmBD-1.1.1pre-1.1.1.sql b/admin/Database/ogAdmBD-1.1.1pre-1.1.1.sql
index 2d54e3a9..759da7bd 100644
--- a/admin/Database/ogAdmBD-1.1.1pre-1.1.1.sql
+++ b/admin/Database/ogAdmBD-1.1.1pre-1.1.1.sql
@@ -28,3 +28,5 @@ DELIMITER ';'
CALL addcols();
DROP PROCEDURE addcols;
+# Cambio del nombre de las plantillas PXE para compatibilidad con UEFI.
+UPDATE ordenadores SET arranque='10' WHERE arranque='01';
diff --git a/installer/opengnsys_update.sh b/installer/opengnsys_update.sh
index 23d3e5ac..c0f5786f 100755
--- a/installer/opengnsys_update.sh
+++ b/installer/opengnsys_update.sh
@@ -772,12 +772,13 @@ function createDirs()
[ -d $dir ] && ln -fs $dir ${INSTALL_TARGET}/tftpboot
done
fi
- mkdir -p $INSTALL_TARGET/tftpboot/menu.lst/examples
+ mkdir -p $INSTALL_TARGET/tftpboot/{menu.lst,grub}/examples
if [ $? -ne 0 ]; then
errorAndLog "${FUNCNAME}(): error while creating dirs. Do you have write permissions?"
return 1
fi
! [ -f $INSTALL_TARGET/tftpboot/menu.lst/templates/00unknown ] && mv $INSTALL_TARGET/tftpboot/menu.lst/templates/* $INSTALL_TARGET/tftpboot/menu.lst/examples
+ ! [ -f $INSTALL_TARGET/tftpboot/grub/templates/10 ] && mv $INSTALL_TARGET/tftpboot/grub/templates/* $INSTALL_TARGET/tftpboot/grub/examples
# Preparar arranque en red con Grub.
for f in grub-mknetdir grub2-mknetdir; do
@@ -937,6 +938,15 @@ function updateServerFiles()
[ ! -f /etc/cron.d/imagedelete ] && echo "* * * * * root [ -x $INSTALL_TARGET/bin/deletepreimage ] && $INSTALL_TARGET/bin/deletepreimage" > /etc/cron.d/imagedelete
[ ! -f /etc/cron.d/ogagentqueue ] && echo "* * * * * root [ -x $INSTALL_TARGET/bin/ogagentqueue.cron ] && $INSTALL_TARGET/bin/ogagentqueue.cron" > /etc/cron.d/ogagentqueue
echoAndLog "${FUNCNAME}(): server files successfully updated"
+
+ # Se modifican los nombres de las plantilla PXE por compatibilidad con los equipos UEFI.
+ if [ -f $INSTALL_TARGET/tftpboot/menu.lst/templates/01 ]; then
+ BIOSPXEDIR="$INSTALL_TARGET/tftpboot/menu.lst/templates"
+ mv $BIOSPXEDIR/01 $BIOSPXEDIR/10
+ sed -i s/MBR/1hd/ $BIOSPXEDIR/10
+ sed -i s/1hd-1partition/1hd-1os/ $BIOSPXEDIR/11
+ sed -i s/1hd-2partition/1hd-2os/ $BIOSPXEDIR/12
+ fi
}
####################################################################