diff options
| author | Scott Moser <smoser@ubuntu.com> | 2012-02-16 16:52:58 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2012-02-16 16:52:58 -0500 |
| commit | 9f171511042d29542d8578957c6692c2c9457583 (patch) | |
| tree | 75ecc2df553f24cf0f91c1c019d06575731d0d81 /cloudinit/util.py | |
| parent | 3027a0d417723ce071ad048092607b3f7187ce08 (diff) | |
| download | vyos-cloud-init-9f171511042d29542d8578957c6692c2c9457583.tar.gz vyos-cloud-init-9f171511042d29542d8578957c6692c2c9457583.zip | |
DataSourceNoCloud: allow reading user-data and meta-data from simple files
This allows you to attach a disk in ISO9660 or vfat filesystem format
labeled 'cidata' with 'user-data' and 'meta-data' on it.
It provides a much easier way to interact with cloud-init in nocloud
than mounting the image or the OVF method.
Diffstat (limited to 'cloudinit/util.py')
| -rw-r--r-- | cloudinit/util.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cloudinit/util.py b/cloudinit/util.py index b53aa5fe..0a691dcf 100644 --- a/cloudinit/util.py +++ b/cloudinit/util.py @@ -681,7 +681,7 @@ def mount_callback_umount(device, callback, data=None): umount = False if device in mounted: - mountpoint = mounted[device][2] + mountpoint = "%s/" % mounted[device][2] else: tmpd = tempfile.mkdtemp() @@ -695,7 +695,7 @@ def mount_callback_umount(device, callback, data=None): print exc.output[1] raise mountFailedError(exc.output[1]) - mountpoint = tmpd + mountpoint = "%s/" % tmpd try: if data == None: |