opengnsys
/
oglive-builder
2
1
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Versión 1.0.5, #562: Instalador guarda el registro de instalación en el directorio {{{log}}} de OpenGnSys. 

git-svn-id: https://opengnsys.es/svn/branches/version1.0@3501 a21b9725-9963-47de-94b9-378ad31fedc9
remotes/github/master
ramon 2013-01-29 09:43:58 +00:00
parent 24b0c7d139
commit 0d9557fe39
6 changed files with 90 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
INSTALL.es.txt
View File

@ -30,6 +30,19 @@ find /tmp/opengnsys_installer/ -name .svn -type d -exec rm -fr {} \; 2>/dev/null
#2. Ejecutar el instalador: #2. Ejecutar el instalador:
/tmp/opengnsys_installer/opengnsys/client/boot-tools/boottoolsgenerator.sh; /tmp/opengnsys_installer/opengnsys/client/boot-tools/boottoolsgenerator.sh;
Notas para ejecución del instalador en Ubuntu 12.10:
- Configuración openssh-client:
- *** ssh_config (Y/I/N/O/D/Z) [default=N] ? [intro]
- Mapa de caracteres:
- Pantalla "Configuring console-data": elegir "Select keymap from full list"
- Keymap: pc / qwerty / Spanish / Standard / Standard
- Clave publica del servidor
- verwrite (y/n)? [intro]
- Mapa de caracteres (repetición):
- Pantalla "Configuring console-data":
- Select keymap from full list
- pc / qwerty / Spanish / Standard / Standard, UTF-8, Combined - Latin; Slavic Cyrillic; Greek, Fixed, 16
@ -47,3 +60,4 @@ NOTA:
boottollsfuncions.lib -> btogSetfsBase boottollsfuncions.lib -> btogSetfsBase
bootsoftwareinstall -> bootsoftwareinstall ->
packages ->sw.testing packages ->sw.testing

7
boottoolsfunctions.lib
View File

@ -58,6 +58,13 @@ case "${1,,}" in
OSARCH="i386" OSARCH="i386"
OSHTTP="http://es.archive.ubuntu.com/ubuntu/" OSHTTP="http://es.archive.ubuntu.com/ubuntu/"
;; ;;
quantal)
OSDISTRIB="ubuntu"
OSCODENAME="quantal"
OSRELEASE="3.7.3-030703-generic"
uname -a | grep x86_64 > /dev/null && OSARCH="amd64" || OSARCH="i386"
OSHTTP="http://es.archive.ubuntu.com/ubuntu/"
;;
host | *) host | *)
OSDISTRIB=$(lsb_release -is) OSDISTRIB=$(lsb_release -is)
OSCODENAME=$(lsb_release -cs) OSCODENAME=$(lsb_release -cs)

13
includes/etc/initramfs-tools/modules
View File

@ -8,7 +8,12 @@
# #
# raid1 # raid1
# sd_mod # sd_mod
vga16b # Kernel 3.2 video.
vesafb #vga16b
fbcon #vesafb
#fbcon
# Kernel 3.7 video.
uvesafb
# Kernel 3.7 meta-devices.
dm-raid
dm-multipath

58
includes/etc/initramfs-tools/scripts/ogfunctions
View File

@ -160,9 +160,10 @@ ogPostConfigureFS()
#####echo "nameserver $ogdns" > /etc/resolv.conf #####echo "nameserver $ogdns" > /etc/resolv.conf
#configuramos el dns posterior ubuntu 12.04 #configuramos el dns posterior ubuntu 12.04
#####echo "nameserver $ogdns" > /etc/resolvconf/resolv.conf.d/tail #####echo "nameserver $ogdns" > /etc/resolvconf/resolv.conf.d/tail
[ -n "${ogdns}" ] && mkdir -p /run/resolvconf if [ -n "${ogdns}" ]; then
[ -n "${ogdns}" ] && touch /run/resolvconf/resolv.conf mkdir -p /run/resolvconf
[ -n "${ogdns}" ] && echo "nameserver $ogdns" > /run/resolvconf/resolv.conf echo "nameserver $ogdns" > /run/resolvconf/resolv.conf
fi
#configuramos el uso del servicio http proxy #configuramos el uso del servicio http proxy
[ -n "${ogproxy}" ] && export http_proxy="$ogproxy" [ -n "${ogproxy}" ] && export http_proxy="$ogproxy"
@ -495,20 +496,20 @@ else
#echo "variable BOOTIF no exportada, intentamos detectar que interfaz se ha iniciado" #echo "variable BOOTIF no exportada, intentamos detectar que interfaz se ha iniciado"
IP=$ip IP=$ip
#TODO Detectar que interfaz se ha iniciado #TODO Detectar que interfaz se ha iniciado
case ${IP} in case "$IP" in
none|off) none|off)
return 0 return 0
;; ;;
""|on|any) ""|on|any)
# Bring up device # Bring up device
DEVICE=eth0 DEVICE=eth0
;; ;;
dhcp|bootp|rarp|both) dhcp|bootp|rarp|both)
DEVICE=eth0 DEVICE=eth0
;; ;;
*) *)
DEVICE=`echo $IP | cut -f6 -d:` DEVICE=`echo $IP | cut -f6 -d:`
;; ;;
esac esac
fi fi
if [ -z "${DEVICE}" ]; then if [ -z "${DEVICE}" ]; then
@ -516,12 +517,12 @@ if [ -z "${DEVICE}" ]; then
ogConfigureNetworking ogConfigureNetworking
fi fi
[ -n "${DEVICE}" ] && [ -e /tmp/net-"${DEVICE}".conf ] && return 0 [ -n "${DEVICE}" ] && [ -e /run/net-"${DEVICE}".conf ] && return 0
#if [ -n "${DEVICE}" ] && [ -e /tmp/net-"${DEVICE}".conf ]; then #if [ -n "${DEVICE}" ] && [ -e /run/net-"${DEVICE}".conf ]; then
# echo "variable DEVICE con valor $DEVICE y fichero /tmp/net-$DEVICE encontrados" # echo "variable DEVICE con valor $DEVICE y fichero /run/net-$DEVICE encontrados"
# return 0 # return 0
#else #else
# echo "variable DEVICE con valor $DEVICE encontrada, procedemos a configurala y a crear el fichero /tmp/net-$DEVICE" # echo "variable DEVICE con valor $DEVICE encontrada, procedemos a configurala y a crear el fichero /run/net-$DEVICE"
#fi #fi
# Activamos la interfaz antes de configurar. # Activamos la interfaz antes de configurar.
@ -542,10 +543,10 @@ for ROUNDTTT in 2 3 4 6 9 16 25 36 64 100; do
# The NIC is to be configured if this file does not exist. # The NIC is to be configured if this file does not exist.
# Ip-Config tries to create this file and when it succeds # Ip-Config tries to create this file and when it succeds
# creating the file, ipconfig is not run again. # creating the file, ipconfig is not run again.
if [ -e /tmp/net-"${DEVICE}".conf ]; then if [ -e /run/net-"${DEVICE}".conf ]; then
break; break;
fi fi
case ${IP} in case "$IP" in
none|off) none|off)
return 0 return 0
;; ;;
@ -578,16 +579,17 @@ done
# source ipconfig output # source ipconfig output
if [ -n "${DEVICE}" ]; then if [ -n "${DEVICE}" ]; then
. /tmp/net-${DEVICE}.conf
DEVICECFG="/tmp/net-${DEVICE}.conf"
export DEVICECFG
export DEVICE export DEVICE
export DEVICECFG="/run/net-${DEVICE}.conf"
source $DEVICECFG
echo "DEVICE=$DEVICE" >> $CFGINITRD echo "DEVICE=$DEVICE" >> $CFGINITRD
echo "DEVICECFG=$DEVICECFG" >> $CFGINITRD echo "DEVICECFG=$DEVICECFG" >> $CFGINITRD
echo "exportando variable DEVICE con valor = $DEVICE y el DEVICECFG con valor $DEVICECFG" echo "exportando variable DEVICE con valor = $DEVICE y DEVICECFG con valor $DEVICECFG"
# Compatibilidad con versiones anteriores.
ln -fs $DEVICECFG /tmp
else else
# source any interface as not exaclty specified # source any interface as not exaclty specified
. /tmp/net-*.conf source /run/net-*.conf
fi fi
} }

36
includes/usr/bin/boot-tools/boottoolsSoftwareInstall.sh
View File

@ -15,28 +15,45 @@ ln -s /bin/true /sbin/initctl
#Limpiamos y actualizamos los repositorios apt #Limpiamos y actualizamos los repositorios apt
apt-get clean apt-get clean
apt-get update apt-get update
apt-get upgrade -y
#Desactivamos el hook del oginitrd.img para evitar problemas, al final de este escripts se activará #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/ mv /etc/initramfs-tools/hooks/oghooks /etc/initramfs-tools/
# Preparamos el mtab necesario para la instalacion correcta de paquetes. # 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. #Instalamos el kernel.
#Deteccion de la versión y kernel a usar #Deteccion de la versión y kernel a usar
export OSDISTRIB=$(lsb_release -i | awk -F: '{sub(/\t/,""); print $2}') 2>/dev/null OGCLIENTCFG=${OGCLIENTCFG:-/tmp/ogclient.cfg}
export OSCODENAME=$(cat /etc/lsb-release | grep CODENAME | awk -F= '{print $NF}') [ -f $OGCLIENTCFG ] && source $OGCLIENTCFG
export OSRELEASE=$(uname -a | awk '{print $3}') OSRELEASE=${OSRELEASE:-$(uname -a | awk '{print $3}')}
uname -a | grep x86_64 > /dev/null && export OSARCH=amd64 || export OSARCH=i386 if [ -z "$OSARCH" ]; then
export OSHTTP="http://es.archive.ubuntu.com/ubuntu/" uname -a | grep x86_64 > /dev/null && OSARCH="amd64" || OSARCH="i386"
fi
# inicio de la instalacion # inicio de la instalacion
apt-get -y --force-yes install linux-image-${OSRELEASE} linux-headers-${OSRELEASE} linux-image-$RELEASE if [ "$OSRELEASE" == "3.7.3-030703-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.3-raring/linux-image-3.7.3-030703-generic_3.7.3-030703.201301171415_$OSARCH.deb
wget http://kernel.ubuntu.com/~kernel-ppa/mainline/v3.7.3-raring/linux-image-extra-3.7.3-030703-generic_3.7.3-030703.201301171415_$OSARCH.deb
wget http://kernel.ubuntu.com/~kernel-ppa/mainline/v3.7.3-raring/linux-headers-3.7.3-030703-generic_3.7.3-030703.201301171415_$OSARCH.deb
wget http://kernel.ubuntu.com/~kernel-ppa/mainline/v3.7.3-raring/linux-headers-3.7.3-030703_3.7.3-030703.201301171415_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 #Eliminamos cualquier busybox previo: antes del busybox
apt-get -y --force-yes remove busybox #apt-get -y --force-yes remove busybox
apt-get -y --force-yes remove busybox-static #apt-get -y --force-yes remove busybox-static
#estos paquetes ofrecen interaccion. #estos paquetes ofrecen interaccion.
# si es actualización, ya existe el fichero /etc/ssh/ssh_config # si es actualización, ya existe el fichero /etc/ssh/ssh_config
@ -80,6 +97,7 @@ echo " " > /etc/mtab
#localepurge #localepurge
#rm /var/lib/dbus/machine-id; rm /sbin/initctl; dpkg-divert --rename --remove /sbin/initctl; #rm /var/lib/dbus/machine-id; rm /sbin/initctl; dpkg-divert --rename --remove /sbin/initctl;
#FIN ADV #FIN ADV
apt-get clean apt-get clean
apt-get autoclean apt-get autoclean
apt-get autoremove apt-get autoremove

4
includes/usr/bin/boot-tools/listpackages/sw.Xwindow
View File

@ -8,4 +8,6 @@ install roxterm
install gparted install gparted
#xvesa en compilacion #xvesa en compilacion
install openbox install openbox
install midori install midori
# VESA Kernel 3.7
install v86d