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

[pere at alioth.debian.org]

Author: pere
Date: 2013-06-26 20:39:06 +0000 (Wed, 26 Jun 2013)
New Revision: 81190

Modified:
   branches/wheezy/debian-edu-config/debian/changelog
   branches/wheezy/debian-edu-config/sbin/debian-edu-hwsetup
Log:
Move kernel option set by debian-edu-hwsetup from /etc/grub.d/ to
/etc/default/grub, where it actually have effect.

Modified: branches/wheezy/debian-edu-config/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-config/debian/changelog	2013-06-26 17:50:02 UTC (rev 81189)
+++ branches/wheezy/debian-edu-config/debian/changelog	2013-06-26 20:39:06 UTC (rev 81190)
@@ -1,3 +1,11 @@
+debian-edu-config (1.708~svn81186) UNRELEASED; urgency=low
+
+  [ Petter Reinholdtsen ]
+  * Move kernel option set by debian-edu-hwsetup from /etc/grub.d/ to
+    /etc/default/grub, where it actually have effect.
+
+ -- Petter Reinholdtsen <pere at debian.org>  Wed, 26 Jun 2013 22:38:07 +0200
+
 debian-edu-config (1.708~svn81185) wheezy-test; urgency=low
 
   [ Petter Reinholdtsen ]

Modified: branches/wheezy/debian-edu-config/sbin/debian-edu-hwsetup
===================================================================
--- branches/wheezy/debian-edu-config/sbin/debian-edu-hwsetup	2013-06-26 17:50:02 UTC (rev 81189)
+++ branches/wheezy/debian-edu-config/sbin/debian-edu-hwsetup	2013-06-26 20:39:06 UTC (rev 81190)
@@ -40,7 +40,7 @@
 }
 
 acpi_backlight_vendor() {
-    append_if_missing /etc/grub.d/50_edu_hwsetup.cfg \
+    append_if_missing /etc/default/grub \
 	'GRUB_CMDLINE_LINUX_DEFAULT="$GRUB_CMDLINE_LINUX_DEFAULT acpi_backlight=vendor"'
     update-grub
 }