Merge ~xnox/snappy-device-agents:add-cloudimg-rootfs-label into snappy-device-agents:master

[Dimitri John Ledkov]

add cloudimg-rootfs label support

[Dimitri John Ledkov (xnox)]

I hope with this https://people.canonical.com/~xnox/riscv64/livecd.ubuntu-cpc.disk1.qcow2.img just boots

[Paul Larson (pwlars)]

I've tested this with our hifive, and it does seem to get the cloud data copied into /var/lig/cloud/seed/nocloud-net. So hopefully once we have working network, it should be good :)

review: Approve

diff --git a/devices/muxpi/muxpi.py b/devices/muxpi/muxpi.py
index a8ee667..5cf49f1 100644
--- a/devices/muxpi/muxpi.py
+++ b/devices/muxpi/muxpi.py
@@ -39,7 +39,8 @@ class MuxPi:
     IMAGE_PATH_IDS = {'writable/usr/bin/firefox': 'pi-desktop',
                       'writable/etc': 'ubuntu',
                       'writable/system-data': 'core',
-                      'ubuntu-seed/snaps': 'core20'}
+                      'ubuntu-seed/snaps': 'core20',
+                      'cloudimg-rootfs/etc/cloud/cloud.cfg': 'ubuntu-cpc'}
 
     def __init__(self, config, job_data):
         with open(config) as configfile:
@@ -328,6 +329,8 @@ class MuxPi:
                 base = os.path.join(self.mount_point, 'writable')
                 if image_type == 'core':
                     base = os.path.join(base, 'system-data')
+                if image_type == 'ubuntu-cpc':
+                    base = os.path.join(self.mount_point, 'cloudimg-rootfs')
                 ci_path = os.path.join(base, 'var/lib/cloud/seed/nocloud-net')
                 self._run_control('sudo mkdir -p {}'.format(ci_path))
                 write_cmd = "sudo bash -c \"echo '{}' > /{}/{}\""