summaryrefslogtreecommitdiffstats
path: root/client/boot-tools
diff options
context:
space:
mode:
authorramon <ramongomez@us.es>2016-05-04 12:43:32 +0000
committerramon <ramongomez@us.es>2016-05-04 12:43:32 +0000
commit025bd2406f12d21fc4e9da254171eedf47332956 (patch)
tree44e76c8d070388a04fe9ee9ba69a3fd1dc77c249 /client/boot-tools
parente928e32481408a8e3b26bae89380443ce7e70a3c (diff)
#724 #730: Problemas resueltos:
* Detección correcta de caché en ogLive basado en Ubuntu 15.10. * Dejar de montar sistema de archivos temporal para APT en ogLive. * Cálculo correcto de tamaño en KB en función {{{ogGetPartitionSize}}}. Actualizar lista de tickets resueltos. git-svn-id: https://opengnsys.es/svn/branches/version1.1@4919 a21b9725-9963-47de-94b9-378ad31fedc9
Diffstat (limited to 'client/boot-tools')
-rw-r--r--client/boot-tools/includes/etc/initramfs-tools/scripts/ogfunctions10
1 files changed, 4 insertions, 6 deletions
diff --git a/client/boot-tools/includes/etc/initramfs-tools/scripts/ogfunctions b/client/boot-tools/includes/etc/initramfs-tools/scripts/ogfunctions
index d70119d3..91aad6f4 100644
--- a/client/boot-tools/includes/etc/initramfs-tools/scripts/ogfunctions
+++ b/client/boot-tools/includes/etc/initramfs-tools/scripts/ogfunctions
@@ -292,10 +292,6 @@ ogPostConfigureFS()
fi
fi
fi
-
- #Montamos un directorio temporal para el apt-get
- mount tmpfs /var/cache/apt/archives -t tmpfs -o size=15M
- mkdir -p /var/cache/apt/archives/partial
}
@@ -365,9 +361,11 @@ ogUpdateInitrd ()
{
cd /tmp
mkdir /tmp/cache
- TYPE=$(blkid | grep CACHE | awk -F"TYPE=" '{print $2}' | tr -d \")
+ TYPE=$(blkid -po export $(blkid -L CACHE) 2>/dev/null | awk -F= '$1=="TYPE" { print $2}')
+ # Salir si no se detecta caché.
+ [ -z "$TYPE" ] && return
mount -t $TYPE LABEL=CACHE /tmp/cache || return
- mkdir /tmp/cache/boot
+ mkdir -p /tmp/cache/boot
# comparamos los del server