diff options
| author | Scott Moser <smoser@ubuntu.com> | 2012-02-28 18:34:04 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2012-02-28 18:34:04 -0500 |
| commit | dd628f06f9661ae3b9a72a95d744dfbb5244c173 (patch) | |
| tree | adcf8c5877631a5bf0b5e09c4d4fdf70a5d91651 /cloudinit/CloudConfig | |
| parent | b3522f1044b6023fbcaf8ddf7aaff7f0166ed4b3 (diff) | |
| download | vyos-cloud-init-dd628f06f9661ae3b9a72a95d744dfbb5244c173.tar.gz vyos-cloud-init-dd628f06f9661ae3b9a72a95d744dfbb5244c173.zip | |
address change in name of lxc-is-container to running-in-container
Also improves the logic in is_container following ubuntu's
/etc/init/container-detect.conf .
LP: #941955
Diffstat (limited to 'cloudinit/CloudConfig')
| -rw-r--r-- | cloudinit/CloudConfig/cc_resizefs.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cloudinit/CloudConfig/cc_resizefs.py b/cloudinit/CloudConfig/cc_resizefs.py index 0186d4d2..c76cc664 100644 --- a/cloudinit/CloudConfig/cc_resizefs.py +++ b/cloudinit/CloudConfig/cc_resizefs.py @@ -49,8 +49,8 @@ def handle(_name, cfg, _cloud, log, args): dev = os.makedev(os.major(st_dev), os.minor(st_dev)) os.mknod(devpth, 0400 | stat.S_IFBLK, dev) except: - if util.islxc(): - log.debug("inside lxc, ignoring mknod failure in resizefs") + if util.is_container(): + log.debug("inside container, ignoring mknod failure in resizefs") return log.warn("Failed to make device node to resize /") raise |