From 5452beee2b9b2c18369845be8dab478c557e3d4a Mon Sep 17 00:00:00 2001
From: ramon <ramongomez@us.es>
Date: Fri, 26 Aug 2016 10:32:56 +0000
Subject: [PATCH] =?UTF-8?q?#724:=20Adaptaci=C3=B3n=20de=20ogLive=20basado?=
 =?UTF-8?q?=20en=20Ubuntu=2016.04:=20=20*=20Actualizar=20lista=20de=20m?=
 =?UTF-8?q?=C3=B3dulos=20de=20v=C3=ADdeo=20que=20no=20deben=20cargarse=20y?=
 =?UTF-8?q?=20cargar=20m=C3=B3dulo=20de=20rat=C3=B3n=20USB.=20=20*=20Mostr?=
 =?UTF-8?q?ar=20resoluci=C3=B3n=20de=20pantalla=20y=20driver=20por=20defec?=
 =?UTF-8?q?to,=20si=20solo=20hay=20una=20opci=C3=B3n=20disponible.=20=20*?=
 =?UTF-8?q?=20Soportar=20resoluci=C3=B3n=20por=20defecto=20para=20m=C3=B3d?=
 =?UTF-8?q?ulo=20uvesafb=20({{{video=3Duvesafb:D}}}).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://opengnsys.es/svn/branches/version1.1@4999 a21b9725-9963-47de-94b9-378ad31fedc9
---
 includes/etc/initramfs-tools/modules          |  1 +
 .../etc/initramfs-tools/scripts/ogfunctions   | 36 ++++++++++---------
 .../etc/modprobe.d/blacklist-framebuffer.conf |  3 +-
 3 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/includes/etc/initramfs-tools/modules b/includes/etc/initramfs-tools/modules
index b3adada..8300452 100644
--- a/includes/etc/initramfs-tools/modules
+++ b/includes/etc/initramfs-tools/modules
@@ -22,4 +22,5 @@ usbcore
 uhci_hcd
 ehci_hcd
 usbhid
+usbmouse
 mac-hid
diff --git a/includes/etc/initramfs-tools/scripts/ogfunctions b/includes/etc/initramfs-tools/scripts/ogfunctions
index 0c2ffb9..1175c7c 100644
--- a/includes/etc/initramfs-tools/scripts/ogfunctions
+++ b/includes/etc/initramfs-tools/scripts/ogfunctions
@@ -82,26 +82,28 @@ ogChangeVideoResolution ()
 {
 # Variables locales.
 local DRIVER MODE
-# Obtener driver y resolución.
-DRIVER="$(echo $video|cut -f1 -d:)"
-MODE="$(echo $video|cut -f2 -d:)"
-case "$DRIVER" in
-	# Cambiar resolución para driver "uvesafb".
-	uvesafb)
-		# Mantener resolución por defecto si solo hay una opción disponible.
-		if [ $(awk 'END {print NR}' /sys/class/graphics/fb0/modes) -eq 1 ]; then
-			echo "Default screen mode: $(awk -F"[:-]" '{print $2}' /sys/class/graphics/fb0/modes),$(cat /sys/class/graphics/fb0/bits_per_pixel)bpp."
-		else
+# Mostrar resolución y driver por defecto si solo hay una opción disponible.
+if [ $(grep -c "" /sys/class/graphics/fb0/modes) -eq 1 ]; then
+	echo "Default screen mode: $(cat /sys/class/graphics/fb0/modes),$(cat /sys/class/graphics/fb0/bits_per_pixel)bpp$(lsmod|awk '$1=="video" && $3>0 {printf " (%s)",$4}')."
+else
+	# Obtener driver y resolución.
+	DRIVER="$(echo $video|cut -f1 -d:)"
+	MODE="$(echo $video|cut -f2 -d:)"
+	case "$DRIVER" in
+		# Cambiar resolución para driver "uvesafb".
+		uvesafb)
+			# Obtener modo por defecto si parámetro "video=uvesafb:D".
+			[ "$MODE" == "D" ] && MODE=$(awk -F: '$1=="D" {print $2; nextfile}' /sys/class/graphics/fb0/modes)
 			# Cambiar resolución según valor del parámetro "video".
-			grep ":$(echo $MODE|cut -f1 -d-)p" /sys/class/graphics/fb0/modes | head -1 > /sys/class/graphics/fb0/mode 2>&1 || MODE="640x480-16"
+			grep ":$(echo ${MODE/p/}|cut -f1 -d-)p" /sys/class/graphics/fb0/modes | head -1 > /sys/class/graphics/fb0/mode 2>&1
 			echo "$(echo $MODE|cut -f2 -d-)" > /sys/class/graphics/fb0/bits_per_pixel 2>&1
 			echo "Screen mode: $(cat /sys/class/graphics/fb0/mode),$(cat /sys/class/graphics/fb0/bits_per_pixel)bpp."
-		fi
-		;;
-	# Resolución por defecto para el resto de casos.
-	*)	echo "Unknown video driver, using default mode."
-		;;
-esac
+			;;
+		# Resolución por defecto para el resto de casos.
+		*)	echo "Unknown video driver, using default mode."
+			;;
+	esac
+fi
 }
 
 
diff --git a/includes/etc/modprobe.d/blacklist-framebuffer.conf b/includes/etc/modprobe.d/blacklist-framebuffer.conf
index 8b047e4..51a9ac6 100644
--- a/includes/etc/modprobe.d/blacklist-framebuffer.conf
+++ b/includes/etc/modprobe.d/blacklist-framebuffer.conf
@@ -10,6 +10,7 @@ blacklist cyblafb
 blacklist gx1fb
 blacklist hgafb
 blacklist i810fb
+blacklist i915_bpo
 blacklist intelfb
 blacklist kyrofb
 blacklist lxfb
@@ -17,6 +18,7 @@ blacklist matroxfb_base
 blacklist neofb
 blacklist nvidiafb
 blacklist pm2fb
+blacklist radeon
 blacklist rivafb
 blacklist s1d13xxxfb
 blacklist savagefb
@@ -24,7 +26,6 @@ blacklist sisfb
 blacklist sstfb
 blacklist tdfxfb
 blacklist tridentfb
-#blacklist vesafb
 blacklist vfb
 blacklist viafb
 blacklist vt8623fb