daemon: Don't use files with fixed names in /tmp (thanks Steve Kemp).

[libguestfs.git] / test-tool / test-tool.c

diff --git a/test-tool/test-tool.c b/test-tool/test-tool.c
index 7b49dbe..c855682 100644 (file)
--- a/test-tool/test-tool.c
+++ b/test-tool/test-tool.c
@@ -174,6 +174,9 @@ main (int argc, char *argv[])
   for (i = 0; environ[i] != NULL; ++i)
     if (STREQLEN (environ[i], "LIBGUESTFS_", 11))
       printf ("%s\n", environ[i]);
+  for (i = 0; environ[i] != NULL; ++i)
+    if (STREQLEN (environ[i], "FEBOOTSTRAP_", 12))
+      printf ("%s\n", environ[i]);
 
   /* Create the handle and configure it. */
   g = guestfs_create ();
@@ -182,13 +185,18 @@ main (int argc, char *argv[])
              _("libguestfs-test-tool: failed to create libguestfs handle\n"));
     exit (EXIT_FAILURE);
   }
-  if (guestfs_add_drive (g, tmpf) == -1) {
+  if (guestfs_add_drive_opts (g, tmpf,
+                              GUESTFS_ADD_DRIVE_OPTS_FORMAT, "raw",
+                              -1) == -1) {
     fprintf (stderr,
              _("libguestfs-test-tool: failed to add drive '%s'\n"),
              tmpf);
     exit (EXIT_FAILURE);
   }
-  if (guestfs_add_drive (g, isof) == -1) {
+  if (guestfs_add_drive_opts (g, isof,
+                              GUESTFS_ADD_DRIVE_OPTS_FORMAT, "raw",
+                              GUESTFS_ADD_DRIVE_OPTS_READONLY, 1,
+                              -1) == -1) {
     fprintf (stderr,
              _("libguestfs-test-tool: failed to add drive '%s'\n"),
              isof);