X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=config.ml;h=80f116b16964fea6de3878e4cf556aa5c8cce6c2;hb=0af7eb8508526f0a6a7a0a80164b9c5380b2783e;hp=dddf5a5aa6d5e65e538a493f7056f4a24672bce8;hpb=b3757beea2d9dced8a8fc359f76dd58525bdbf61;p=goaljobs-goals.git

diff --git a/config.ml b/config.ml
index dddf5a5..80f116b 100644
--- a/config.ml
+++ b/config.ml
@@ -46,6 +46,9 @@ let libguestfs_localconfigure source =
 
 let libguestfs_localenv supermin =
   "\
+# Use the real virt-builder configuration from /etc.
+export XDG_CONFIG_DIRS=/etc
+
 # Fails under valgrind because of a leak in the fuse library,
 # although I could not work out exactly why.
 export SKIP_TEST_PARALLEL_MOUNT_LOCAL=1
@@ -83,6 +86,9 @@ export SKIP_TEST_INOTIFY_ADD_WATCH=1
 # libguestfs: error: mkfs_btrfs: /dev/sda1: not enough free space
 # (RHBZ#1291715).
 export SKIP_TEST_BTRFS_IMAGE_0=1
+
+# Yawn, btrfs broken again. RHBZ#1372037
+export SKIP_TEST_BTRFS_DEVICES_SH=1
 " ^
     match supermin with
     | None -> ""