From e5e137fff226e6130432a6966f8f1cae9d41dc8b Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@fedoraproject.org>
Date: Aug 11 2018 13:10:17 +0000
Subject: Merge #631 `Renaming AtomicWorkstation to Silverblue`


---

diff --git a/fedora-cloud.conf b/fedora-cloud.conf
index c91734f..384a1ac 100644
--- a/fedora-cloud.conf
+++ b/fedora-cloud.conf
@@ -182,7 +182,7 @@ volume_id_substitutions = {
               'Rawhide': 'rawh',
         'Astronomy_KDE': 'AstK',
            'AtomicHost': 'AH',
-    'AtomicWorkstation': 'AW',
+           'Silverblue': 'SB',
              'Cinnamon': 'Cinn',
                 'Cloud': 'C',
          'Design_suite': 'Dsgn',
diff --git a/fedora-container.conf b/fedora-container.conf
index e0a7839..28c1563 100644
--- a/fedora-container.conf
+++ b/fedora-container.conf
@@ -182,7 +182,7 @@ volume_id_substitutions = {
               'Rawhide': 'rawh',
         'Astronomy_KDE': 'AstK',
            'AtomicHost': 'AH',
-    'AtomicWorkstation': 'AW',
+           'Silverblue': 'SB',
              'Cinnamon': 'Cinn',
                 'Cloud': 'C',
          'Design_suite': 'Dsgn',
diff --git a/fedora.conf b/fedora.conf
index e2e48e3..35cd126 100644
--- a/fedora.conf
+++ b/fedora.conf
@@ -262,7 +262,7 @@ volume_id_substitutions = {
               'Rawhide': 'rawh',
         'Astronomy_KDE': 'AstK',
            'AtomicHost': 'AH',
-    'AtomicWorkstation': 'AW',
+           'Silverblue': 'SB',
              'Cinnamon': 'Cinn',
                 'Cloud': 'C',
          'Design_suite': 'Dsgn',
@@ -779,7 +779,7 @@ ostree = [
             'failable': ['*'],
         }
     }),
-    ("^AtomicWorkstation$", {
+    ("^Silverblue$", {
         "x86_64": {
             "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",
             "treefile": "fedora-atomic-workstation.json",
@@ -847,7 +847,7 @@ ostree_installer = [
             'failable': ['*'],
         }
     }),
-    ("^AtomicWorkstation$", {
+    ("^Silverblue$", {
         "x86_64": {
             "repo": "Everything",
             "release": None,
diff --git a/nightly.sh b/nightly.sh
index e4b1485..0733568 100755
--- a/nightly.sh
+++ b/nightly.sh
@@ -112,12 +112,12 @@ fi
 $RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=x86_64 --arch src \
     "$DESTDIR" "$RSYNCTARGET/" \
     --variant Everything --variant AtomicHost --variant Cloud --variant Container \
-    --variant Server --variant Spins --variant Workstation --variant AtomicWorkstation --variant Modular \
+    --variant Server --variant Spins --variant Workstation --variant Silverblue --variant Modular \
     --link-dest="$RSYNCTARGET/Everything" --exclude=repodata
 $RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=x86_64 --arch src \
     "$DESTDIR" "$RSYNCTARGET/" \
     --variant Everything --variant AtomicHost --variant Cloud --variant Container \
-    --variant Server --variant Spins --variant Workstation --variant AtomicWorkstation --variant Modular \
+    --variant Server --variant Spins --variant Workstation --variant Silverblue --variant Modular \
     --link-dest="$RSYNCTARGET/Everything" --delete-after
 # aarch64 for Everything Server Cloud Container is primary
 $RSYNCPREFIX compose-partial-copy --arch=aarch64 \
diff --git a/variants-fedora.xml b/variants-fedora.xml
index fba3487..03d680c 100644
--- a/variants-fedora.xml
+++ b/variants-fedora.xml
@@ -121,7 +121,7 @@
           <environment display_order="10">workstation-product-environment</environment>
         </environments>
     </variant>
-    <variant id="AtomicWorkstation" name="AtomicWorkstation" type="variant" is_empty="true">
+    <variant id="Silverblue" name="Silverblue" type="variant" is_empty="true">
         <arches>
             <arch>aarch64</arch>
             <arch>armhfp</arch>