diff options
| author | Irina Gómez <irinagomez@us.es> | 2019-09-20 09:03:39 +0200 |
|---|---|---|
| committer | Irina Gómez <irinagomez@us.es> | 2019-09-20 09:03:39 +0200 |
| commit | 8b5283a81fda4ef27f9bfeafced21be658529196 (patch) | |
| tree | 34ede5b51dbd01c8efbc56ff433750871e1baa6d /client/engine/Boot.lib | |
| parent | 438afb231609894f391f9d42a8a4cee1ab068496 (diff) | |
#922 Fixing code cleanup: the^CgLiveAdapter.lib content is located in ogGrubInstall.
Diffstat (limited to 'client/engine/Boot.lib')
| -rwxr-xr-x | client/engine/Boot.lib | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/client/engine/Boot.lib b/client/engine/Boot.lib index 473f60b3..6808f094 100755 --- a/client/engine/Boot.lib +++ b/client/engine/Boot.lib @@ -870,7 +870,10 @@ else mkdir -p ${SECONDSTAGE}${PREFIXSECONDSTAGE}/boot/grub/ #Preparar configuración segunda etapa: crear cabecera del fichero (ignorar errores) sed -i 's/^set -e/#set -e/' /etc/grub.d/00_header + # (ogLive 5.0) Si 'pkgdatadir' está vacía ponemos valor de otros ogLive + sed -i '/grub-mkconfig_lib/i\pkgdatadir=${pkgdatadir:-"${datarootdir}/grub"}' /etc/grub.d/00_header /etc/grub.d/00_header > ${SECONDSTAGE}${PREFIXSECONDSTAGE}/boot/grub/grub.cfg 2>/dev/null + #Preparar configuración segunda etapa: crear entrada del sistema operativo grubSyntax "$KERNELPARAM" >> ${SECONDSTAGE}${PREFIXSECONDSTAGE}/boot/grub/grub.cfg @@ -1008,6 +1011,8 @@ else mkdir -p ${SECONDSTAGE}${PREFIXSECONDSTAGE}/boot/grub/ #Preparar configuración segunda etapa: crear cabecera del fichero (ingnorar errores) sed -i 's/^set -e/#set -e/' /etc/grub.d/00_header + # (ogLive 5.0) Si 'pkgdatadir' está vacía ponemos valor de otros ogLive + sed -i '/grub-mkconfig_lib/i\pkgdatadir=${pkgdatadir:-"${datarootdir}/grub"}' /etc/grub.d/00_header /etc/grub.d/00_header > ${SECONDSTAGE}${PREFIXSECONDSTAGE}/boot/grub/grub.cfg 2>/dev/null #Preparar configuración segunda etapa: crear entrada del sistema operativo grubSyntax $DISK $PART "$KERNELPARAM" >> ${SECONDSTAGE}${PREFIXSECONDSTAGE}/boot/grub/grub.cfg |