diff --git a/boottoolsfunctions.lib b/boottoolsfunctions.lib index 754ebad..76a1bae 100755 --- a/boottoolsfunctions.lib +++ b/boottoolsfunctions.lib @@ -107,16 +107,15 @@ case "${1,,}" in xenial-4.8) # ogLive 1.1.0-rc5 basado en Ubuntu 16.04 y Kernel 4.8. OSDISTRIB="ubuntu" OSCODENAME="xenial" - OSRELEASE="4.8.0-34-generic" - OSARCH="i386" + OSRELEASE="4.8.0-39-generic" + OSARCH="amd64" OSHTTP="http://es.archive.ubuntu.com/ubuntu/" ;; host) # ogLive basado en la distribución del servidor. OSDISTRIB=$(lsb_release -is) OSCODENAME=$(lsb_release -cs) - OSRELEASE=$(uname -a | awk '{print $3}') - #uname -a | grep x86_64 > /dev/null && OSARCH="amd64" || OSARCH="i386" - OSARCH="i386" + OSRELEASE=$(uname -r) + OSARCH=$(dpkg --print-architecture) export OSHTTP="http://es.archive.ubuntu.com/ubuntu/" ;; *) # Parámetro desconocido @@ -126,7 +125,7 @@ case "${1,,}" in esac SVNURL="http://opengnsys.es/svn/branches/version1.1/client" VERSIONSVN=$(LANG=C svn info $SVNURL | awk '/Rev:/ {print "r"$4}') -NAMEISOCLIENT="$VERSIONBOOTTOOLS-$OSCODENAME-$OSRELEASE-$VERSIONSVN" +NAMEISOCLIENT="$VERSIONBOOTTOOLS-$OSCODENAME-$OSRELEASE-$OSARCH-$VERSIONSVN" NAMEHOSTCLIENT="$VERSIONBOOTTOOLS-$OSCODENAME-$VERSIONSVN" export OSDISTRIB OSCODENAME OSRELEASE OSARCH OSHTTP export TYPECLIENT VERSIONSVN NAMEISOCLIENT NAMEHOSTCLIENT diff --git a/includes/etc/initramfs-tools/scripts/VERSION.txt b/includes/etc/initramfs-tools/scripts/VERSION.txt index 7d14ad2..7fd91a3 100644 --- a/includes/etc/initramfs-tools/scripts/VERSION.txt +++ b/includes/etc/initramfs-tools/scripts/VERSION.txt @@ -1 +1 @@ -OpenGnsys Client 1.1.0-rc4 +OpenGnsys Client 1.1.0-rc5 diff --git a/includes/usr/bin/boot-tools/boottoolsFsOpengnsys.sh b/includes/usr/bin/boot-tools/boottoolsFsOpengnsys.sh index b90cf9a..0e42a7e 100755 --- a/includes/usr/bin/boot-tools/boottoolsFsOpengnsys.sh +++ b/includes/usr/bin/boot-tools/boottoolsFsOpengnsys.sh @@ -15,10 +15,8 @@ OGCLIENTCFG=${OGCLIENTCFG:-/tmp/ogclient.cfg} [ -f $OGCLIENTCFG ] && source $OGCLIENTCFG OSDISTRIB=${OSDISTRIB:-$(lsb_release -is)} OSCODENAME=${OSCODENAME:-$(lsb_release -cs)} -OSRELEASE=${OSRELEASE:-$(uname -a | awk '{print $3}')} -if [ -z "$OSARCH" ]; then - uname -a | grep x86_64 > /dev/null && OSARCH="amd64" || OSARCH="i386" -fi +OSRELEASE=${OSRELEASE:-$(uname -r)} +OSARCH=${OSARCH:-$(dpkg --print-architecture)} OSHTTP=${OSHTTP:-"http://es.archive.ubuntu.com/ubuntu/"} echo "$OSDISTRIB:$OSCODENAME:$OSRELEASE:$OSARCH:$OSHTTP" diff --git a/includes/usr/bin/boot-tools/boottoolsSoftwareInstall.sh b/includes/usr/bin/boot-tools/boottoolsSoftwareInstall.sh index 40a524b..c2b92ce 100755 --- a/includes/usr/bin/boot-tools/boottoolsSoftwareInstall.sh +++ b/includes/usr/bin/boot-tools/boottoolsSoftwareInstall.sh @@ -14,8 +14,13 @@ ln -s /bin/true /sbin/initctl #apt-get update; apt-get install --no-install-recommends dbus; dbus-uuidgen > /var/lib/dbus/machine-id; dpkg-divert --local --rename --add /sbin/initctl; ln -s /bin/true /sbin/initctl #cp /tmp/sources.list /etc/apt/sources.list -#Limpiamos y actualizamos los repositorios apt +#Limpiamos y actualizamos los repositorios apt (incluir siempre paquetes de 32 bits) apt-get clean +OSARCH=${OSARCH:-$(dpkg --print-architecture)} +if [ "$OSARCH" != "i386" ]; then + dpkg --add-architecture i386 + PKGS32="lib32gcc1 lib32stdc++6 lib32z1" +fi apt-get update apt-get upgrade -y @@ -29,10 +34,7 @@ echo "/dev/sda1 / ext4 rw,errors=remount-ro 0 0" > /etc/mtab # Deteccion de la versión y kernel a usar OGCLIENTCFG=${OGCLIENTCFG:-/tmp/ogclient.cfg} [ -f $OGCLIENTCFG ] && source $OGCLIENTCFG -OSRELEASE=${OSRELEASE:-$(uname -a | awk '{print $3}')} -if [ -z "$OSARCH" ]; then - uname -a | grep x86_64 > /dev/null && OSARCH="amd64" || OSARCH="i386" -fi +OSRELEASE=${OSRELEASE:-$(uname -r)} # inicio de la instalacion if [ "$OSRELEASE" == "3.7.6-030706-generic" ]; then # Descargar e instalar Kernel 3.7. @@ -62,7 +64,7 @@ console-setup console-setup/fontsize-fb47 select 8x16 davfs2 davfs2/suid_file boolean false kexec-tools kexec-tools/load_kexec boolean true EOT -apt-get -y install sshfs console-data kexec-tools davfs2 +apt-get -y install sshfs console-data kexec-tools davfs2 $PKGS32 #comenzamos con la instalación de los paquetes a instalar. for group in `find /usr/bin/boot-tools/listpackages/ -name sw.*` @@ -71,9 +73,6 @@ do for package in ` awk /^install/'{print $2}' $group ` do echo -n $package - #ADV - #TEST - #apt-get -y --force-yes install --no-install-recommends $package &>/dev/null apt-get -y --force-yes install $package &>/dev/null RETVAL=$? if [ $RETVAL == 0 ] diff --git a/includes/usr/bin/boot-tools/listpackages/sw.compile b/includes/usr/bin/boot-tools/listpackages/sw.compile index 5cf4d8b..cc54747 100644 --- a/includes/usr/bin/boot-tools/listpackages/sw.compile +++ b/includes/usr/bin/boot-tools/listpackages/sw.compile @@ -2,6 +2,7 @@ install build-essential #install libattr* # Satura el tamaño del archivo en Ubuntu 15.04 install libattr1 install libattr1-dev +install uuid-dev install attr install make install m4