bdev_create: don't default to btrfs if possible

Ideally it would be great to default to a btrfs subvolume for each new
container created.  However, this is not as we previously thought
without consequence.  'rsync --one-file-system' will not descend into
btrfs subvolumes.  This means that 'lxc-create -B _unset' will cause
different behavior for rsync -vax /var/lib/lxc based on whether that
fs is btrfs or not.

So don't do that.  If -B is not specified, use -B dir.

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>

diff --git a/src/lxc/bdev.c b/src/lxc/bdev.c
index 9dea57b7b0cf9e61090e32a05550eb1bf2d8f6f4..07a794b3ed7d48600601276c82c717352c2a5567 100644 (file)
--- a/src/lxc/bdev.c
+++ b/src/lxc/bdev.c
@@ -1993,25 +1993,9 @@ struct bdev *bdev_create(const char *dest, const char *type,
 {
        struct bdev *bdev;
 
-       if (!type) {
-               char *p, *p1;
-
+       if (!type)
                type = "dir";
 
-               /*
-                * $lxcpath/$lxcname/rootfs doesn't yet exist.  Check
-                * whether $lxcpath/$lxcname is btrfs.  If so, specify
-                * btrfs backing store for the container.
-                */
-               p = strdupa(dest);
-               p1 = rindex(p, '/');
-               if (p1) {
-                       *p1 = '\0';
-                       if (is_btrfs_fs(p))
-                               type = "btrfs";
-               }
-       }
-
        bdev = bdev_get(type);
        if (!bdev) {
                ERROR("Unknown fs type: %s\n", type);