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>

bdev_create: don't default to btrfs if possible
d3060bd0 · Serge Hallyn · d007f8ab · d3060bd0
Commit d3060bd0 authored Aug 15, 2013 by Serge Hallyn
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 17 deletions

bdev.c src/lxc/bdev.c +1 -17

No files found.
--- 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);