From a81a6d4f2f048897d0a008d3bde35ac0d1b05f55 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Feb 24 2018 00:24:28 +0000
Subject: Update the volume ID substitutions list


Some newer subvariants / loadouts were missing from the
substitution list. This updates it, alphabetizes it, corrects
the indentation, and adds a better comment about what it's for.

Note https://pagure.io/koji/pull-request/817 , corresponding
pull request for Koji.

Signed-off-by: Adam Williamson <awilliam@redhat.com>

---

diff --git a/fedora.conf b/fedora.conf
index 20b855f..5fa8af4 100644
--- a/fedora.conf
+++ b/fedora.conf
@@ -243,30 +243,37 @@ image_volid_formats = [
      ]
 # No special handling for layered products, use same format as for regular images
 image_volid_layered_product_formats = []
-# Replace 'Cloud' with 'C' in volume id etc.
+# Used by Pungi to replace 'Cloud' with 'C' (etc.) in ISO volume IDs.
+# There is a hard 32-character limit on ISO volume IDs, so we use
+# these to try and produce short enough but legible IDs. Note this is
+# duplicated in Koji for live images, as livemedia-creator does not
+# allow Pungi to tell it what volume ID to use. Note:
+# https://fedoraproject.org/wiki/User:Adamwill/Draft_fedora_image_naming_policy
 # '-Workstation-' is a temporary workaround. See
 # https://pagure.io/pungi-fedora/pull-request/525
 volume_id_substitutions = {
-           'Atomic': 'AH',
-          'Rawhide': 'rawh',
-           'Images': 'img',
-      'MATE_Compiz': 'MATE',
-         'Security': 'Sec',
-   'Electronic_Lab': 'Elec',
-         'Robotics': 'Robo',
-   'Scientific_KDE': 'SciK',
-    'Astronomy_KDE': 'AstK',
-     'Design_suite': 'Dsgn',
-            'Games': 'Game',
-          'Jam_KDE': 'Jam',
-'WorkstationOstree': 'WS',
-    '-Workstation-': '-WS-',
-       'Everything': 'E',
-           'Server': 'S',
-            'Cloud': 'C',
-            'Alpha': 'A',
-             'Beta': 'B',
-               'TC': 'T',
+                 'Beta': 'B',
+              'Rawhide': 'rawh',
+        'Astronomy_KDE': 'AstK',
+               'Atomic': 'AH',
+             'Cinnamon': 'Cinn',
+                'Cloud': 'C',
+         'Design_suite': 'Dsgn',
+       'Electronic_Lab': 'Elec',
+           'Everything': 'E',
+                'Games': 'Game',
+               'Images': 'img',
+              'Jam_KDE': 'Jam',
+          'MATE_Compiz': 'MATE',
+     # Note https://pagure.io/pungi-fedora/issue/533
+     'Python-Classroom': 'Clss',
+     'Python_Classroom': 'Clss',
+             'Robotics': 'Robo',
+       'Scientific_KDE': 'SciK',
+             'Security': 'Sec',
+               'Server': 'S',
+        '-Workstation-': '-WS-',
+    'WorkstationOstree': 'WS',
 }
 
 disc_types = {