#724: Incluir cambios aplicados en ogLive 1.1.0-rc2 y eliminar paquetes duplicados.

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

7 files changed, 12 insertions, 21 deletions

diff --git a/client/boot-tools/boottoolsfunctions.lib b/client/boot-tools/boottoolsfunctions.lib
index b9f3b468..02835885 100755
--- a/client/boot-tools/boottoolsfunctions.lib
+++ b/client/boot-tools/boottoolsfunctions.lib
@@ -83,10 +83,10 @@ case "${1,,}" in
 		OSARCH="i386"
 		OSHTTP="http://es.archive.ubuntu.com/ubuntu/"
 		;;
-	vivid) 	        # ogLive 1.1.0-rc1 basado en Ubuntu 15.04.
+	vivid) 	        # ogLive 1.1.0-rc2 basado en Ubuntu 15.04.
 		OSDISTRIB="ubuntu"
 		OSCODENAME="vivid"
-		OSRELEASE="3.19.0-31-generic"
+		OSRELEASE="3.19.0-49-generic"
 		OSARCH="i386"
 		OSHTTP="http://es.archive.ubuntu.com/ubuntu/"
 		;;
diff --git a/client/boot-tools/includes/etc/initramfs-tools/modules b/client/boot-tools/includes/etc/initramfs-tools/modules
index 4955ba4d..b3adada6 100644
--- a/client/boot-tools/includes/etc/initramfs-tools/modules
+++ b/client/boot-tools/includes/etc/initramfs-tools/modules
@@ -9,17 +9,17 @@
 # raid1
 # sd_mod
 
-# video Kernel 3.2 video.
-vga16b
-vesafb
-fbcon
+# Kernel 3.2 video.
+#vga16b
+#vesafb
+#fbcon
 
-# video Kernel 3.7 video.
-#uvesafb
+# Kernel 3.7+ video.
+uvesafb
 
 #generales
 usbcore
 uhci_hcd
 ehci_hcd
 usbhid
-mac-hid
\ No newline at end of file
+mac-hid
diff --git a/client/boot-tools/includes/usr/bin/boot-tools/listpackages/sw.Xwindow b/client/boot-tools/includes/usr/bin/boot-tools/listpackages/sw.Xwindow
index 85858cb1..5ff40943 100644
--- a/client/boot-tools/includes/usr/bin/boot-tools/listpackages/sw.Xwindow
+++ b/client/boot-tools/includes/usr/bin/boot-tools/listpackages/sw.Xwindow
@@ -9,5 +9,5 @@ install gparted
 #xvesa en compilacion 
 #install openbox
 #install midori
-# VESA Kernel 3.7
-#install v86d
+# VESA Kernel 3.7+
+install v86d
diff --git a/client/boot-tools/includes/usr/bin/boot-tools/listpackages/sw.Zinitrd b/client/boot-tools/includes/usr/bin/boot-tools/listpackages/sw.Zinitrd
deleted file mode 100644
index 7569b9c5..00000000
--- a/client/boot-tools/includes/usr/bin/boot-tools/listpackages/sw.Zinitrd
+++ /dev/null
@@ -1,3 +0,0 @@
-#sw.zinitrd 
-#install busybox-static  
-#install bash-static 
diff --git a/client/boot-tools/includes/usr/bin/boot-tools/listpackages/sw.basic b/client/boot-tools/includes/usr/bin/boot-tools/listpackages/sw.basic
index 7708c146..82a42425 100644
--- a/client/boot-tools/includes/usr/bin/boot-tools/listpackages/sw.basic
+++ b/client/boot-tools/includes/usr/bin/boot-tools/listpackages/sw.basic
@@ -18,3 +18,4 @@ install dmidecode
 install realpath
 install rpm
 install sqlite3
+install os-prober
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 02122728..5cf4d8bd 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
@@ -7,6 +7,4 @@ install make
 install m4 
 install gettext 
 install libmhash-dev 
-install gdebi-core 
-install gawk
 
diff --git a/client/boot-tools/includes/usr/bin/boot-tools/listpackages/sw.testing b/client/boot-tools/includes/usr/bin/boot-tools/listpackages/sw.testing
index 9d5ed1d3..15aae730 100644
--- a/client/boot-tools/includes/usr/bin/boot-tools/listpackages/sw.testing
+++ b/client/boot-tools/includes/usr/bin/boot-tools/listpackages/sw.testing
@@ -12,11 +12,9 @@ install python-requests
 ##############
 #install discover 
 #install laptop-detect 
-install os-prober  
 #install casper 
 #install lupin-casper
 #install xinit 
-#install openbox 
 #install obconf 
 #install xserver-xorg 
 #install x11-xserver-utils 
@@ -47,20 +45,17 @@ install os-prober
 #install nitrogen 
 #install ttf-ubuntu-font-family
 #install time 
-#install hdparm 
 #install openssh-client 
 #install synaptic 
 #install libglib-perl 
 #install libgtk2-perl 
 #install libxml-simple-perl 
-#install rsync 
 #install smartmontools 
 #install gnome-disk-utility 
 #install policykit-1-gnome 
 #install policykit-desktop-privileges 
 #install baobab 
 #install lshw-gtk 
-#install testdisk 
 #install usb-creator-gtk 
 #install wodim 
 #install curlftpfs