version 1.0.2 boot-tools: generador #404

git-svn-id: https://opengnsys.es/svn/branches/version1.0@2129 a21b9725-9963-47de-94b9-378ad31fedc9

clientstructure/etc/initramfs-tools/conf.d/splash

@@ -1 +0,0 @@
-FRAMEBUFFER=y

clientstructure/root/CompileSoftware.sh

@@ -15,16 +15,24 @@ apt-get -y --force-yes install build-essential libattr* attr make m4 gettext lib
 
 source /opt/opengnsys/lib/engine/bin/ToolsGNU.c
 
+#TODO: comprobar si esta instalado.
 ctorrent install
+
+#TODO: comprobar si esta instalado.
 udpcast install
+
 #ntfs-3g install
+
+#TODO: comprobar si esta instalado.
 ms-sys install
 
+#TODO: comprobar si esta instalado.
 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
 gdebi -n partclone_0.2.16_i386.deb 
 
-	cd /tmp
+#TODO: comprobar si esta instalado.
-	wget http://damien.guibouret.free.fr/savepart.zip
+cd /tmp
-	unzip savepart.zip -d /sbin/
+wget http://damien.guibouret.free.fr/savepart.zip
+unzip savepart.zip -d /sbin/
 
 

clientstructure/root/GenerateGraphicBoot.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+#TODO Comprobar si esta los source.
+
+#svn checkout http://www.opengnsys.es/svn/branches/version1.0/client /tmp/opengnsys_installer/opengnsys/client/;
+#svn checkout http://www.opengnsys.es/svn/branches/version2/  /tmp/opengnsys_installer/opengnsys2
+find /tmp/opengnsys_installer/ -name .svn -type d -exec rm -fr {} \; 2>/dev/null;
+
+#plymouth
+apt-get install plymouth plymouth-theme-script
+
+
+#plymoutyh
+update-alternatives --install /lib/plymouth/themes/default.plymouth default.plymouth /lib/plymouth/themes/opengnsys/opengnsys.plymouth 100
+update-alternatives --set default.plymouth /lib/plymouth/themes/opengnsys/opengnsys.plymouth 
+
+mkdir -p /etc/initramfs-tools/conf.d
+echo "FRAMEBUFFER=y" > /etc/initramfs-tools/conf.d/splash 

clientstructure/root/InstallSoftware.sh

@@ -6,6 +6,14 @@ export LANGUAGE=C
 export LC_ALL=C
 export LANG=C
 
+export OSDISTRIB=$(lsb_release -i | awk -F: '{sub(/\t/,""); print $2}') 2>/dev/null
+#OSCODENAME=$(lsb_release -c | 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/"
+
+
 
 dpkg-divert --local --rename --add /sbin/initctl 
 ln -s /bin/true /sbin/initctl
@@ -29,7 +37,9 @@ apt-get -y --force-yes install openssh-server bittornado trickle iptraf screen s
 # software disk and filesystem
 apt-get -y --force-yes install drbl-ntfsprogs ntfsprogs parted ntfs-3g dosfstools
 apt-get -y --force-yes install dmraid dmsetup lvm2 e2fsprogs jfsutils reiserfsprogs xfsprogs unionfs-fuse mhddfs squashfs-tools
-apt-get -y --force-yes install btrfs-tools hfsplus hfsprogs hfsutils nilfs-tools reiser4progs ufsutils
+apt-get -y --force-yes install  hfsplus hfsprogs hfsutils nilfs-tools reiser4progs ufsutils
+
+#btrfs-tools
 
 # software cloning
 apt-get -y --force-yes install drbl-partimage fsarchiver pv kexec-tools
@@ -44,8 +54,6 @@ apt-get -y --force-yes install drbl-chntpw chntpw ethtool lshw gawk subversion
 # software compressor
 apt-get -y --force-yes install lzma zip unzip gzip lzop drbl-lzop pigz pbzip2 lbzip2 rzip p7zip-full unzip
 
-#plymouth
-apt-get install plymouth plymouth-theme-script
 
 #compatibilidad og2
 apt-get install python-openssl python

clientstructure/root/importSVNboot-tools.sh

@@ -100,9 +100,6 @@ then
 	exit 1
 fi
 
-#plymoutyh
-update-alternatives --install /lib/plymouth/themes/default.plymouth default.plymouth /lib/plymouth/themes/opengnsys/opengnsys.plymouth 100
-update-alternatives --set default.plymouth /lib/plymouth/themes/opengnsys/opengnsys.plymouth 
 
 
 #Compatiblidad con og2

ogClientGeneratorV2.sh

@@ -93,7 +93,10 @@ cat /etc/schroot/schroot.conf | grep ogclient || ogClientSchrootConf
 
 
 ############### FASE 5: Configuración del Segundo Sistema de archivos (img) con la estructura especial de OpenGnsys
-ogClient2ndSVN $TYPECLIENT || exit
+#ogClient2ndSVN $TYPECLIENT || exit
+cp ${SVNCLIENTDIR}/clientstructure/root/* /tmp/
+chmod 777 /tmp/*.sh
+schroot -p -c IMGogclient -- /tmp/importSVNboot-tools.sh 
 
 
 

ogClientManager.lib

@@ -91,6 +91,7 @@ then
 	errorAndLog "$FUNCNAME(): Creando directorio $OGCLIENTMOUNT : ERROR" 
 	return 1
 fi 
+chown -R root:opengnsys $OGCLIENTBASEDIR
 echo "$FUNCNAME(): Creando el disco virtual que almacenará el FS del cliente $OGCLIENTSIZEMB MB de datos físicos" 
 dd if=/dev/zero of=$OGCLIENTFILE bs=1048576 count=$OGCLIENTSIZEMB
 #qemu-img create $OGCLIENTFILE 3G	
@@ -300,21 +301,21 @@ cat << EOF > /etc/schroot/schroot.conf
 type=loopback
 file=/var/lib/tftpboot/ogclient/ogclient.img
 description=ogclient ubuntu luc IMGi
-priority=1
+#priority=1
 users=root
 groups=root
 root-groups=root
 mount-options=-o offset=32256
 root-users=root
-[DIRogclient]
+#[DIRogclient]
-type=directory
+#type=directory
-directory=/var/lib/tftpboot/ogclient/ogclientmount
+#directory=/var/lib/tftpboot/ogclient/ogclientmount
-description=ogclient ubuntu lucid DIR
+#description=ogclient ubuntu lucid DIR
-priority=2
+#priority=2
-users=root
+#users=root
-groups=root
+#groups=root
-root-groups=root
+#root-groups=root
-root-users=root
+#root-users=root
 EOF
 cp /etc/schroot/mount-defaults /etc/schroot/mount-defaults.`getDateTime`
 cat << EOF > /etc/schroot/mount-defaults
@@ -350,6 +351,8 @@ cp /tmp/*-${OSRELEASE} $OGCLIENTBASEDIR
 cp /tmp/initrd.img-${OSRELEASE} ${OGCLIENTBASEDIR}/oginitrd.img
 cp /tmp/vmlinuz-${OSRELEASE} ${OGCLIENTBASEDIR}/ogvmlinuz
 cd -
+chmod -R 755 $OGCLIENTBASEDIR
+
 }