[debian-edu-commits] r80968 - in branches/wheezy/debian-edu-install: . debian

[pere at alioth.debian.org]

Author: pere
Date: 2013-06-20 20:33:37 +0000 (Thu, 20 Jun 2013)
New Revision: 80968

Modified:
   branches/wheezy/debian-edu-install/debian-edu-profile
   branches/wheezy/debian-edu-install/debian/changelog
Log:
Recognize bluray and custom ISOs as non-networked ISOs when checking
if there is required network during installation.

Modified: branches/wheezy/debian-edu-install/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-install/debian/changelog	2013-06-20 04:48:03 UTC (rev 80967)
+++ branches/wheezy/debian-edu-install/debian/changelog	2013-06-20 20:33:37 UTC (rev 80968)
@@ -1,3 +1,11 @@
+debian-edu-install (1.713~svn80885) UNRELEASED; urgency=low
+
+  [ Petter Reinholdtsen ]
+  * Recognize bluray and custom ISOs as non-networked ISOs when checking
+    if there is required network during installation.
+
+ -- Petter Reinholdtsen <pere at debian.org>  Thu, 20 Jun 2013 22:33:16 +0200
+
 debian-edu-install (1.713~svn80884) wheezy-test; urgency=low
 
   * Update version to "7.1+edu0~a3" (to be consistent with Debian and our

Modified: branches/wheezy/debian-edu-install/debian-edu-profile
===================================================================
--- branches/wheezy/debian-edu-install/debian-edu-profile	2013-06-20 04:48:03 UTC (rev 80967)
+++ branches/wheezy/debian-edu-install/debian-edu-profile	2013-06-20 20:33:37 UTC (rev 80968)
@@ -482,8 +482,8 @@
 db_register debian-installer/dummy apt-setup/local0/key
 
 archstr=$(/bin/archdetect)
-if [ -f /cdrom/.disk/cd_type ] && grep -iq dvd /cdrom/.disk/cd_type; then
-    #disable mirror usage if we install from dvd
+if [ -f /cdrom/.disk/cd_type ] && egrep -iq 'dvd|bluray|not_complete' /cdrom/.disk/cd_type; then
+    #disable mirror usage if we install from dvd or the usb sticks
     db_set "apt-setup/use_mirror" false 
     db_fset "apt-setup/use_mirror" seen true || true
     log "disabling mirror selection on dvd's"