examples: Use add_drive_opts function in examples.

In libguestfs 1.20, you will be able to use 'add_drive'
instead of 'add_drive_opts' (except in the C bindings).

However until libguestfs 1.20 is the minimum stable version
people will still be using old versions where you have to use
'add_drive_opts'.  This makes the examples confusing.

Therefore continue to use 'add_drive_opts' in the examples
for now.

18 files changed, 25 insertions, 25 deletions

diff --git a/erlang/examples/create_disk.erl b/erlang/examples/create_disk.erl
index 0e1f0314..d192435a 100755
--- a/erlang/examples/create_disk.erl
+++ b/erlang/examples/create_disk.erl
@@ -17,8 +17,8 @@ main(_) ->
     ok = guestfs:set_trace(G, true),
 
     % Attach the disk image to libguestfs.
-    ok = guestfs:add_drive(G, Output,
-                           [{format, "raw"}, {readonly, false}]),
+    ok = guestfs:add_drive_opts(G, Output,
+                                [{format, "raw"}, {readonly, false}]),
 
     % Run the libguestfs back-end.
     ok = guestfs:launch(G),
diff --git a/erlang/examples/guestfs-erlang.pod b/erlang/examples/guestfs-erlang.pod
index 1016d986..8721318b 100644
--- a/erlang/examples/guestfs-erlang.pod
+++ b/erlang/examples/guestfs-erlang.pod
@@ -7,8 +7,8 @@ guestfs-erlang - How to use libguestfs from Erlang
 =head1 SYNOPSIS
 
  {ok, G} = guestfs:create(),
- ok = guestfs:add_drive(G, Disk,
-                        [{format, "raw"}, {readonly, true}]),
+ ok = guestfs:add_drive_opts(G, Disk,
+                             [{format, "raw"}, {readonly, true}]),
  ok = guestfs:launch(G),
  [Device] = guestfs:list_devices(G),
  ok = guestfs:close(G).
@@ -43,12 +43,12 @@ For functions that take optional arguments, the first arguments are
 the non-optional ones.  The last argument is a list of tuples
 supplying the remaining optional arguments.
 
- ok = guestfs:add_drive(G, Disk,
-                        [{format, "raw"}, {readonly, true}]).
+ ok = guestfs:add_drive_opts(G, Disk,
+                             [{format, "raw"}, {readonly, true}]).
 
 If the last argument would be an empty list, you can also omit it:
 
- ok = guestfs:add_drive(G, Disk).
+ ok = guestfs:add_drive_opts(G, Disk).
 
 =head2 RETURN VALUES AND ERRORS
 
diff --git a/erlang/examples/inspect_vm.erl b/erlang/examples/inspect_vm.erl
index 24558895..87d751ca 100755
--- a/erlang/examples/inspect_vm.erl
+++ b/erlang/examples/inspect_vm.erl
@@ -6,7 +6,7 @@ main([Disk]) ->
     {ok, G} = guestfs:create(),
 
     % Attach the disk image read-only to libguestfs.
-    ok = guestfs:add_drive(G, Disk, [{readonly, true}]),
+    ok = guestfs:add_drive_opts(G, Disk, [{readonly, true}]),
 
     % Run the libguestfs back-end.
     ok = guestfs:launch(G),
diff --git a/java/examples/CreateDisk.java b/java/examples/CreateDisk.java
index 7eecf9e4..381fae1f 100644
--- a/java/examples/CreateDisk.java
+++ b/java/examples/CreateDisk.java
@@ -29,7 +29,7 @@ public class CreateDisk
                     put ("readonly", Boolean.FALSE);
                 }
             };
-            g.add_drive (output, optargs);
+            g.add_drive_opts (output, optargs);
 
             // Run the libguestfs back-end.
             g.launch ();
diff --git a/java/examples/InspectVM.java b/java/examples/InspectVM.java
index 1feadbe5..d92aa70f 100644
--- a/java/examples/InspectVM.java
+++ b/java/examples/InspectVM.java
@@ -35,7 +35,7 @@ public class InspectVM
                 }
             };
 
-            g.add_drive (disk, optargs);
+            g.add_drive_opts (disk, optargs);
 
             // Run the libguestfs back-end.
             g.launch ();
diff --git a/java/examples/guestfs-java.pod b/java/examples/guestfs-java.pod
index f7b1e7a0..482539bd 100644
--- a/java/examples/guestfs-java.pod
+++ b/java/examples/guestfs-java.pod
@@ -9,7 +9,7 @@ guestfs-java - How to use libguestfs from Java
  import com.redhat.et.libguestfs.*;
  
  GuestFS g = new GuestFS ();
- g.add_drive ("disk.img");
+ g.add_drive_opts ("disk.img");
  g.launch ();
 
 =head1 DESCRIPTION
diff --git a/ocaml/examples/create_disk.ml b/ocaml/examples/create_disk.ml
index fab5e701..4437b1c8 100644
--- a/ocaml/examples/create_disk.ml
+++ b/ocaml/examples/create_disk.ml
@@ -17,7 +17,7 @@ let () =
   g#set_trace true;
 
   (* Attach the disk image to libguestfs. *)
-  g#add_drive ~format:"raw" ~readonly:false output;
+  g#add_drive_opts ~format:"raw" ~readonly:false output;
 
   (* Run the libguestfs back-end. *)
   g#launch ();
diff --git a/ocaml/examples/guestfs-ocaml.pod b/ocaml/examples/guestfs-ocaml.pod
index 019e84a3..139997b8 100644
--- a/ocaml/examples/guestfs-ocaml.pod
+++ b/ocaml/examples/guestfs-ocaml.pod
@@ -9,13 +9,13 @@ guestfs-ocaml - How to use libguestfs from OCaml
 Module style:
 
  let g = Guestfs.create () in
- Guestfs.add_drive g ~format:"raw" ~readonly:true "disk.img";
+ Guestfs.add_drive_opts g ~format:"raw" ~readonly:true "disk.img";
  Guestfs.launch g;
 
 Object-oriented style:
 
  let g = new Guestfs.guestfs () in
- g#add_drive ~format:"raw" ~readonly:true "disk.img";
+ g#add_drive_opts ~format:"raw" ~readonly:true "disk.img";
  g#launch ();
 
  ocamlfind opt prog.ml -package guestfs -linkpkg -o prog
diff --git a/ocaml/examples/inspect_vm.ml b/ocaml/examples/inspect_vm.ml
index c19953b4..44d348e7 100644
--- a/ocaml/examples/inspect_vm.ml
+++ b/ocaml/examples/inspect_vm.ml
@@ -12,7 +12,7 @@ let () =
   let g = new Guestfs.guestfs () in
 
   (* Attach the disk image read-only to libguestfs. *)
-  g#add_drive (*~format:"raw"*) ~readonly:true disk;
+  g#add_drive_opts (*~format:"raw"*) ~readonly:true disk;
 
   (* Run the libguestfs back-end. *)
   g#launch ();
diff --git a/perl/examples/create_disk.pl b/perl/examples/create_disk.pl
index 76b51de5..11b91469 100755
--- a/perl/examples/create_disk.pl
+++ b/perl/examples/create_disk.pl
@@ -18,7 +18,7 @@ close FILE or die "$output: $!";
 $g->set_trace (1);
 
 # Attach the disk image to libguestfs.
-$g->add_drive ($output, format => "raw", readonly => 0);
+$g->add_drive_opts ($output, format => "raw", readonly => 0);
 
 # Run the libguestfs back-end.
 $g->launch ();
diff --git a/perl/examples/guestfs-perl.pod b/perl/examples/guestfs-perl.pod
index 814946e9..76cf29ef 100644
--- a/perl/examples/guestfs-perl.pod
+++ b/perl/examples/guestfs-perl.pod
@@ -9,7 +9,7 @@ guestfs-perl - How to use libguestfs from Perl
  use Sys::Guestfs;
  
  my $g = Sys::Guestfs->new ();
- $g->add_drive ('guest.img', format => 'raw');
+ $g->add_drive_opts ('guest.img', format => 'raw');
  $g->launch ();
  $g->mount_options ('', '/dev/sda1', '/');
  $g->touch ('/hello');
diff --git a/perl/examples/inspect_vm.pl b/perl/examples/inspect_vm.pl
index 7800ce02..6d95b697 100755
--- a/perl/examples/inspect_vm.pl
+++ b/perl/examples/inspect_vm.pl
@@ -16,7 +16,7 @@ my $g = new Sys::Guestfs ();
 # Attach the disk image read-only to libguestfs.
 # You could also add an optional format => ... argument here.  This is
 # advisable since automatic format detection is insecure.
-$g->add_drive ($disk, readonly => 1);
+$g->add_drive_opts ($disk, readonly => 1);
 
 # Run the libguestfs back-end.
 $g->launch ();
diff --git a/python/examples/create_disk.py b/python/examples/create_disk.py
index a854c23f..86f50427 100644
--- a/python/examples/create_disk.py
+++ b/python/examples/create_disk.py
@@ -16,7 +16,7 @@ f.close ()
 g.set_trace (1)
 
 # Attach the disk image to libguestfs.
-g.add_drive (output, format = "raw", readonly = 0)
+g.add_drive_opts (output, format = "raw", readonly = 0)
 
 # Run the libguestfs back-end.
 g.launch ()
diff --git a/python/examples/guestfs-python.pod b/python/examples/guestfs-python.pod
index 59f60e57..e4406f55 100644
--- a/python/examples/guestfs-python.pod
+++ b/python/examples/guestfs-python.pod
@@ -8,7 +8,7 @@ guestfs-python - How to use libguestfs from Python
 
  import guestfs
  g = guestfs.GuestFS ()
- g.add_drive ("disk.img", format="raw", readonly=1)
+ g.add_drive_opts ("disk.img", format="raw", readonly=1)
  g.launch ()
 
 =head1 DESCRIPTION
diff --git a/python/examples/inspect_vm.py b/python/examples/inspect_vm.py
index 816779cc..c491a2ce 100644
--- a/python/examples/inspect_vm.py
+++ b/python/examples/inspect_vm.py
@@ -9,7 +9,7 @@ disk = sys.argv[1]
 g = guestfs.GuestFS ()
 
 # Attach the disk image read-only to libguestfs.
-g.add_drive (disk, readonly=1)
+g.add_drive_opts (disk, readonly=1)
 
 # Run the libguestfs back-end.
 g.launch ()
diff --git a/ruby/examples/create_disk.rb b/ruby/examples/create_disk.rb
index fd6ec01e..32fb1171 100644
--- a/ruby/examples/create_disk.rb
+++ b/ruby/examples/create_disk.rb
@@ -15,7 +15,7 @@ File.open(output, "w") {
 g.set_trace(1)
 
 # Attach the disk image to libguestfs.
-g.add_drive(output, :format => "raw")
+g.add_drive_opts(output, :format => "raw")
 
 # Run the libguestfs back-end.
 g.launch();
diff --git a/ruby/examples/guestfs-ruby.pod b/ruby/examples/guestfs-ruby.pod
index 4b53d018..1af133de 100644
--- a/ruby/examples/guestfs-ruby.pod
+++ b/ruby/examples/guestfs-ruby.pod
@@ -8,8 +8,8 @@ guestfs-ruby - How to use libguestfs from Ruby
 
  require 'guestfs'
  g = Guestfs::Guestfs.new()
- g.add_drive("disk.img",
-             :readonly => 1, :format => "raw")
+ g.add_drive_opts("disk.img",
+                  :readonly => 1, :format => "raw")
  g.launch()
 
 =head1 DESCRIPTION
diff --git a/ruby/examples/inspect_vm.rb b/ruby/examples/inspect_vm.rb
index c29114ea..abf22790 100644
--- a/ruby/examples/inspect_vm.rb
+++ b/ruby/examples/inspect_vm.rb
@@ -11,7 +11,7 @@ disk = ARGV[0]
 g = Guestfs::Guestfs.new()
 
 # Attach the disk image read-only to libguestfs.
-g.add_drive(disk, :readonly => 1)
+g.add_drive_opts(disk, :readonly => 1)
 
 # Run the libguestfs back-end.
 g.launch()