#724: Cambios necesarios para crear ogLive basado en Ubuntu 15.04

git-svn-id: https://opengnsys.es/svn/branches/version1.1@4716 a21b9725-9963-47de-94b9-378ad31fedc9

5 files changed, 20 insertions, 10 deletions

diff --git a/client/boot-tools/boottoolsfunctions.lib b/client/boot-tools/boottoolsfunctions.lib
index 5027c650..c703cc46 100755
--- a/client/boot-tools/boottoolsfunctions.lib
+++ b/client/boot-tools/boottoolsfunctions.lib
@@ -69,6 +69,13 @@ case "${1,,}" in
 		OSARCH="i386"
 		OSHTTP="http://es.archive.ubuntu.com/ubuntu/"
 		;;
+	vivid) 	# ogLive 1.1.0-rc1 basado en Ubuntu 15.04.
+		OSDISTRIB="ubuntu"
+		OSCODENAME="vivid"
+		OSRELEASE="3.19.0-31-generic"
+		OSARCH="i386"
+		OSHTTP="http://es.archive.ubuntu.com/ubuntu/"
+		;;
 	wheezy) 	# ogLive basado en Debian 7.3.
 		OSDISTRIB="debian"
 		OSCODENAME="wheezy"
diff --git a/client/boot-tools/includes/usr/bin/boot-tools/listpackages/sw.compile b/client/boot-tools/includes/usr/bin/boot-tools/listpackages/sw.compile
index 8b1d1001..02122728 100644
--- a/client/boot-tools/includes/usr/bin/boot-tools/listpackages/sw.compile
+++ b/client/boot-tools/includes/usr/bin/boot-tools/listpackages/sw.compile
@@ -1,5 +1,7 @@
 install build-essential 
-install libattr* 
+#install libattr*		# Satura el tamaño del archivo en Ubuntu 15.04
+install libattr1
+install libattr1-dev
 install attr 
 install make 
 install m4 
diff --git a/client/boot-tools/includes/usr/bin/boot-tools/listpackages/sw.filesystem.local b/client/boot-tools/includes/usr/bin/boot-tools/listpackages/sw.filesystem.local
index ab9aca8b..595272f6 100644
--- a/client/boot-tools/includes/usr/bin/boot-tools/listpackages/sw.filesystem.local
+++ b/client/boot-tools/includes/usr/bin/boot-tools/listpackages/sw.filesystem.local
@@ -20,11 +20,12 @@ install hfsplus
 install hfsprogs
 install hfsutils
 install nilfs-tools
-install ufsutils
 install vmfs-tools
 install ubuntu-zfs
-# Solo en ogLive basado en Ubuntu 14.04
-#install android-tools-adb
-#install android-tools-fastboot
-#install android-tools-fsutils
-#install f2fs-tools
+# Solo en ogLive anterior a Ubuntu 14.04
+#install ufsutils
+# Solo en ogLive basado en Ubuntu 14.04 o posterior
+install android-tools-adb
+install android-tools-fastboot
+install android-tools-fsutils
+install f2fs-tools
diff --git a/client/boot-tools/includes/usr/bin/boot-tools/listpackages/sw.filesystem.remote b/client/boot-tools/includes/usr/bin/boot-tools/listpackages/sw.filesystem.remote
index f0890b6b..dc5b2f2c 100644
--- a/client/boot-tools/includes/usr/bin/boot-tools/listpackages/sw.filesystem.remote
+++ b/client/boot-tools/includes/usr/bin/boot-tools/listpackages/sw.filesystem.remote
@@ -1,5 +1,5 @@
 #sw.filesystem.remote
-install nfs-common 
+#install nfs-common	# Provoca error de instalación en Ubuntu 15.04
 install sshfs 
 install cifs-utils
 install smbclient 
diff --git a/client/boot-tools/includes/usr/bin/boot-tools/listpackages/sw.networking b/client/boot-tools/includes/usr/bin/boot-tools/listpackages/sw.networking
index d8efd04e..ba2b6a5c 100644
--- a/client/boot-tools/includes/usr/bin/boot-tools/listpackages/sw.networking
+++ b/client/boot-tools/includes/usr/bin/boot-tools/listpackages/sw.networking
@@ -7,8 +7,8 @@ install trickle
 install lighttpd 
 install ethtool 
 install ssmping 
-install mii-diag
+#install mii-diag	# No existe en Ubuntu 15.04
 install tcpdump 
 install nmap
 install arping 
-install iptraf 
\ No newline at end of file
+install iptraf