opengnsys
/
opengnsys
1
0
Fork 0
Code Issues Pull Requests 3 Packages Projects Releases Wiki Activity

#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
remotes/github/debian-pkg
Irina Gomez 2014-04-25 11:32:19 +00:00
parent ee4beb4ca3
commit 2847ede25b
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/Sources/Services/ogAdmRepoAux
View File

@ -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.

10
client/engine/Rsync.lib
View File

@ -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

2
client/shared/scripts/createBaseImage
View File

@ -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"}

2
client/shared/scripts/createDiffImage
View File

@ -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.