From dd628f06f9661ae3b9a72a95d744dfbb5244c173 Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Tue, 28 Feb 2012 18:34:04 -0500 Subject: 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 --- cloudinit/CloudConfig/cc_resizefs.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cloudinit/CloudConfig/cc_resizefs.py') 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 -- cgit v1.2.3