From 6b9e1d748dcf3a6223ad10f4dbbc75cd79f31ca3 Mon Sep 17 00:00:00 2001
From: ramon <ramongomez@us.es>
Date: Thu, 9 Oct 2014 07:30:56 +0000
Subject: [PATCH] =?UTF-8?q?Corregir=20errata=20al=20crear=20cliente=20ogLi?=
 =?UTF-8?q?ve=20cuando=20el=20fichero=20de=20configuraci=C3=B3n=20de=20red?=
 =?UTF-8?q?=20est=C3=A1=20en=20{{{/tmp}}}=20e=20instalar=20nuevos=20paquet?=
 =?UTF-8?q?es.?=
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@4400 a21b9725-9963-47de-94b9-378ad31fedc9
---
 boottoolsfunctions.lib                               |  1 +
 includes/etc/initramfs-tools/scripts/ogfunctions     |  2 ++
 includes/usr/bin/boot-tools/listpackages/sw.basic    |  2 +-
 .../bin/boot-tools/listpackages/sw.filesystem.local  | 12 ++++++------
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/boottoolsfunctions.lib b/boottoolsfunctions.lib
index a58ac9d..c9f9d2e 100755
--- a/boottoolsfunctions.lib
+++ b/boottoolsfunctions.lib
@@ -51,6 +51,7 @@ case "${1,,}" in
 		OSDISTRIB="ubuntu"
 		OSCODENAME="precise"
 		OSRELEASE="3.2.0-23-generic"
+		#OSRELEASE="3.11.0-26-generic"
 		OSARCH="i386"
 		OSHTTP="http://es.archive.ubuntu.com/ubuntu/"
 		;;
diff --git a/includes/etc/initramfs-tools/scripts/ogfunctions b/includes/etc/initramfs-tools/scripts/ogfunctions
index 1870dca..56b5187 100644
--- a/includes/etc/initramfs-tools/scripts/ogfunctions
+++ b/includes/etc/initramfs-tools/scripts/ogfunctions
@@ -612,6 +612,8 @@ done
 if [ -n "${DEVICE}" ]; then	
 	export DEVICE
 	export DEVICECFG="/run/net-${DEVICE}.conf"
+	# En algunos casos, el fichero de configuración está en /tmp.
+	[ ! -f $DEVICECFG -a -f ${DEVICECFG/run/tmp} ] && mv ${DEVICECFG/run/tmp} $DEVICECFG
 	source $DEVICECFG
 	echo "DEVICE=$DEVICE" >> $CFGINITRD
 	echo "DEVICECFG=$DEVICECFG" >> $CFGINITRD
diff --git a/includes/usr/bin/boot-tools/listpackages/sw.basic b/includes/usr/bin/boot-tools/listpackages/sw.basic
index 1dd2ac6..fa5d7fa 100644
--- a/includes/usr/bin/boot-tools/listpackages/sw.basic
+++ b/includes/usr/bin/boot-tools/listpackages/sw.basic
@@ -13,6 +13,6 @@ install gawk
 install subversion
 install python-openssl 
 install python 
+install php5-cli
 install dmidecode 
-#install hwinfo
 install realpath
diff --git a/includes/usr/bin/boot-tools/listpackages/sw.filesystem.local b/includes/usr/bin/boot-tools/listpackages/sw.filesystem.local
index 2978f40..e698d89 100644
--- a/includes/usr/bin/boot-tools/listpackages/sw.filesystem.local
+++ b/includes/usr/bin/boot-tools/listpackages/sw.filesystem.local
@@ -2,7 +2,6 @@
 install squashfs-tools
 install unionfs-fuse
 install drbl-ntfsprogs 
-#install ntfsprogs 
 install ntfs-3g 
 install dosfstools 
 install fatresize
@@ -22,9 +21,10 @@ install hfsprogs
 install hfsutils
 install nilfs-tools
 install ufsutils
-#install ubuntu-zfs
+install vmfs-tools
 install zfs-fuse
-install android-tools-adb
-install android-tools-fastboot
-install android-tools-fsutils
-install f2fs-tools
+# Solo en ogLive basado en Ubuntu 14.04
+#install android-tools-adb
+#install android-tools-fastboot
+#install android-tools-fsutils
+#install f2fs-tools