]> git.ipfire.org Git - thirdparty/lxc.git/commitdiff
Fix /dev symlinks without a rootfs
authorDavid Ward <david.ward@ll.mit.edu>
Tue, 23 Jun 2015 14:57:35 +0000 (10:57 -0400)
committerStéphane Graber <stgraber@ubuntu.com>
Thu, 27 Aug 2015 21:50:23 +0000 (17:50 -0400)
Signed-off-by: David Ward <david.ward@ll.mit.edu>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
src/lxc/conf.c

index e1b8a6ce8a07b7053f50f4a156d509708ab7b22a..16d07d009af603d98dba8c9ee0a1e549ab5ee395 100644 (file)
@@ -927,7 +927,7 @@ static int setup_dev_symlinks(const struct lxc_rootfs *rootfs)
 
        for (i = 0; i < sizeof(dev_symlinks) / sizeof(dev_symlinks[0]); i++) {
                const struct dev_symlinks *d = &dev_symlinks[i];
-               ret = snprintf(path, sizeof(path), "%s/dev/%s", rootfs->mount, d->name);
+               ret = snprintf(path, sizeof(path), "%s/dev/%s", rootfs->path ? rootfs->mount : "", d->name);
                if (ret < 0 || ret >= MAXPATHLEN)
                        return -1;