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

[pere at alioth.debian.org]

Author: pere
Date: 2013-06-25 08:39:02 +0000 (Tue, 25 Jun 2013)
New Revision: 81155

Modified:
   branches/wheezy/debian-edu-config/debian/changelog
   branches/wheezy/debian-edu-config/sbin/debian-edu-hwsetup
Log:
Remove code from debian-edu-hwsetup to install firmware packages,
as this is also done better in auto-addfirmware.

Modified: branches/wheezy/debian-edu-config/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-config/debian/changelog	2013-06-25 07:52:39 UTC (rev 81154)
+++ branches/wheezy/debian-edu-config/debian/changelog	2013-06-25 08:39:02 UTC (rev 81155)
@@ -1,5 +1,14 @@
+debian-edu-config (1.708~svn81155) UNRELEASED; urgency=low
+
+  [ Petter Reinholdtsen ]
+  * Remove code from debian-edu-hwsetup to install firmware packages,
+    as this is also done better in auto-addfirmware.
+
+ -- Petter Reinholdtsen <pere at debian.org>  Tue, 25 Jun 2013 10:37:49 +0200
+
 debian-edu-config (1.708~svn81154) wheezy-test; urgency=low
 
+  [ Petter Reinholdtsen ]
   * Add dependency on lsb-release to make sure the lsb_release program
     is available when scripts try to figure out the release code name.
   * Updated debian-edu-hwsetup, rewrote PCI device detection system to

Modified: branches/wheezy/debian-edu-config/sbin/debian-edu-hwsetup
===================================================================
--- branches/wheezy/debian-edu-config/sbin/debian-edu-hwsetup	2013-06-25 07:52:39 UTC (rev 81154)
+++ branches/wheezy/debian-edu-config/sbin/debian-edu-hwsetup	2013-06-25 08:39:02 UTC (rev 81155)
@@ -83,17 +83,5 @@
 	;;
 esac
 
-# Kernel module specific overrides
-for module in $(lsmod|awk '{print $1}') ; do
-    case "$module" in
-	iwlwifi)
-	    add_nonfree_pkg firmware-iwlwifi
-	    ;;
-	b43)
-	    add_nonfree_pkg firmware-b43-installer
-	    ;;
-    esac
-done
-
 # Autodetect firmware packages and install them
 /usr/share/debian-edu-config/tools/auto-addfirmware