From d98110e108d1a97c6864b30dac86a767bbe70f63 Mon Sep 17 00:00:00 2001 From: adv Date: Wed, 6 Jul 2011 19:06:37 +0000 Subject: [PATCH] version 1.0.2 boot-tools: generador #404 git-svn-id: https://opengnsys.es/svn/branches/version1.0@2129 a21b9725-9963-47de-94b9-378ad31fedc9 --- .../etc/initramfs-tools/conf.d/splash | 1 - clientstructure/root/CompileSoftware.sh | 14 ++++++++--- clientstructure/root/GenerateGraphicBoot.sh | 17 ++++++++++++++ clientstructure/root/InstallSoftware.sh | 14 ++++++++--- clientstructure/root/importSVNboot-tools.sh | 3 --- ogClientGeneratorV2.sh | 5 +++- ogClientManager.lib | 23 +++++++++++-------- 7 files changed, 56 insertions(+), 21 deletions(-) delete mode 100644 clientstructure/etc/initramfs-tools/conf.d/splash create mode 100644 clientstructure/root/GenerateGraphicBoot.sh diff --git a/clientstructure/etc/initramfs-tools/conf.d/splash b/clientstructure/etc/initramfs-tools/conf.d/splash deleted file mode 100644 index e71684e..0000000 --- a/clientstructure/etc/initramfs-tools/conf.d/splash +++ /dev/null @@ -1 +0,0 @@ -FRAMEBUFFER=y diff --git a/clientstructure/root/CompileSoftware.sh b/clientstructure/root/CompileSoftware.sh index 1a9b854..40d9e8a 100755 --- a/clientstructure/root/CompileSoftware.sh +++ b/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 - wget http://damien.guibouret.free.fr/savepart.zip - unzip savepart.zip -d /sbin/ +#TODO: comprobar si esta instalado. +cd /tmp +wget http://damien.guibouret.free.fr/savepart.zip +unzip savepart.zip -d /sbin/ diff --git a/clientstructure/root/GenerateGraphicBoot.sh b/clientstructure/root/GenerateGraphicBoot.sh new file mode 100644 index 0000000..b12eeb2 --- /dev/null +++ b/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 \ No newline at end of file diff --git a/clientstructure/root/InstallSoftware.sh b/clientstructure/root/InstallSoftware.sh index 1a3548b..9472fef 100755 --- a/clientstructure/root/InstallSoftware.sh +++ b/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 diff --git a/clientstructure/root/importSVNboot-tools.sh b/clientstructure/root/importSVNboot-tools.sh index 930d6d2..9321c9f 100644 --- a/clientstructure/root/importSVNboot-tools.sh +++ b/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 diff --git a/ogClientGeneratorV2.sh b/ogClientGeneratorV2.sh index 3f816ae..3beac31 100755 --- a/ogClientGeneratorV2.sh +++ b/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 diff --git a/ogClientManager.lib b/ogClientManager.lib index 4469d08..3dda09e 100644 --- a/ogClientManager.lib +++ b/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] -type=directory -directory=/var/lib/tftpboot/ogclient/ogclientmount -description=ogclient ubuntu lucid DIR -priority=2 -users=root -groups=root -root-groups=root -root-users=root +#[DIRogclient] +#type=directory +#directory=/var/lib/tftpboot/ogclient/ogclientmount +#description=ogclient ubuntu lucid DIR +#priority=2 +#users=root +#groups=root +#root-groups=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 + }