From 52d172b3f32c68a407ec289639f1fbd391da039f Mon Sep 17 00:00:00 2001
From: ramon <ramongomez@us.es>
Date: Wed, 12 Dec 2012 13:33:45 +0000
Subject: [PATCH] =?UTF-8?q?Versi=C3=B3n=201.0.5,=20#142:=20Cambiar=20sopor?=
 =?UTF-8?q?te=20ZFS,=20a=C3=B1adir=20utilidades=20para=20exFAT=20y=20nombr?=
 =?UTF-8?q?e=20correcto=20del=20paquete=20para=20SMBFS.?=
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@3464 a21b9725-9963-47de-94b9-378ad31fedc9
---
 .../bin/boot-tools/boottoolsFsOpengnsys.sh    | 47 +++++++++----------
 .../listpackages/sw.filesystem.local          |  4 +-
 .../listpackages/sw.filesystem.remote         |  4 +-
 3 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/includes/usr/bin/boot-tools/boottoolsFsOpengnsys.sh b/includes/usr/bin/boot-tools/boottoolsFsOpengnsys.sh
index 13f4703..e9a9adf 100755
--- a/includes/usr/bin/boot-tools/boottoolsFsOpengnsys.sh
+++ b/includes/usr/bin/boot-tools/boottoolsFsOpengnsys.sh
@@ -19,16 +19,15 @@ SVNCLIENTSTRUCTURE=/tmp/opengnsys_installer/opengnsys/client/shared
 SVNCLIENTENGINE=/tmp/opengnsys_installer/opengnsys/client/engine
 SVNOG2=/tmp/opengnsys_installer/opengnsys2
  
-OGCLIENTMOUNT=""
+OGCLIENTMOUNT="$BTROOTFSMNT"
 
-
-OSDISTRIB=$(lsb_release -i | awk -F: '{sub(/\t/,""); print $2}') 2>/dev/null
-OSCODENAME=$(cat /etc/lsb-release | grep CODENAME | awk -F= '{print $NF}')
+OSDISTRIB=$(lsb_release -is)
+OSCODENAME=$(lsb_release -cs)
 OSRELEASE=$(uname -a | awk '{print $3}')
 uname -a | grep x86_64 > /dev/null  &&  export OSARCH=amd64 || export OSARCH=i386
 OSHTTP="http://es.archive.ubuntu.com/ubuntu/"
 
-echo $OSDISTRIB:$OSCODENAME:$OSRELEASE:$OSARCH:$OSHTTP	
+echo "$OSDISTRIB:$OSCODENAME:$OSRELEASE:$OSARCH:$OSHTTP"
 
 
 LERROR=TRUE
@@ -49,10 +48,10 @@ fi
 chmod -R 775 ${SVNCLIENTDIR}/includes/usr/bin/*
 
 # los copiamos
-cp -prv ${SVNCLIENTDIR}/includes/* /
+cp -av ${SVNCLIENTDIR}/includes/* ${OGCLIENTMOUNT}/
 mkdir -p ${OGCLIENTMOUNT}/opt/opengnsys/
-cp -prv ${SVNCLIENTSTRUCTURE}/* ${OGCLIENTMOUNT}/opt/opengnsys/
-cp -prv ${SVNCLIENTENGINE}/* ${OGCLIENTMOUNT}/opt/opengnsys/lib/engine/bin/
+cp -av ${SVNCLIENTSTRUCTURE}/* ${OGCLIENTMOUNT}/opt/opengnsys/
+cp -av ${SVNCLIENTENGINE}/* ${OGCLIENTMOUNT}/opt/opengnsys/lib/engine/bin/
 
 if [ $? -ne 0 ]
 then 
@@ -63,14 +62,14 @@ fi
 # copiamos algunas cosas del nfsexport
 
 #### Tipos de letra para el Browser.
-cp -pr ${SVNCLIENTSTRUCTURE}/lib/fonts $OGCLIENTMOUNT/usr/local/lib/fonts
+cp -a ${SVNCLIENTSTRUCTURE}/lib/fonts $OGCLIENTMOUNT/usr/local/lib/fonts
 #### Crear enlaces para compatibilidad con las distintas versiones del Browser.
 mkdir -p $OGCLIENTMOUNT/usr/local/Trolltech/QtEmbedded-4.5.1/lib/
 mkdir -p $OGCLIENTMOUNT/usr/local/QtEmbedded-4.6.2/lib/
 mkdir -p $OGCLIENTMOUNT/usr/local/QtEmbedded-4.6.3/lib/
-cp -pr ${SVNCLIENTSTRUCTURE}/lib/fonts $OGCLIENTMOUNT/usr/local/Trolltech/QtEmbedded-4.5.1/lib/fonts 
-cp -pr ${SVNCLIENTSTRUCTURE}/lib/fonts $OGCLIENTMOUNT/usr/local/QtEmbedded-4.6.2/lib/fonts 
-cp -pr ${SVNCLIENTSTRUCTURE}/lib/fonts $OGCLIENTMOUNT/usr/local/QtEmbedded-4.6.3/lib/fonts
+cp -a ${SVNCLIENTSTRUCTURE}/lib/fonts $OGCLIENTMOUNT/usr/local/Trolltech/QtEmbedded-4.5.1/lib/fonts 
+cp -a ${SVNCLIENTSTRUCTURE}/lib/fonts $OGCLIENTMOUNT/usr/local/QtEmbedded-4.6.2/lib/fonts 
+cp -a ${SVNCLIENTSTRUCTURE}/lib/fonts $OGCLIENTMOUNT/usr/local/QtEmbedded-4.6.3/lib/fonts
 if [ $? -ne 0 ]
 then 
 	echo "$FUNCNAME(): Linking Browser fonts : ERROR"
@@ -78,14 +77,14 @@ then
 fi
 
 #########################################################
-cp -pr ${SVNCLIENTSTRUCTURE}/lib/pci.ids $OGCLIENTMOUNT/etc
+cp -a ${SVNCLIENTSTRUCTURE}/lib/pci.ids $OGCLIENTMOUNT/etc
 if [ $? -ne 0 ]
 then 
 	echo "$FUNCNAME(): Copying pci.ids : ERROR"
 	exit 1
 fi
 ####### Browsser
-cp ${SVNCLIENTSTRUCTURE}/bin/browser $OGCLIENTMOUNT/bin
+cp -av ${SVNCLIENTSTRUCTURE}/bin/browser $OGCLIENTMOUNT/bin
 if [ $? -ne 0 ]
 then 
 	echo "$FUNCNAME(): Copying Browser : ERROR"
@@ -94,29 +93,29 @@ fi
 
 
 #Compatiblidad con og2
-cp ${SVNCLIENTSTRUCTURE}/bin/browser2 $OGCLIENTMOUNT/bin
+cp -av ${SVNCLIENTSTRUCTURE}/bin/browser2 $OGCLIENTMOUNT/bin
 
-cp -prv ${SVNOG2}/ogr/ogr $OGCLIENTMOUNT/opt/opengnsys/bin/
+cp -av ${SVNOG2}/ogr/ogr $OGCLIENTMOUNT/opt/opengnsys/bin/
 
-cp -prv ${SVNOG2}/ogr/libogr.py $OGCLIENTMOUNT/usr/lib/python2.7/libogr.py
-cp -prv ${SVNOG2}/ogr/libogr.py $OGCLIENTMOUNT/usr/lib/python2.6/libogr.py
-cp -prv ${SVNOG2}/ogr/libogr.py $OGCLIENTMOUNT/opt/opengnsys/lib/python
+cp -av ${SVNOG2}/ogr/libogr.py $OGCLIENTMOUNT/usr/lib/python2.7/libogr.py
+cp -av ${SVNOG2}/ogr/libogr.py $OGCLIENTMOUNT/usr/lib/python2.6/libogr.py
+cp -av ${SVNOG2}/ogr/libogr.py $OGCLIENTMOUNT/opt/opengnsys/lib/python
 
 
 echo "mkdir -p /opt/opengnsys/lib/engine/"
 mkdir -p /opt/opengnsys/engine/
 echo "cp -prv ${SVNOG2}/engine/2.0/* $OGCLIENTMOUNT/opt/opengnsys/engine/" 
-cp -prv ${SVNOG2}/engine/2.0/* $OGCLIENTMOUNT/opt/opengnsys/engine/
+cp -av ${SVNOG2}/engine/2.0/* $OGCLIENTMOUNT/opt/opengnsys/engine/
 
 
-cp -prv ${SVNOG2}/job_executer $OGCLIENTMOUNT/opt/opengnsys/bin/
+cp -av ${SVNOG2}/job_executer $OGCLIENTMOUNT/opt/opengnsys/bin/
 
 
-cp ${SVNCLIENTSTRUCTURE}/bin/ogAdmClient  $OGCLIENTMOUNT/bin
+cp -av ${SVNCLIENTSTRUCTURE}/bin/ogAdmClient  $OGCLIENTMOUNT/bin
 
 
-echo ${VERSIONBOOTTOOLS}-${OSCODENAME}-${OSRELEASE}-${VERSIONSVN} > $NAMEISOCLIENTFILE
-echo ${VERSIONBOOTTOOLS}-${OSCODENAME}-${VERSIONSVN} > $NAMEHOSTCLIENTFILE
+echo "${VERSIONBOOTTOOLS}-${OSCODENAME}-${OSRELEASE}-${VERSIONSVN}" > $OGCLIENTMOUNT/$NAMEISOCLIENTFILE
+echo "${VERSIONBOOTTOOLS}-${OSCODENAME}-${VERSIONSVN}" > $OGCLIENTMOUNT/$NAMEHOSTCLIENTFILE
 
 
 history -c
diff --git a/includes/usr/bin/boot-tools/listpackages/sw.filesystem.local b/includes/usr/bin/boot-tools/listpackages/sw.filesystem.local
index 9cc3da7..b9adb3c 100644
--- a/includes/usr/bin/boot-tools/listpackages/sw.filesystem.local
+++ b/includes/usr/bin/boot-tools/listpackages/sw.filesystem.local
@@ -6,6 +6,7 @@ install ntfsprogs
 install ntfs-3g 
 install dosfstools 
 install fatresize
+install exfat-utils
 install dmraid 
 install dmsetup 
 install lvm2 
@@ -21,5 +22,6 @@ install hfsprogs
 install hfsutils
 install nilfs-tools
 install ufsutils
-install ubuntu-zfs
+#install ubuntu-zfs
+install zfs-fuse
 
diff --git a/includes/usr/bin/boot-tools/listpackages/sw.filesystem.remote b/includes/usr/bin/boot-tools/listpackages/sw.filesystem.remote
index 192a401..54266ca 100644
--- a/includes/usr/bin/boot-tools/listpackages/sw.filesystem.remote
+++ b/includes/usr/bin/boot-tools/listpackages/sw.filesystem.remote
@@ -1,9 +1,9 @@
 #sw.filesystem.remote
 install nfs-common 
 install sshfs 
-install smbfs 
+install smbnetfs 
 install smbclient 
 install davfs2 
 install open-iscsi 
 install openssh-server 
-install bittornado 
\ No newline at end of file
+install bittornado