[debian-edu-commits] r81013 - trunk/src/build/CD-administrator

[pere at alioth.debian.org]

Author: pere
Date: 2013-06-21 13:15:36 +0000 (Fri, 21 Jun 2013)
New Revision: 81013

Modified:
   trunk/src/build/CD-administrator/debian-cd.patch.wheezy
Log:
Make sure to set cd_type also for not complete isos.

Modified: trunk/src/build/CD-administrator/debian-cd.patch.wheezy
===================================================================
--- trunk/src/build/CD-administrator/debian-cd.patch.wheezy	2013-06-21 11:35:52 UTC (rev 81012)
+++ trunk/src/build/CD-administrator/debian-cd.patch.wheezy	2013-06-21 13:15:36 UTC (rev 81013)
@@ -156,3 +156,33 @@
          $diskdesc = "4.7GB DVD";
      } elsif ($chosen_disk eq "DLDVD") {
          $maxdiskblocks = int(8500 * $MB / $blocksize) - $reserved;
+diff -ur debian-cd.unpatched.wheezy/tools/start_new_disc debian-cd/tools/start_new_disc
+--- debian-cd.unpatched.wheezy/tools/start_new_disc	2013-06-17 22:55:07.000000000 +0200
++++ debian-cd/tools/start_new_disc	2013-06-21 15:07:54.000000000 +0200
+@@ -150,7 +150,25 @@
+             fi
+         fi
+     else
+-        echo "not_complete" > $CDDIR/.disk/cd_type
++        if [ $DISKTYPE = DVD ] || [ $DISKTYPE = DLDVD ]; then
++            if [ "$MAXCDS"x = "1"x ]; then
++                echo "dvd/single/not_complete" > $CDDIR/.disk/cd_type
++            else
++                echo "dvd/not_complete" > $CDDIR/.disk/cd_type
++            fi
++        elif [ $DISKTYPE = BD ] || [ $DISKTYPE = DLBD ]; then
++            if [ "$MAXCDS"x = "1"x ]; then
++                echo "bluray/single/not_complete" > $CDDIR/.disk/cd_type
++            else
++                echo "bluray/not_complete" > $CDDIR/.disk/cd_type
++            fi
++        else
++            if [ "$MAXCDS"x = "1"x ]; then
++                echo "cd/single/not_complete" > $CDDIR/.disk/cd_type
++            else
++                echo "cd/not_complete" > $CDDIR/.disk/cd_type
++            fi
++        fi
+     fi
+ 
+     if [ $NUM_ARCHES -gt 1 ]; then