[debian-edu-commits] debian-edu/ 01/01: Correct URL selection logic in isenkram-autoinstall-firmware to also handle the main repo for non-Wheezy installation.

[Petter Reinholdtsen]

This is an automated email from the git hooks/post-receive script.

pere pushed a commit to branch master
in repository debian-edu-config.

commit 82e1b1a32954f5ca3d8ab4605911e01b1d30c6ac
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Tue Oct 14 10:51:29 2014 +0200

    Correct URL selection logic in isenkram-autoinstall-firmware to also handle the main repo for non-Wheezy installation.
---
 debian/changelog                               | 7 ++++---
 share/debian-edu-config/tools/auto-addfirmware | 6 +++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 68e80f3..f92ec72 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,7 +18,6 @@ debian-edu-config (1.810) UNRELEASED; urgency=high
       effects.
   * etc/apache2/*: Adjust conf files to use new directives.
 
-
   [ Petter Reinholdtsen ]
   * Enable the auto flag in the PXE installation, to allow more settings
     to be fetched from the preseed file.
@@ -51,6 +50,10 @@ debian-edu-config (1.810) UNRELEASED; urgency=high
     that the DNS server name is hardcoded.
   * Adjust cf.squid, make sure to run squid-update-cachedir on the
     squid3 config file.
+  * Extend auto-addfirmware to also look in dmesg for requested
+    firmware.
+  * Correct URL selection logic in isenkram-autoinstall-firmware to also
+    handle the main repo for non-Wheezy installation.
 
   [ Holger Levsen ]
   * debian/rules: Convert to dh9 style rules.
@@ -62,8 +65,6 @@ debian-edu-config (1.810) UNRELEASED; urgency=high
   [ Petter Reinholdtsen ]
   * Rewrite init-ltsp.d/60-edu-client to disable all services the same
     way, reduce duplicate code and work with sysv-rc based systems too.
-  * Extend auto-addfirmware to also look in dmesg for requested
-    firmware.
 
  -- Wolfgang Schweer <wschweer at arcor.de>  Tue, 07 Oct 2014 12:47:06 +0200
 
diff --git a/share/debian-edu-config/tools/auto-addfirmware b/share/debian-edu-config/tools/auto-addfirmware
index a95fd25..b85f2f5 100644
--- a/share/debian-edu-config/tools/auto-addfirmware
+++ b/share/debian-edu-config/tools/auto-addfirmware
@@ -50,9 +50,9 @@ cleanup() {
     rm -rf $tmpdir
 }
 
-# "" is main in Wheezy.
-for section in "" "contrib" "non-free"; do
-    if [ -z "$section" ] ; then
+for section in "main" "contrib" "non-free"; do
+    # "" is main in Wheezy.
+    if [  main = "$section" ] && [ wheezy = "$dist" ]; then
 	url="$mirror/dists/$dist/Contents-$arch.gz"
     else
 	url="$mirror/dists/$dist/$section/Contents-$arch.gz"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-config.git