From 20a0cf9bf34408706f34edee5e1e75fd9676774c Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Tue, 19 Jul 2011 15:42:52 -0400 Subject: do not complain if attempt to resizefs in an lxc container fails it is expected / understood that mknod would fail inside an lxc container. So, if thats the case, just log a debug message saying so. LP: #800856 --- cloudinit/CloudConfig/cc_resizefs.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'cloudinit/CloudConfig') diff --git a/cloudinit/CloudConfig/cc_resizefs.py b/cloudinit/CloudConfig/cc_resizefs.py index e396b283..883c269b 100644 --- a/cloudinit/CloudConfig/cc_resizefs.py +++ b/cloudinit/CloudConfig/cc_resizefs.py @@ -42,6 +42,9 @@ 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") + return log.warn("Failed to make device node to resize /") raise -- cgit v1.2.3