[debian-edu-commits] r81187 - in branches/wheezy/debian-edu-config: debian sbin

[pere at alioth.debian.org]

Author: pere
Date: 2013-06-26 17:48:13 +0000 (Wed, 26 Jun 2013)
New Revision: 81187

Modified:
   branches/wheezy/debian-edu-config/debian/changelog
   branches/wheezy/debian-edu-config/sbin/debian-edu-hwsetup
Log:
Rewrite debian-edu-hwsetup quirk for Packard Bell EasyNote LV to
use acpi_backlight=vendor instad of i915.invert_brightness=1, as
this stop KDE from turning off the screen during login.

Modified: branches/wheezy/debian-edu-config/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-config/debian/changelog	2013-06-26 13:36:10 UTC (rev 81186)
+++ branches/wheezy/debian-edu-config/debian/changelog	2013-06-26 17:48:13 UTC (rev 81187)
@@ -5,6 +5,9 @@
     black screen of death.
   * Drop NFS package size settings (rsize/wsize=32768) from NFSv4
     automount rules, as the default kernel setting is ok.
+  * Rewrite debian-edu-hwsetup quirk for Packard Bell EasyNote LV to
+    use acpi_backlight=vendor instad of i915.invert_brightness=1, as
+    this stop KDE from turning off the screen during login.
 
  -- Petter Reinholdtsen <pere at debian.org>  Wed, 26 Jun 2013 15:32:46 +0200
 

Modified: branches/wheezy/debian-edu-config/sbin/debian-edu-hwsetup
===================================================================
--- branches/wheezy/debian-edu-config/sbin/debian-edu-hwsetup	2013-06-26 13:36:10 UTC (rev 81186)
+++ branches/wheezy/debian-edu-config/sbin/debian-edu-hwsetup	2013-06-26 17:48:13 UTC (rev 81187)
@@ -39,6 +39,18 @@
     apt-get -qq install -y $pkg
 }
 
+acpi_backlight_vendor() {
+    append_if_missing /etc/grub.d/50_edu_hwsetup.cfg \
+	'GRUB_CMDLINE_LINUX_DEFAULT="$GRUB_CMDLINE_LINUX_DEFAULT acpi_backlight=vendor"'
+    update-grub
+}
+
+i915_invert_brightness() {
+    append_if_missing /etc/modprobe.d/i915.conf \
+        "options i915 invert_brightness=1"
+    update-initramfs -u -k all
+}
+
 info "looking for PCI device specific overrides"
 for modaliasfile in /sys/bus/pci/devices/*/modalias; do
     modalias="$(cat $modaliasfile)"
@@ -46,30 +58,14 @@
         # Workaround for BTS report #710938 (Packard Bell EasyNote LV)
         # See http://www.linlap.com/packard_bell_easynote_lv
         pci:v00008086d00000156sv00001025sd00000688bc*)
-            append_if_missing /etc/modprobe.d/i915.conf \
-                "options i915 invert_brightness=1"
-            update-initramfs -u -k all
-
-            # Workaround for BTS report #711237 in KDE powerdevil.
-            # This will be overwritten every time kde-workspace-bin is
-            # upgraded, so it isn't really a sensible fix.  Also, it
-            # turn off power management completely in KDE.
-            if false && \
-                [ -e /usr/share/kde4/services/kded/powerdevil.desktop ] ; then
-                update-ini-file \
-                    /usr/share/kde4/services/kded/powerdevil.desktop> \
-                    'Desktop Entry' \
-                    'X-KDE-Kded-autoload' false
-            fi
+            acpi_backlight_vendor
             ;;
 
-	# Workaround for BTS report #714154 (Acer Aspire V3-771G model
-	# VA70)
+        # Workaround for BTS report #714154 (Acer Aspire V3-771G model
+        # VA70)
         pci:v00008086d00000166sv00001025sd00000686bc*)
-            append_if_missing /etc/modprobe.d/i915.conf \
-                "options i915 invert_brightness=1"
-            update-initramfs -u -k all
-	    ;;
+            i915_invert_brightness
+            ;;
     esac
 done