[debian-edu-commits] r81236 - in branches/wheezy/debian-edu-config: debian share/debian-edu-config/tools

[pere at alioth.debian.org]

Author: pere
Date: 2013-06-28 10:35:35 +0000 (Fri, 28 Jun 2013)
New Revision: 81236

Modified:
   branches/wheezy/debian-edu-config/debian/changelog
   branches/wheezy/debian-edu-config/share/debian-edu-config/tools/auto-addfirmware
Log:
Adjust auto-addfirmware and make sure to add contrib and non-free
when trying to install the firmware-b43-installer package on
machines needing it.

Modified: branches/wheezy/debian-edu-config/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-config/debian/changelog	2013-06-28 10:17:22 UTC (rev 81235)
+++ branches/wheezy/debian-edu-config/debian/changelog	2013-06-28 10:35:35 UTC (rev 81236)
@@ -8,6 +8,9 @@
   * Correct path to d-i PXE boot images used by our PXE setup when
     using the debian-installer-7.0-netboot-i386 and
     debian-installer-7.0-netboot-amd64 packages.
+  * Adjust auto-addfirmware and make sure to add contrib and non-free
+    when trying to install the firmware-b43-installer package on
+    machines needing it.
 
  -- Petter Reinholdtsen <pere at debian.org>  Fri, 28 Jun 2013 12:07:11 +0200
 

Modified: branches/wheezy/debian-edu-config/share/debian-edu-config/tools/auto-addfirmware
===================================================================
--- branches/wheezy/debian-edu-config/share/debian-edu-config/tools/auto-addfirmware	2013-06-28 10:17:22 UTC (rev 81235)
+++ branches/wheezy/debian-edu-config/share/debian-edu-config/tools/auto-addfirmware	2013-06-28 10:35:35 UTC (rev 81236)
@@ -10,6 +10,13 @@
 arch=$(dpkg --print-architecture)
 mirror=http://http.debian.net/debian
 
+add_contrib_nonfree() {
+    cat <<EOF > /etc/apt/sources.list.d/auto-addfirmware.list
+deb $mirror $dist contrib non-free
+deb-src $mirror $dist contrib non-free
+EOF
+}
+
 # Find firmware files requested by loaded kernel drivers.
 for fwfile in $(for module in $(awk '{print $1}' /proc/modules) ; do modinfo $module 2>/dev/null |awk '/^firmware:/ {print $2}'; done|sort -u); do
     if [ ! -e /lib/firmware/$fwfile ] ; then
@@ -39,6 +46,7 @@
 	# by Debian.
 	case "$fwfile" in
 	    b43/*)
+		add_contrib_nonfree
 		binpkgs="${binpkgs:+$binpkgs }firmware-b43-installer"
 		;;
 	esac
@@ -52,11 +60,8 @@
     echo $binpkginfo |  while IFS=/ read section srcpkg binpkg ; do
         echo $binpkg
 # Enable the non-free section if it is needed
-	if [ non-free = "$section" ] ; then 
-	    cat <<EOF > /etc/apt/sources.list.d/auto-addfirmware.list
-deb $mirror $dist non-free
-deb-src $mirror $dist non-free
-EOF
+	if [ non-free = "$section" ] ; then
+	    add_contrib_nonfree
 	fi
     done
 done)"