From 8ebae0e564d195815d20fe374a1371020332275d Mon Sep 17 00:00:00 2001 From: adv Date: Wed, 11 Jan 2012 10:48:37 +0000 Subject: [PATCH] #460 ogLive 11.10 oneiric git-svn-id: https://opengnsys.es/svn/branches/version1.0@2427 a21b9725-9963-47de-94b9-378ad31fedc9 --- INSTALL.es.txt | 6 +- boottoolsfunctions.lib | 5 +- boottoolsgenerator.sh | 76 ++++++++----------- includes/etc/apt/sources.list.ubuntu | 4 +- .../boot-tools/boottoolsSoftwareCompile.sh | 12 ++- .../boot-tools/boottoolsSoftwareInstall.sh | 29 +++++-- .../bin/boot-tools/listpackages/sw.Xwindow | 3 +- .../usr/bin/boot-tools/listpackages/sw.basic | 3 +- .../bin/boot-tools/listpackages/sw.testing | 72 +++++++++++++++++- 9 files changed, 144 insertions(+), 66 deletions(-) diff --git a/INSTALL.es.txt b/INSTALL.es.txt index 7c58093..c65f5a2 100644 --- a/INSTALL.es.txt +++ b/INSTALL.es.txt @@ -43,5 +43,7 @@ Descripción de la estrucutra de boot-tools - - +NOTA: + boottollsfuncions.lib -> btogSetfsBase + bootsoftwareinstall -> + packages ->sw.testing diff --git a/boottoolsfunctions.lib b/boottoolsfunctions.lib index 2f7aff6..c8fef78 100644 --- a/boottoolsfunctions.lib +++ b/boottoolsfunctions.lib @@ -126,6 +126,7 @@ echo -e "n\np\n1\n\n\nt\n83\nw" | fdisk $DISKLOOP #echoAndLog "$FUNCNAME(): Liberamos Desmontando $DISKLOOP despues del particionado " +sleep 10 losetup -d $DISKLOOP if [ $? -ne 0 ] then @@ -143,6 +144,7 @@ then return 2 fi #echoAndLog "$FUNCNAME(): Desmontando $PARTLOOP despues del formateo " +sleep 10 losetup -d $PARTLOOP if [ $? -ne 0 ] then @@ -174,7 +176,8 @@ echoAndLog "$FUNCNAME: Iniciando la generación del sistema de archivos " mount | grep $BTROOTFSMNT || mount $BTROOTFSIMG $BTROOTFSMNT -o loop,offset=32256 mount | grep $BTROOTFSMNT && echoAndLog "$FUNCNAME: mount $BTROOTFSIMG $BTROOTFSMNT -o loop,offset=32256 OK " || errorAndLog "$FUNCNAME: mount $BTROOTFSIMG $BTROOTFSMNT -o loop,offset=32256 : FAILURE " -debootstrap --arch=$OSARCH --components=main,universe ${OSCODENAME} ${BTROOTFSMNT} ${OSHTTP} +debootstrap --components=main,universe ${OSCODENAME} ${BTROOTFSMNT} ${OSHTTP} +#debootstrap --arch=$OSARCH ${OSCODENAME} ${BTROOTFSMNT} http://archive.ubuntu.com/ubuntu/ if [ $? -ne 0 ]; then diff --git a/boottoolsgenerator.sh b/boottoolsgenerator.sh index 70a7735..de28910 100755 --- a/boottoolsgenerator.sh +++ b/boottoolsgenerator.sh @@ -35,31 +35,28 @@ for i in `mount | grep IMGogclient | grep /var | cut -f3 -d" "`; do echo $i; umo for i in `mount | grep IMGogclient | grep /var | cut -f3 -d" "`; do echo $i; umount $i; done - #funciones especificas del cliente. source $PROGRAMDIR/boottoolsfunctions.lib - echoAndLog "OpenGnSys CLIENT installation begins at $(date)" ########################################################################## -## FASE 1 - Instalación de software adicional. +echo "FASE 1 - Instalación de software adicional." cat /etc/apt/sources.list | grep "http://free.nchc.org.tw/drbl-core" || echo "deb http://free.nchc.org.tw/drbl-core drbl stable " >> /etc/apt/sources.list -apt-get update -apt-get -y --force-yes install debootstrap subversion schroot squashfs-tools syslinux genisoimage gpxe qemu - -##### FASE 2 - Asignación de variables +apt-get update; apt-get -y --force-yes install debootstrap subversion schroot squashfs-tools syslinux genisoimage gpxe qemu +####################################################################3 +echo "FASE 2 - Asignación de variables" #obtenemos las variables necesarias y la información del host. btogGetVar && btogGetOsInfo - -############# FASE 3: Creación del Sistema raiz RootFS (Segundo Sistema archivos (img)) -##3.1 creación y formateo del disco virtual. generamos el dispositivo loop. +###################################################################3 +echo " FASE 3: Creación del Sistema raiz RootFS (Segundo Sistema archivos (img)) " +echo "Fase 3.1 Generar y Formatear el disco virtual. generamos el dispositivo loop." file $BTROOTFSIMG | grep "partition 1: ID=0x83" if [ $? == 1 ] then btogSetFsVirtual || exit 2 fi -#3.2 generamos el Sistema de archivos con debootstrap +echo "Fase 3.2 gener sistema de archivos con debootstrap" schroot -p -c IMGogclient -- touch /tmp/ogclientOK if [ -f /tmp/ogclientOK ] then @@ -67,67 +64,54 @@ then else btogSetFsBase || exit 3 fi - -# FASE 4: Configuración el acceso al Segundo Sistema de archivos (img), para schroot +###################################################################3 +echo "FASE 4: Configurar acceso schroot al Segundo Sistema de archivos (img)" cat /etc/schroot/schroot.conf | grep $BTROOTFSIMG || btogSetFsAccess - -# FASE 5: Incorporando con ficheros OG el sistema raiz rootfs +########################################################################### +echo "FASE 5: Incorporando con ficheros OpenGnsys el sistema raiz rootfs " cp -prv ${BTSVNBOOTTOOLS}/includes/usr/bin/* /tmp/ chmod 777 /tmp/boot-tools/*.sh schroot -p -c IMGogclient -- /tmp/boot-tools/boottoolsFsOpengnsys.sh - -# FASE6: Instalacion de software -# 6.1 instalacion de software con apt-get -#cp /etc/apt/sources.list /tmp +############################################################################################ +echo "FASE6: Instalar software" +echo "Fase 6.1 instalar paquetes deb con apt-get" schroot -p -c IMGogclient -- /usr/bin/boot-tools/boottoolsSoftwareInstall.sh - - -# 6.2 compilación de software. +echo "Fase 6.2 compilar software." cd / schroot -p -c IMGogclient -- /usr/bin/boot-tools/boottoolsSoftwareCompile.sh schroot -p -c IMGogclient -- /usr/bin/boot-tools/boottoolsSoftwareCompile.sh - cd - -#Fase 7. Personalizando - -schroot -p -c IMGogclient -- /usr/bin/boot-tools/boottoolsFsLocales.sh - - -### 7.1 incorporamos la clave publica del servidor +echo "Fase 7. Personalizar el sistema creado" +echo "Fase 7.1 incorporamos la clave publica del servidor" cd / ssh-keygen -q -f /root/.ssh/id_rsa -N "" cp /root/.ssh/id_rsa.pub /tmp schroot -p -c IMGogclient -- /usr/bin/boot-tools/boottoolsSshServer.sh cd - -### 7.2 y la del propio cliente. -schroot -c IMGogclient -- /usr/bin/boot-tools/boottoolsSshClient.sh +echo "Fase 7.2. incorpoar la clave publica del propio cliente" +schroot -p -c IMGogclient -- /usr/bin/boot-tools/boottoolsSshClient.sh + +echo "Fase 7.1. configurando las locales" +schroot -p -c IMGogclient -- /usr/bin/boot-tools/boottoolsFsLocales.sh -## 7.3 configuramos los locales. -schroot -c IMGogclient -- /usr/bin/boot-tools/boottoolsFsLocales.sh for i in `mount | grep IMGogclient | grep /var | cut -f3 -d" "`; do echo $i; umount $i; done for i in `mount | grep IMGogclient | grep /var | cut -f3 -d" "`; do echo $i; umount $i; done for i in `mount | grep IMGogclient | grep /var | cut -f3 -d" "`; do echo $i; umount $i; done - - - - -#Fase 7. Generando la ISO. -#7.1 el initrd +######################################################################### +echo "Fase 8 . Generar distribucion " +echo "Fase 8.1 generar el initrd" btogFsInitrd - - -#7.2 Convertivos el sistema raiz img en formato sqfs +echo "8.2. Generar fichero sqfs a partir del fichero img" btogFsSqfs -#7.3 Generamos la iso +echo "8.3. Generar la ISO" btogIsoGenerator - - +######################################################################3 +######################################################################## # Mostrar sumario de la instalación e instrucciones de post-instalación. installationSummary - echoAndLog "OpenGnSys installation finished at $(date)" diff --git a/includes/etc/apt/sources.list.ubuntu b/includes/etc/apt/sources.list.ubuntu index 29348cc..1487573 100644 --- a/includes/etc/apt/sources.list.ubuntu +++ b/includes/etc/apt/sources.list.ubuntu @@ -29,8 +29,8 @@ deb-src http://es.archive.ubuntu.com/ubuntu/ OSCODENAME-updates multiverse ## newer versions of some applications which may provide useful features. ## Also, please note that software in backports WILL NOT receive any review ## or updates from the Ubuntu security team. -# deb http://es.archive.ubuntu.com/ubuntu/ OSCODENAME-backports main restricted universe multiverse -# deb-src http://es.archive.ubuntu.com/ubuntu/ OSCODENAME-backports main restricted universe multiverse +deb http://es.archive.ubuntu.com/ubuntu/ OSCODENAME-backports main restricted universe multiverse +deb-src http://es.archive.ubuntu.com/ubuntu/ OSCODENAME-backports main restricted universe multiverse ## Uncomment the following two lines to add software from Canonical's ## 'partner' repository. diff --git a/includes/usr/bin/boot-tools/boottoolsSoftwareCompile.sh b/includes/usr/bin/boot-tools/boottoolsSoftwareCompile.sh index 79102dc..8d0cede 100755 --- a/includes/usr/bin/boot-tools/boottoolsSoftwareCompile.sh +++ b/includes/usr/bin/boot-tools/boottoolsSoftwareCompile.sh @@ -19,9 +19,6 @@ which udp-sender || udpcast install &>/dev/null echo "ms-sys " which ms-sys || ms-sys install &>/dev/null -#echo "echo partclone " -#which partclone.ntfs || $(wget -O partclone_0.2.16_i386.deb http://downloads.sourceforge.net/project/partclone/stable/0.2.16/partclone_0.2.16_i386.deb?use_mirror=ovh &>/dev/null; gdebi -n partclone_0.2.16_i386.deb &>/dev/null) -#which partclone.ntfs || gdebi -n /var/cache/apt/archivesOG/partclone_0.2.8_i386.deb echo "spartlnx" which spartlnx.run || $(wget http://damien.guibouret.free.fr/savepart.zip &>/dev/null; unzip -o savepart.zip -d /sbin/) @@ -32,10 +29,11 @@ gdebi -n /var/cache/apt/archivesOG/xvesa.deb echo "partclone" gdebi -n /var/cache/apt/archivesOG/partclone_0.2.38_i386.deb -echo "busybox" -gdebi -n /var/cache/apt/archivesOG/busybox_1.17.1-10ubuntu1_i386.deb.deb +#echo "busybox" +#gdebi -n /var/cache/apt/archivesOG/busybox_1.17.1-10ubuntu1_i386.deb + +echo "busybox-static" +gdebi -n /var/cache/apt/archivesOG/busybox-static_1.17.1-10ubuntu1_i386.deb -echo "busybox" -gdebi -n /var/cache/apt/archivesOG/busybox-static_1.17.1-10ubuntu1_i386.deb.deb history -c \ No newline at end of file diff --git a/includes/usr/bin/boot-tools/boottoolsSoftwareInstall.sh b/includes/usr/bin/boot-tools/boottoolsSoftwareInstall.sh index 9af7219..738c536 100755 --- a/includes/usr/bin/boot-tools/boottoolsSoftwareInstall.sh +++ b/includes/usr/bin/boot-tools/boottoolsSoftwareInstall.sh @@ -4,46 +4,56 @@ export LC_ALL=C export LANG=C #LOG_FILE=/tmp/boot-tools-software.txt +#ADV #Desactivamos upstart dpkg-divert --local --rename --add /sbin/initctl ln -s /bin/true /sbin/initctl +#TEST desactivamos upstart +#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 apt-get clean apt-get update -#Desactivamos el hook del oginitrd.img para evitar problemas. +#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 #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/" -# software Kernel +# inicio de la instalacion apt-get -y --force-yes install linux-image-${OSRELEASE} linux-headers-${OSRELEASE} linux-image-$RELEASE -#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-static #estos paquetes ofrecen interaccion. # si es actualización, ya existe el fichero /etc/ssh/ssh_config apt-get -y install sshfs - apt-get -y install console-data +#comenzamos con la instalación de los paquetes a instalar. for group in `find /usr/bin/boot-tools/listpackages/ -name sw.*` do echo "Instalando el grupo de paquetes almacenados en $group" for package in ` awk /^install/'{print $2}' $group ` do echo -n $package - apt-get -y --force-yes install $package &>/dev/null + #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 ] then @@ -60,10 +70,19 @@ done #Activamos el hook del oginitrd.img mv /etc/initramfs-tools/oghooks /etc/initramfs-tools/hooks/ +# Dejamos el mtab como al principio echo " " > /etc/mtab + +#ADV +#TEST +#apt-get install localepurge +#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 history -c + diff --git a/includes/usr/bin/boot-tools/listpackages/sw.Xwindow b/includes/usr/bin/boot-tools/listpackages/sw.Xwindow index 2535682..68ea963 100644 --- a/includes/usr/bin/boot-tools/listpackages/sw.Xwindow +++ b/includes/usr/bin/boot-tools/listpackages/sw.Xwindow @@ -7,4 +7,5 @@ install roxterm install gparted #xvesa en compilacion -install openbox \ No newline at end of file +install openbox +install midori \ No newline at end of file diff --git a/includes/usr/bin/boot-tools/listpackages/sw.basic b/includes/usr/bin/boot-tools/listpackages/sw.basic index 3ef7127..e65da70 100644 --- a/includes/usr/bin/boot-tools/listpackages/sw.basic +++ b/includes/usr/bin/boot-tools/listpackages/sw.basic @@ -3,7 +3,8 @@ install dialog install man-db install fbset install gdebi-core -#install busybox-static +install bash-static +#install busybox-static #la version en oneiric no incluye el reboot y poweroff -> ver compilacion software install console-data install locales install lshw diff --git a/includes/usr/bin/boot-tools/listpackages/sw.testing b/includes/usr/bin/boot-tools/listpackages/sw.testing index 282de9e..7414c4f 100644 --- a/includes/usr/bin/boot-tools/listpackages/sw.testing +++ b/includes/usr/bin/boot-tools/listpackages/sw.testing @@ -1,4 +1,74 @@ #sw.other install screen install schroot -install grub \ No newline at end of file +#install grub +############## +#install discover +#install laptop-detect +#install os-prober +#install casper +#install lupin-casper +#install xinit +#install openbox +#install obconf +#install xserver-xorg +#install x11-xserver-utils +#install xterm network-manager-gnome +#install plymouth-x11 +#install plymouth-label +#install plymouth-theme-ubuntu-logo +#install pcmanfm +#install chromium-browser +#install gtk-theme-switch +#install gtk2-engines +#install murrine-themes +####################################3 +#install gnome-icon-theme +#install gnome-brave-icon-theme +#install dmz-cursor-theme +#install python-wnck +#install python-xlib +#install python-pyinotify +#install python-alsaaudio +#install python-vte maximus +#install gpicview +#install leafpad +#install lxappearance +#install lxmenu-data +#install lxrandr +#install lxterminal +#install nitrogen +#install ttf-ubuntu-font-family +#install time +#install hdparm +#install openssh-client +#install synaptic +#install libglib-perl +#install libgtk2-perl +#install libxml-simple-perl +#install rsync +#install smartmontools +#install gnome-disk-utility +#install policykit-1-gnome +#install policykit-desktop-privileges +#install baobab +#install gparted +#install lshw-gtk +#install testdisk +#install usb-creator-gtk +#install wodim +#install curlftpfs +#install nmap +#install cifs-utils +#install libnotify-bin +#install cryptsetup +#install reiserfsprogs +#install dosfstools +#install ntfsprogs +#install ntfs-3g +#install hfsutils +#install reiser4progs +#install jfsutils +#install smbclient +#install wget +#install system-config-lvm