templates: use relative paths when creating containers

At the same time, allow lxc.mount.entry to specify an absolute target
path relative to /var/lib/lxc/CN/rootfs, even if rootfs is a blockdev.
Otherwise all such entries are ignored for blockdev-backed containers.

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>

diff --git a/src/lxc/conf.c b/src/lxc/conf.c
index 4b79d50b59abd1f35877e87de59c6c2459073b39..db9079bd0e41074a63939256b3959e6c5eae0178 100644 (file)
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -1142,27 +1142,50 @@ static inline int mount_entry_on_systemfs(struct mntent *mntent)
 }
 
 static int mount_entry_on_absolute_rootfs(struct mntent *mntent,
-                                         const struct lxc_rootfs *rootfs)
+                                         const struct lxc_rootfs *rootfs,
+                                         const char *lxc_name)
 {
        char *aux;
        char path[MAXPATHLEN];
        unsigned long mntflags;
        char *mntdata;
-       int ret = 0;
+       int r, ret = 0, offset;
 
        if (parse_mntopts(mntent->mnt_opts, &mntflags, &mntdata) < 0) {
                ERROR("failed to parse mount option '%s'", mntent->mnt_opts);
                return -1;
        }
 
+       /* if rootfs->path is a blockdev path, allow container fstab to
+        * use /var/lib/lxc/CN/rootfs as the target prefix */
+       r = snprintf(path, MAXPATHLEN, "/var/lib/lxc/%s/rootfs", lxc_name);
+       if (r < 0 || r >= MAXPATHLEN)
+               goto skipvarlib;
+
+       aux = strstr(mntent->mnt_dir, path);
+       if (aux) {
+               offset = strlen(path);
+               goto skipabs;
+       }
+
+skipvarlib:
        aux = strstr(mntent->mnt_dir, rootfs->path);
        if (!aux) {
                WARN("ignoring mount point '%s'", mntent->mnt_dir);
                goto out;
        }
+       offset = strlen(rootfs->path);
+
+skipabs:
 
        snprintf(path, MAXPATHLEN, "%s/%s", rootfs->mount,
-                aux + strlen(rootfs->path));
+                aux + offset);
+       if (r < 0 || r >= MAXPATHLEN) {
+               WARN("pathnme too long for '%s'", mntent->mnt_dir);
+               ret = -1;
+               goto out;
+       }
+
 
        ret = mount_entry(mntent->mnt_fsname, path, mntent->mnt_type,
                          mntflags, mntdata);
@@ -1196,7 +1219,8 @@ static int mount_entry_on_relative_rootfs(struct mntent *mntent,
        return ret;
 }
 
-static int mount_file_entries(const struct lxc_rootfs *rootfs, FILE *file)
+static int mount_file_entries(const struct lxc_rootfs *rootfs, FILE *file,
+       const char *lxc_name)
 {
        struct mntent *mntent;
        int ret = -1;
@@ -1217,7 +1241,7 @@ static int mount_file_entries(const struct lxc_rootfs *rootfs, FILE *file)
                        continue;
                }
 
-               if (mount_entry_on_absolute_rootfs(mntent, rootfs))
+               if (mount_entry_on_absolute_rootfs(mntent, rootfs, lxc_name))
                        goto out;
        }
 
@@ -1228,7 +1252,8 @@ out:
        return ret;
 }
 
-static int setup_mount(const struct lxc_rootfs *rootfs, const char *fstab)
+static int setup_mount(const struct lxc_rootfs *rootfs, const char *fstab,
+       const char *lxc_name)
 {
        FILE *file;
        int ret;
@@ -1242,13 +1267,14 @@ static int setup_mount(const struct lxc_rootfs *rootfs, const char *fstab)
                return -1;
        }
 
-       ret = mount_file_entries(rootfs, file);
+       ret = mount_file_entries(rootfs, file, lxc_name);
 
        endmntent(file);
        return ret;
 }
 
-static int setup_mount_entries(const struct lxc_rootfs *rootfs, struct lxc_list *mount)
+static int setup_mount_entries(const struct lxc_rootfs *rootfs, struct lxc_list *mount,
+       const char *lxc_name)
 {
        FILE *file;
        struct lxc_list *iterator;
@@ -1268,7 +1294,7 @@ static int setup_mount_entries(const struct lxc_rootfs *rootfs, struct lxc_list
 
        rewind(file);
 
-       ret = mount_file_entries(rootfs, file);
+       ret = mount_file_entries(rootfs, file, lxc_name);
 
        fclose(file);
        return ret;
@@ -2060,12 +2086,12 @@ int lxc_setup(const char *name, struct lxc_conf *lxc_conf)
                return -1;
        }
 
-       if (setup_mount(&lxc_conf->rootfs, lxc_conf->fstab)) {
+       if (setup_mount(&lxc_conf->rootfs, lxc_conf->fstab, name)) {
                ERROR("failed to setup the mounts for '%s'", name);
                return -1;
        }
 
-       if (setup_mount_entries(&lxc_conf->rootfs, &lxc_conf->mount_list)) {
+       if (setup_mount_entries(&lxc_conf->rootfs, &lxc_conf->mount_list, name)) {
                ERROR("failed to setup the mount entries for '%s'", name);
                return -1;
        }

diff --git a/templates/lxc-debian.in b/templates/lxc-debian.in
index b97bbaca9164eb41450908c53212cd046eb92c53..34d959316a79063cd96f3e268448857511ede8e8 100644 (file)
--- a/templates/lxc-debian.in
+++ b/templates/lxc-debian.in
@@ -212,8 +212,8 @@ lxc.cgroup.devices.allow = c 5:2 rwm
 lxc.cgroup.devices.allow = c 254:0 rwm
 
 # mounts point
-lxc.mount.entry=proc $rootfs/proc proc nodev,noexec,nosuid 0 0
-lxc.mount.entry=sysfs $rootfs/sys sysfs defaults  0 0
+lxc.mount.entry=proc proc proc nodev,noexec,nosuid 0 0
+lxc.mount.entry=sysfs sys sysfs defaults  0 0
 EOF
 
     if [ $? -ne 0 ]; then

diff --git a/templates/lxc-fedora.in b/templates/lxc-fedora.in
index 3f5089553aef73ac4e0234447396b88d33c9eb23..3aa2d73006b6e44d16fe1be772acd377f659df6c 100644 (file)
--- a/templates/lxc-fedora.in
+++ b/templates/lxc-fedora.in
@@ -263,9 +263,9 @@ lxc.cgroup.devices.allow = c 254:0 rwm
 EOF
 
     cat <<EOF > $config_path/fstab
-proc            $rootfs_path/proc         proc    nodev,noexec,nosuid 0 0
-devpts          $rootfs_path/dev/pts      devpts defaults 0 0
-sysfs           $rootfs_path/sys          sysfs defaults  0 0
+proc            proc         proc    nodev,noexec,nosuid 0 0
+devpts          dev/pts      devpts defaults 0 0
+sysfs           sys          sysfs defaults  0 0
 EOF
     if [ $? -ne 0 ]; then
        echo "Failed to add configuration"

diff --git a/templates/lxc-lenny.in b/templates/lxc-lenny.in
index 3720dced2f4fbf4d7e12e78d3f8af9bdcb1b6923..910c185207b302e9a96a023a276eb77a3d902c86 100644 (file)
--- a/templates/lxc-lenny.in
+++ b/templates/lxc-lenny.in
@@ -200,8 +200,8 @@ lxc.cgroup.devices.allow = c 5:2 rwm
 lxc.cgroup.devices.allow = c 254:0 rwm
 
 # mounts point
-lxc.mount.entry=proc $rootfs/proc proc nodev,noexec,nosuid 0 0
-lxc.mount.entry=sysfs $rootfs/sys sysfs defaults  0 0
+lxc.mount.entry=proc proc proc nodev,noexec,nosuid 0 0
+lxc.mount.entry=sysfs sys sysfs defaults  0 0
 EOF
 
     if [ $? -ne 0 ]; then

diff --git a/templates/lxc-opensuse.in b/templates/lxc-opensuse.in
index 120b2c71a23ae521fafd0507bd0191277198a161..3d2e001746f4869eae0d11f0ec5d75ca688c94c8 100644 (file)
--- a/templates/lxc-opensuse.in
+++ b/templates/lxc-opensuse.in
@@ -281,8 +281,8 @@ lxc.cgroup.devices.allow = c 254:0 rwm
 EOF
 
     cat <<EOF > $path/fstab
-proc            $rootfs/proc         proc      nodev,noexec,nosuid 0 0
-sysfs           $rootfs/sys          sysfs     defaults  0 0
+proc            proc         proc      nodev,noexec,nosuid 0 0
+sysfs           sys          sysfs     defaults  0 0
 EOF
 
     if [ $? -ne 0 ]; then

diff --git a/templates/lxc-sshd.in b/templates/lxc-sshd.in
index bd5d293e83275e6f09d1e5c9c1ba8fd0163e633b..89d9b61b0216ba9e1a342c8a842ddc34b15e73c4 100644 (file)
--- a/templates/lxc-sshd.in
+++ b/templates/lxc-sshd.in
@@ -101,18 +101,18 @@ cat <<EOF >> $path/config
 lxc.utsname = $name
 lxc.pts = 1024
 lxc.rootfs = $rootfs
-lxc.mount.entry=/dev $rootfs/dev none ro,bind 0 0
-lxc.mount.entry=/lib $rootfs/lib none ro,bind 0 0
-lxc.mount.entry=/bin $rootfs/bin none ro,bind 0 0
-lxc.mount.entry=/usr /$rootfs/usr none ro,bind 0 0
-lxc.mount.entry=/sbin $rootfs/sbin none ro,bind 0 0
-lxc.mount.entry=tmpfs $rootfs/var/run/sshd tmpfs mode=0644 0 0
-lxc.mount.entry=@LXCTEMPLATEDIR@/lxc-sshd $rootfs/sbin/init none bind 0 0
+lxc.mount.entry=/dev dev none ro,bind 0 0
+lxc.mount.entry=/lib lib none ro,bind 0 0
+lxc.mount.entry=/bin bin none ro,bind 0 0
+lxc.mount.entry=/usr usr none ro,bind 0 0
+lxc.mount.entry=/sbin sbin none ro,bind 0 0
+lxc.mount.entry=tmpfs var/run/sshd tmpfs mode=0644 0 0
+lxc.mount.entry=@LXCTEMPLATEDIR@/lxc-sshd sbin/init none bind 0 0
 EOF
 
 if [ "$(uname -m)" = "x86_64" ]; then
     cat <<EOF >> $path/config
-lxc.mount.entry=/lib64 $rootfs/lib64 none ro,bind 0 0
+lxc.mount.entry=/lib64 lib64 none ro,bind 0 0
 EOF
 fi
 }

diff --git a/templates/lxc-ubuntu-cloud.in b/templates/lxc-ubuntu-cloud.in
index 0b1cd74d5a2c404542e683463bc5ce61e3389cf3..691a001a4447c39cc0b4e8203052635e80647f47 100644 (file)
--- a/templates/lxc-ubuntu-cloud.in
+++ b/templates/lxc-ubuntu-cloud.in
@@ -87,8 +87,8 @@ lxc.cgroup.devices.allow = c 10:232 rwm
 EOF
 
     cat <<EOF > $path/fstab
-proc            $rootfs/proc         proc    nodev,noexec,nosuid 0 0
-sysfs           $rootfs/sys          sysfs defaults  0 0
+proc            proc         proc    nodev,noexec,nosuid 0 0
+sysfs           sys          sysfs defaults  0 0
 EOF
 
     return 0

diff --git a/templates/lxc-ubuntu.in b/templates/lxc-ubuntu.in
index b1fb956db7d90f5cd1333ceacea2794a92016e3c..b1139b4d6a933b6d93c9f824fecc1f59fef28e66 100644 (file)
--- a/templates/lxc-ubuntu.in
+++ b/templates/lxc-ubuntu.in
@@ -366,8 +366,8 @@ lxc.cgroup.devices.allow = c 10:232 rwm
 EOF
 
     cat <<EOF > $path/fstab
-proc            $rootfs/proc         proc    nodev,noexec,nosuid 0 0
-sysfs           $rootfs/sys          sysfs defaults  0 0
+proc            proc         proc    nodev,noexec,nosuid 0 0
+sysfs           sys          sysfs defaults  0 0
 EOF
 
     if [ $? -ne 0 ]; then
@@ -543,7 +543,7 @@ do_bindhome()
     # bind-mount the user's path into the container's /home
     h=`getent passwd $user | cut -d: -f 6`
     mkdir -p $rootfs/$h
-    echo "$h $rootfs/$h none bind 0 0" >> $path/fstab
+    echo "$h $h none bind 0 0" >> $path/fstab
 
     # Make sure the group exists in container
     grp=`echo $pwd | cut -d: -f 4`  # group number for $user