]> git.ipfire.org Git - thirdparty/lxc.git/commitdiff
mindless changes to conform indentation
authorDaniel Lezcano <daniel.lezcano@free.fr>
Thu, 13 Jan 2011 15:15:15 +0000 (16:15 +0100)
committerDaniel Lezcano <dlezcano@fr.ibm.com>
Thu, 13 Jan 2011 15:15:15 +0000 (16:15 +0100)
Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
src/lxc/conf.c

index 49361c426d7df2243007287617205fd118608c03..b07375f72d3724be81a6e122166f173a710b8eb1 100644 (file)
@@ -923,39 +923,43 @@ static int mount_file_entries(const struct lxc_rootfs *rootfs, FILE *file)
 
                mntflags = 0;
                mntdata = NULL;
+
                if (parse_mntopts(mntent, &mntflags, &mntdata) < 0) {
                        ERROR("failed to parse mount option '%s'",
-                                     mntent->mnt_opts);
+                             mntent->mnt_opts);
                        goto out;
                }
 
                /* now figure out where to mount it to. */
                mntdir =  mntent->mnt_dir;
                mntroot = NULL;
+
                if (!rootfs->path) {
-                       /* if we use system root fs,
-                        * the mount is relative to / and can be absolute */
+                       /* if we use system root fs, the mount is relative to '/'
+                        * and can be absolute */
                        if (mntdir[0] != '/')
-                               mntroot = ""; /* this is "/" */
-               }
-               else {
+                               mntroot = ""; /* this is '/' */
+               } else {
                        /* else we have a separate root, mounts are
                         * relative to it, and absolute paths are risky */
                        if (mntdir[0] != '/')
-                               /* relative too root mount point */
+                               /* relative to root mount point */
                                mntroot = rootfs->mount;
-                       else if (strncmp(mntdir, rootfs->mount, strlen(rootfs->mount)))
-                               WARN("mount target directory '%s' is outside container root",
-                                       mntdir);
+                       else if (strncmp(mntdir, rootfs->mount,
+                                        strlen(rootfs->mount)))
+                               WARN("mount target directory '%s' is outside "
+                                    "container root", mntdir);
                        else
-                               WARN("mount target directory '%s' is not relative to container root",
-                                       mntdir);
+                               WARN("mount target directory '%s' is not "
+                                    "relative to container root", mntdir);
                }
+
                if (mntroot) {
                        /* make it relative to mntroot */
                        snprintf(path, sizeof(path), "%s/%s", mntroot, mntdir);
                        mntdir = path;
                }
+
                if (mount(mntent->mnt_fsname, mntdir,
                          mntent->mnt_type, mntflags & ~MS_REMOUNT, mntdata)) {
                        SYSERROR("failed to mount '%s' on '%s'",