diff options
| author | Ramón M. Gómez <ramongomez@us.es> | 2019-09-04 13:41:53 +0200 |
|---|---|---|
| committer | Ramón M. Gómez <ramongomez@us.es> | 2019-09-04 13:41:53 +0200 |
| commit | d6b5bebb75c0aa4062d5ea6c15f6ac998e27a9a7 (patch) | |
| tree | ba47cb6f5685e7bc8fcbbb9e39ed32b205904bfc /client | |
| parent | 0deba6314348531e4f793289e4e7dfe5d84055fb (diff) | |
#922: ogLive with Kernel 5.0 installs Grub on BIOS computers.
Diffstat (limited to 'client')
4 files changed, 7 insertions, 6 deletions
diff --git a/client/boot-tools/boottoolsfunctions.lib b/client/boot-tools/boottoolsfunctions.lib index da9cca2c..3ad38d15 100755 --- a/client/boot-tools/boottoolsfunctions.lib +++ b/client/boot-tools/boottoolsfunctions.lib @@ -130,10 +130,10 @@ case "${1,,}" in OSARCH="amd64" OSHTTP="http://es.archive.ubuntu.com/ubuntu/" ;; - bionic-5.0) # ogLive 1.1.1-rc4 basado en Ubuntu 18.04 y Kernel 5.0. + bionic-5.0) # ogLive 1.1.1-rc5 basado en Ubuntu 18.04 y Kernel 5.0. OSDISTRIB="ubuntu" OSCODENAME="bionic" - OSRELEASE="5.0.0-15-generic" + OSRELEASE="5.0.0-27-generic" OSARCH="amd64" OSHTTP="http://es.archive.ubuntu.com/ubuntu/" ;; diff --git a/client/boot-tools/boottoolsgenerator.sh b/client/boot-tools/boottoolsgenerator.sh index fb749a7b..79646a4a 100755 --- a/client/boot-tools/boottoolsgenerator.sh +++ b/client/boot-tools/boottoolsgenerator.sh @@ -75,7 +75,7 @@ echo "FASE 5 - Incorporando ficheros OpenGnsys al sistema raíz rootfs " cp -a ${BTDIR}/includes/usr/bin/* /tmp chmod +x /tmp/boot-tools/*.sh # Incluir revisión. -sed -i "1 s/$/ $GITRELEASE/" ${BTDIR}/includes/etc/initramfs-tools/scripts/VERSION.txt +sed -i "1 s/$/ $GITRELEASE ($OSRELEASE)/" ${BTDIR}/includes/etc/initramfs-tools/scripts/VERSION.txt # En Ubuntu 13.04+ es necesario matar proceso de "udev" antes de desmontar. umount $BTROOTFSMNT 2>/dev/null || (kill -9 $(lsof -t $BTROOTFSMNT); umount $BTROOTFSMNT 2>/dev/null) schroot -p -c IMGogclient -- /tmp/boot-tools/boottoolsFsOpengnsys.sh diff --git a/client/boot-tools/includes/etc/initramfs-tools/scripts/VERSION.txt b/client/boot-tools/includes/etc/initramfs-tools/scripts/VERSION.txt index 2c8efadf..73b6a464 100644 --- a/client/boot-tools/includes/etc/initramfs-tools/scripts/VERSION.txt +++ b/client/boot-tools/includes/etc/initramfs-tools/scripts/VERSION.txt @@ -1 +1 @@ -OpenGnsys Client 1.1.1-rc4 +OpenGnsys Client 1.1.1-rc5 diff --git a/client/boot-tools/includes/usr/bin/boot-tools/listpackages/sw.testing b/client/boot-tools/includes/usr/bin/boot-tools/listpackages/sw.testing index eca18286..93012f4a 100644 --- a/client/boot-tools/includes/usr/bin/boot-tools/listpackages/sw.testing +++ b/client/boot-tools/includes/usr/bin/boot-tools/listpackages/sw.testing @@ -1,12 +1,14 @@ #sw.other install screen install schroot -#install grub install xmlstarlet ############# UEFI install efibootmgr install efitools install refind +install grub-efi-amd64-bin +install grub-efi-ia32-bin +install grub-pc-bin ############# OGAgent install libxss1 install python-prctl @@ -51,7 +53,6 @@ install laptop-detect #install nitrogen #install ttf-ubuntu-font-family #install time -#install openssh-client #install synaptic #install libglib-perl #install libgtk2-perl |