From: David Ward <david.ward@ll.mit.edu>
Date: Tue, 23 Jun 2015 14:57:21 +0000 (-0400)
Subject: Fix /dev symlinks without a rootfs
X-Git-Tag: lxc-2.0.0.beta1~170
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cd2b3cfe3735fddde61279f7bb59b4c2fcee1a7c;p=thirdparty%2Flxc.git

Fix /dev symlinks without a rootfs

Signed-off-by: David Ward <david.ward@ll.mit.edu>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
---

diff --git a/src/lxc/conf.c b/src/lxc/conf.c
index f298226c3..d17009490 100644
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -942,7 +942,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;