From 2847ede25b7cfd479dca6d391856b80dce8e70dd Mon Sep 17 00:00:00 2001
From: irina <irinagomez@us.es>
Date: Fri, 25 Apr 2014 11:32:19 +0000
Subject: [PATCH] #565 Correccion errata en la nomenclatura de la version del
 kernel

git-svn-id: https://opengnsys.es/svn/branches/version1.0@4255 a21b9725-9963-47de-94b9-378ad31fedc9
---
 admin/Sources/Services/ogAdmRepoAux   |  2 +-
 client/engine/Rsync.lib               | 10 +++++-----
 client/shared/scripts/createBaseImage |  2 +-
 client/shared/scripts/createDiffImage |  2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/admin/Sources/Services/ogAdmRepoAux b/admin/Sources/Services/ogAdmRepoAux
index 01dac195..4d245daf 100755
--- a/admin/Sources/Services/ogAdmRepoAux
+++ b/admin/Sources/Services/ogAdmRepoAux
@@ -26,7 +26,7 @@ REPODIR="$BASEDIR/images/"
 eval $(grep BACKUP $BASEDIR/client/etc/engine.cfg)
 # FS segun kernel. ext4 para < 3.7, para >= BTRFS
 KERNEL=$(file -bkr /opt/opengnsys/tftpboot/ogclient/ogvmlinuz |awk '/Linux/ {for(i=1;i<=NF;i++) if($i~/version/) {v=$(i+1);printf("%d",v);sub(/[0-9]*\./,"",v);printf(".%02d",v)}}')
-[ $KERNEL \< 3.7 ] && IMGFS="EXT4" || IMGFS="BTRFS"
+[ $KERNEL \< 3.07 ] && IMGFS="EXT4" || IMGFS="BTRFS"
 
 
 # Añade registro de incidencias.
diff --git a/client/engine/Rsync.lib b/client/engine/Rsync.lib
index b45406b1..5b735c5e 100755
--- a/client/engine/Rsync.lib
+++ b/client/engine/Rsync.lib
@@ -65,7 +65,7 @@ if [ "$1" == "CACHE" -o "$1" == "cache" ]; then
                    echo "      truncate --size=>$SIZEREQUIRED k $IMGFILE" 
                    truncate --size=">$SIZEREQUIRED"k "$IMGFILE" &> $OGLOGCOMMAND
 		   # FS de la imagen segun la version del kernel: < 3.7 ext4, si >=  btrfs 
-		   if [ $KERNELVERSION \< 3.7 ]; then
+		   if [ $KERNELVERSION \< 3.07 ]; then
                 	losetup $LOOPDEVICE "$IMGFILE"
 			echo "      resize2fs -f $LOOPDEVICE"
 			resize2fs -f $LOOPDEVICE &> $OGLOGCOMMAND
@@ -83,7 +83,7 @@ if [ "$1" == "CACHE" -o "$1" == "cache" ]; then
                 #Formateamos imagen
                 losetup $LOOPDEVICE $IMGFILE
 		# FS de la imagen segun la version del kernel: < 3.7 ext4, si >=  btrfs 
-		if [ $KERNELVERSION \< 3.7 ]; then
+		if [ $KERNELVERSION \< 3.07 ]; then
 		   echo "      mkfs.ext4 -i 4096  -b 4096 -L "${2##*\/}" $LOOPDEVICE"
 		   mkfs.ext4 -i 4096  -b 4096 -L "${2##*\/}" $LOOPDEVICE 2>&1 |tee -a $OGLOGCOMMAND
 		else
@@ -177,7 +177,7 @@ SIZEDATA=${SIZEDATA:-"SIZEDATA"}
 
 # Incluimos información de la imagen. Segun el kernel sera ext4 o btrfs.
 KERNELVERSION=$(uname -r| awk '{printf("%d",$1);sub(/[0-9]*\./,"",$1);printf(".%02d",$1)}')
-if [ $KERNELVERSION \< 3.7 ]; then
+if [ $KERNELVERSION \< 3.07 ]; then
 	echo "#EXT4:NO:$FSTYPE:$SIZEDATA" > $IMGINFO
 else
 	echo "#BTRFS:LZO:$FSTYPE:$SIZEDATA" > $IMGINFO
@@ -530,7 +530,7 @@ else
 	
    	# FS de la imagen segun la version del kernel: < 3.7 ext4, si >=  btrfs 
 	KERNELVERSION=$(uname -r| awk '{printf("%d",$1);sub(/[0-9]*\./,"",$1);printf(".%02d",$1)}')
-	if [ $KERNELVERSION \< 3.7 ]; then
+	if [ $KERNELVERSION \< 3.07 ]; then
 	    mount -t ext4 -o loop "$IMGFILE" "/tmp/$DIRMOUNT" 1>/dev/null
 	else
 	    mount -o compress=lzo  "$IMGFILE" "/tmp/$DIRMOUNT" 1>/dev/null
@@ -844,7 +844,7 @@ DIRMOUNT="/tmp/ogCheckImage$$"
 mkdir "$DIRMOUNT"
 # FS de la imagen segun la version del kernel: < 3.7 ext4, si >=  btrfs 
 KERNELVERSION=$(uname -r| awk '{printf("%d",$1);sub(/[0-9]*\./,"",$1);printf(".%02d",$1)}')
-if [ $KERNELVERSION \< 3.7 ]; then
+if [ $KERNELVERSION \< 3.07 ]; then
 	mount -t ext4 -o loop "$IMGFILE" "$DIRMOUNT" 2>&1 | tee -a $OGLOGCOMMAND
 	RETVAL=${PIPESTATUS[0]}
 else
diff --git a/client/shared/scripts/createBaseImage b/client/shared/scripts/createBaseImage
index 85eb4075..b9a3c557 100755
--- a/client/shared/scripts/createBaseImage
+++ b/client/shared/scripts/createBaseImage
@@ -45,7 +45,7 @@ CREATESPEED=${CREATESPEED:-"100000*4"}
 
 # Sistema de fichero de la imagen según kernel, menor que 3.7 EXT4. comparamos revision 
 KERNELVERSION=$(uname -r| awk '{printf("%d",$1);sub(/[0-9]*\./,"",$1);printf(".%02d",$1)}')
-[ $KERNELVERSION \< 3.7 ] &&  IMGFS="EXT4" || IMGFS="BTRFS"
+[ $KERNELVERSION \< 3.07 ] &&  IMGFS="EXT4" || IMGFS="BTRFS"
 
 # % de compresion para estimacion tamaño imagen IMGFS="EXT4"
 ZSYNC=${ZSYNC:-"120"}
diff --git a/client/shared/scripts/createDiffImage b/client/shared/scripts/createDiffImage
index ecbf2914..32784012 100755
--- a/client/shared/scripts/createDiffImage
+++ b/client/shared/scripts/createDiffImage
@@ -47,7 +47,7 @@ function onexit() {
 CREATESPEED=${CREATESPEED:-"100000*4"}
 # Sistema de fichero de la imagen según kernel, menor que 3.7 EXT4. comparamos revision 
 KERNELVERSION=$(uname -r| awk '{printf("%d",$1);sub(/[0-9]*\./,"",$1);printf(".%02d",$1)}')
-[ $KERNELVERSION \< 3.7 ] &&  IMGFS="EXT4" || IMGFS="BTRFS"
+[ $KERNELVERSION \< 3.07 ] &&  IMGFS="EXT4" || IMGFS="BTRFS"
 # % de compresion para estimacion tamaño imagen IMGFS="EXT4"
 ZSYNC=${ZSYNC:-"120"}
 # Si IMGFS="BTRFS" la compresion es mayor.