From 738d8e11c7addc136ccc8d6a538c8f16a9ae0b2f Mon Sep 17 00:00:00 2001
From: Michael Hudson-Doyle <michael.hudson@canonical.com>
Date: Thu, 31 May 2018 11:58:58 +1200
Subject: [PATCH] oops

---
 subiquity/models/subiquity.py | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/subiquity/models/subiquity.py b/subiquity/models/subiquity.py
index 0d234a44..6e171ac4 100644
--- a/subiquity/models/subiquity.py
+++ b/subiquity/models/subiquity.py
@@ -76,17 +76,6 @@ class SubiquityModel:
             }
         if user.ssh_keys:
             user_info['ssh_authorized_keys'] = user.ssh_keys
-        if self.snaplist.to_install:
-            cmds = []
-            for snap_name, selection in self.snaplist.to_install.items():
-                cmd = ['snap', 'install', '--channel=' + selection.channel]
-                if selection.is_classic:
-                    cmd.append('--classic')
-                cmd.append(snap_name)
-                cmds.append(' '.join(cmd))
-            user_info['snap'] = {
-                'commands': cmds,
-                }
         config = {
             'growpart': {
                 'mode': 'off',
@@ -96,6 +85,17 @@ class SubiquityModel:
             'resize_rootfs': False,
             'users': [user_info],
         }
+        if self.snaplist.to_install:
+            cmds = []
+            for snap_name, selection in self.snaplist.to_install.items():
+                cmd = ['snap', 'install', '--channel=' + selection.channel]
+                if selection.is_classic:
+                    cmd.append('--classic')
+                cmd.append(snap_name)
+                cmds.append(' '.join(cmd))
+            config['snap'] = {
+                'commands': cmds,
+                }
         return config
 
     def _cloud_init_files(self):