From c2839fa74221a60f6ffc0511c3711c424e730df7 Mon Sep 17 00:00:00 2001 From: ramon Date: Wed, 27 Feb 2013 13:59:03 +0000 Subject: [PATCH] =?UTF-8?q?#573:=20Proceso=20de=20instalaci=C3=B3n=20del?= =?UTF-8?q?=20Kernel=203.7.6=20durante=20la=20generaci=C3=B3n=20del=20clie?= =?UTF-8?q?nte=20basado=20en=20Ubuntu=2012.10.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://opengnsys.es/svn/branches/version1.0@3648 a21b9725-9963-47de-94b9-378ad31fedc9 --- boottoolsfunctions.lib | 12 +++++- .../boot-tools/boottoolsSoftwareInstall.sh | 43 +++++++++++++------ .../bin/boot-tools/listpackages/sw.Xwindow | 4 +- 3 files changed, 45 insertions(+), 14 deletions(-) diff --git a/boottoolsfunctions.lib b/boottoolsfunctions.lib index b08dbba..79eeff0 100755 --- a/boottoolsfunctions.lib +++ b/boottoolsfunctions.lib @@ -4,7 +4,7 @@ #@brief Librería o clase Boot-Tools #@class Boot-Tools #@brief Funciones para generar un sistema operativo cliente para opengnsys -#@version 0.9 +#@version 1.0.5 #@warning License: GNU GPLv3+ #*/ @@ -40,6 +40,9 @@ export VERSIONBOOTTOOLS="ogLive" #@version 1.0 - Compatibilidad OpengGnsys X. #@author Antonio J. Doblas Viso. Universidad de Malaga. #@date 2011/08/03 +#@version 1.0.5 - Fichero general de configuración, Kernel 3.7 para Ubuntu 12.10. +#@author Ramón Gómez, ETSII Univ. Sevilla +#@date 2013/02/06 function btogGetOsInfo () { OGCLIENTCFG=/tmp/ogclient.cfg @@ -58,6 +61,13 @@ case "${1,,}" in OSARCH="i386" OSHTTP="http://es.archive.ubuntu.com/ubuntu/" ;; + quantal) + OSDISTRIB="ubuntu" + OSCODENAME="quantal" + OSRELEASE="3.7.6-030706-generic" + OSARCH="i386" + OSHTTP="http://es.archive.ubuntu.com/ubuntu/" + ;; host | *) OSDISTRIB=$(lsb_release -is) OSCODENAME=$(lsb_release -cs) diff --git a/includes/usr/bin/boot-tools/boottoolsSoftwareInstall.sh b/includes/usr/bin/boot-tools/boottoolsSoftwareInstall.sh index 738c536..a6b555d 100755 --- a/includes/usr/bin/boot-tools/boottoolsSoftwareInstall.sh +++ b/includes/usr/bin/boot-tools/boottoolsSoftwareInstall.sh @@ -1,4 +1,6 @@ #!/bin/bash +# Script de instalación de paquetes de software. + export LANGUAGE=C export LC_ALL=C export LANG=C @@ -15,28 +17,44 @@ ln -s /bin/true /sbin/initctl #Limpiamos y actualizamos los repositorios apt apt-get clean apt-get update +apt-get upgrade -y #Desactivamos el hook del oginitrd.img para evitar problemas, al final de este escripts se activará mv /etc/initramfs-tools/hooks/oghooks /etc/initramfs-tools/ # Preparamos el mtab necesario para la instalacion correcta de paquetes. -echo " /dev/sda1 / ext4 rw,errors=remount-ro 0 0 " > /etc/mtab +echo "/dev/sda1 / ext4 rw,errors=remount-ro 0 0" > /etc/mtab - -#Instalamos el kernel. -#Deteccion de la versión y kernel a usar -export OSDISTRIB=$(lsb_release -i | awk -F: '{sub(/\t/,""); print $2}') 2>/dev/null -export OSCODENAME=$(cat /etc/lsb-release | grep CODENAME | awk -F= '{print $NF}') -export OSRELEASE=$(uname -a | awk '{print $3}') -uname -a | grep x86_64 > /dev/null && export OSARCH=amd64 || export OSARCH=i386 -export OSHTTP="http://es.archive.ubuntu.com/ubuntu/" +# Instalamos el kernel. +# 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 # inicio de la instalacion -apt-get -y --force-yes install linux-image-${OSRELEASE} linux-headers-${OSRELEASE} linux-image-$RELEASE +if [ "$OSRELEASE" == "3.7.6-030706-generic" ]; then + # Descargar e instalar Kernel 3.7. + mkdir -p /tmp/kernel + pushd /tmp/kernel + apt-get -y --force-yes install wget crda libnl-3-200 libnl-genl-3-200 wireless-regdb + wget http://kernel.ubuntu.com/~kernel-ppa/mainline/v3.7.6-raring/linux-image-3.7.6-030706-generic_3.7.6-030706.201302040006_$OSARCH.deb + wget http://kernel.ubuntu.com/~kernel-ppa/mainline/v3.7.6-raring/linux-image-extra-3.7.6-030706-generic_3.7.6-030706.201302040006_$OSARCH.deb + wget http://kernel.ubuntu.com/~kernel-ppa/mainline/v3.7.6-raring/linux-headers-3.7.6-030706-generic_3.7.6-030706.201302040006_$OSARCH.deb + wget http://kernel.ubuntu.com/~kernel-ppa/mainline/v3.7.6-raring/linux-headers-3.7.6-030706_3.7.6-030706.201302040006_all.deb + dpkg -i *.deb + popd + rm -fr /tmp/kernel +else + # Instalar Kernel del repositorio de paquetes. + apt-get -y --force-yes install linux-image-${OSRELEASE} linux-headers-${OSRELEASE} linux-image-$RELEASE +fi #Eliminamos cualquier busybox previo: antes del busybox -apt-get -y --force-yes remove busybox -apt-get -y --force-yes remove busybox-static +#apt-get -y --force-yes remove busybox +#apt-get -y --force-yes remove busybox-static #estos paquetes ofrecen interaccion. # si es actualización, ya existe el fichero /etc/ssh/ssh_config @@ -80,6 +98,7 @@ echo " " > /etc/mtab #localepurge #rm /var/lib/dbus/machine-id; rm /sbin/initctl; dpkg-divert --rename --remove /sbin/initctl; #FIN ADV + apt-get clean apt-get autoclean apt-get autoremove diff --git a/includes/usr/bin/boot-tools/listpackages/sw.Xwindow b/includes/usr/bin/boot-tools/listpackages/sw.Xwindow index 68ea963..35103d1 100644 --- a/includes/usr/bin/boot-tools/listpackages/sw.Xwindow +++ b/includes/usr/bin/boot-tools/listpackages/sw.Xwindow @@ -8,4 +8,6 @@ install roxterm install gparted #xvesa en compilacion install openbox -install midori \ No newline at end of file +install midori +# VESA Kernel 3.7 +install v86d