diff options
| author | ramon <ramongomez@us.es> | 2014-10-30 08:42:07 +0000 |
|---|---|---|
| committer | ramon <ramongomez@us.es> | 2014-10-30 08:42:07 +0000 |
| commit | 98cd714cd54a429036ed020a2b827a8dbac94dfa (patch) | |
| tree | 270e9ebb1e49707c4d5ee02f372884938516949c | |
| parent | 3be02194708ad175e89c37395fa2bce7a0f7f734 (diff) | |
#615: Corregir erratas al crear cliente ogLive basado en Ubuntu 12.04.5 y posteriores:
* Evitar error al crear imagen ISO extrayendo el fichero {{{gpxe.iso}}}, en caso de ser necesario.
* Instalar separadamente el paquete {{{linux-image-extra}}}, para evitar errores de creación en caso de no existir dicho paquete.
* Sustituir paquete {{{zfs-fuse}}} por {{{ubuntu-zfs}}} (más actualizado).
git-svn-id: https://opengnsys.es/svn/branches/version1.0@4414 a21b9725-9963-47de-94b9-378ad31fedc9
3 files changed, 15 insertions, 4 deletions
diff --git a/client/boot-tools/boottoolsfunctions.lib b/client/boot-tools/boottoolsfunctions.lib index c9f9d2e1..936b02a7 100755 --- a/client/boot-tools/boottoolsfunctions.lib +++ b/client/boot-tools/boottoolsfunctions.lib @@ -366,8 +366,18 @@ function btogIsoGenerator { btogGetVar #Preparamos los gestores de arranque mkdir -p /tmp/iso/isolinux -cp -prv /usr/lib/syslinux/* /tmp/iso/isolinux/ -cp -prv /usr/share/gpxe/* /tmp/iso/isolinux/ +cp -av /usr/lib/syslinux/* /tmp/iso/isolinux/ +cp -av /usr/share/gpxe/* /tmp/iso/isolinux/ + +# Si existe isolinux/gpxe.iso, montarlo para extraer isolinux.bin. +if [ -f /tmp/iso/isolinux/gpxe.iso ]; then + mkdir -p /tmp/iso/isolinux/mount + mount -o loop /tmp/iso/isolinux/gpxe.iso /tmp/iso/isolinux/mount + cp -va /tmp/iso/isolinux/mount/* /tmp/iso/isolinux + umount /tmp/iso/isolinux/mount + rmdir /tmp/iso/isolinux/mount + rm -f /tmp/iso/isolinux/gpxe.iso +fi cat << FIN > /tmp/iso/isolinux/isolinux.cfg DEFAULT menu.c32 diff --git a/client/boot-tools/includes/usr/bin/boot-tools/boottoolsSoftwareInstall.sh b/client/boot-tools/includes/usr/bin/boot-tools/boottoolsSoftwareInstall.sh index 17437b56..70207cae 100755 --- a/client/boot-tools/includes/usr/bin/boot-tools/boottoolsSoftwareInstall.sh +++ b/client/boot-tools/includes/usr/bin/boot-tools/boottoolsSoftwareInstall.sh @@ -48,7 +48,8 @@ if [ "$OSRELEASE" == "3.7.6-030706-generic" ]; then rm -fr /tmp/kernel else # Instalar Kernel del repositorio de paquetes. - apt-get -y --force-yes install linux-image-${OSRELEASE} linux-image-extra-${OSRELEASE} linux-headers-${OSRELEASE} + apt-get -y --force-yes install linux-image-${OSRELEASE} linux-headers-${OSRELEASE} + apt-get -y --force-yes install linux-image-extra-${OSRELEASE} 2>/dev/null fi diff --git a/client/boot-tools/includes/usr/bin/boot-tools/listpackages/sw.filesystem.local b/client/boot-tools/includes/usr/bin/boot-tools/listpackages/sw.filesystem.local index e698d89e..ab9aca8b 100644 --- a/client/boot-tools/includes/usr/bin/boot-tools/listpackages/sw.filesystem.local +++ b/client/boot-tools/includes/usr/bin/boot-tools/listpackages/sw.filesystem.local @@ -22,7 +22,7 @@ install hfsutils install nilfs-tools install ufsutils install vmfs-tools -install zfs-fuse +install ubuntu-zfs # Solo en ogLive basado en Ubuntu 14.04 #install android-tools-adb #install android-tools-fastboot |