← Back to branch summary

~rcj/ubuntu/trusty/cloud-init/joyent-lxbrand

« back to all changes in this revision

Viewing changes to cloudinit/config/cc_disk_setup.py

  • Committer: Scott Moser
  • Author(s): Daniel Watkins
  • Date: 2015-08-14 12:54:02 UTC
  • Revision ID: smoser@ubuntu.com-20150814125402-514m056vv2ziyivh
Tags: 0.7.5-0ubuntu1.8
https://launchpad.net/bugs/1411582
https://launchpad.net/bugs/1470880
https://launchpad.net/bugs/1470890
* debian/patches/lp-1411582-azure-udev-ephemeral-disks.patch:
    - Use udev rules to discover ephemeral disk locations rather than
      hard-coded device names (LP: #1411582).
* debian/patches/lp-1470880-fix-gce-az-determination.patch:
    - Correctly parse GCE's availability zones (LP: #1470880).
* d/patches/lp-1470890-include-regions-in-dynamic-mirror-discovery.patch:
    - Make %(region)s a valid substitution in mirror discovery
      (LP: #1470890).
* Remove python-serial from Build-Depends; it was mistakenly added last
  upload.

Show diffs side-by-side

added added

removed removed

Lines of Context:
cloudinit/config/cc_disk_setup.py
649
649
                table_type: Which partition table to use, defaults to MBR
650
650
                device: the device to work on.
651
651
    """
 
652
    # ensure that we get a real device rather than a symbolic link
 
653
    device = os.path.realpath(device)
652
654
 
653
655
    LOG.debug("Checking values for %s definition" % device)
654
656
    overwrite = definition.get('overwrite', False)
746
748
    fs_replace = fs_cfg.get('replace_fs', False)
747
749
    overwrite = fs_cfg.get('overwrite', False)
748
750
 
 
751
    # ensure that we get a real device rather than a symbolic link
 
752
    device = os.path.realpath(device)
 
753
 
749
754
    # This allows you to define the default ephemeral or swap
750
755
    LOG.debug("Checking %s against default devices", device)
751
756