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

[pere at alioth.debian.org]

Author: pere
Date: 2013-06-21 13:35:50 +0000 (Fri, 21 Jun 2013)
New Revision: 81017

Modified:
   branches/wheezy/debian-edu-install/debian-edu-profile
   branches/wheezy/debian-edu-install/debian/changelog
Log:
Do not recognize ISO type (cd_type) 'not_complete' as
non-networked ISOs when checking if there is required network
during installation, now that the ISO build is patched to set type
dvd and bluray for non-complete DVD and Blueray builds.

Modified: branches/wheezy/debian-edu-install/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-install/debian/changelog	2013-06-21 13:17:38 UTC (rev 81016)
+++ branches/wheezy/debian-edu-install/debian/changelog	2013-06-21 13:35:50 UTC (rev 81017)
@@ -1,3 +1,13 @@
+debian-edu-install (1.713~svn80974) UNRELEASED; urgency=low
+
+  [ Petter Reinholdtsen ]
+  * Do not recognize ISO type (cd_type) 'not_complete' as
+    non-networked ISOs when checking if there is required network
+    during installation, now that the ISO build is patched to set type
+    dvd and bluray for non-complete DVD and Blueray builds.
+
+ -- Petter Reinholdtsen <pere at debian.org>  Fri, 21 Jun 2013 15:33:38 +0200
+
 debian-edu-install (1.713~svn80973) wheezy-test; urgency=low
 
   [ Petter Reinholdtsen ]

Modified: branches/wheezy/debian-edu-install/debian-edu-profile
===================================================================
--- branches/wheezy/debian-edu-install/debian-edu-profile	2013-06-21 13:17:38 UTC (rev 81016)
+++ branches/wheezy/debian-edu-install/debian-edu-profile	2013-06-21 13:35:50 UTC (rev 81017)
@@ -482,7 +482,7 @@
 db_register debian-installer/dummy apt-setup/local0/key
 
 archstr=$(/bin/archdetect)
-if [ -f /cdrom/.disk/cd_type ] && egrep -iq 'dvd|bluray|not_complete' /cdrom/.disk/cd_type; then
+if [ -f /cdrom/.disk/cd_type ] && egrep -iq 'dvd|bluray' /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