From 1ab6357d631d14946d321fc09e6ed4cab7643340 Mon Sep 17 00:00:00 2001
From: Richard W.M. Jones <rjones@redhat.com>
Date: May 19 2017 11:02:23 +0000
Subject: Rebase patches on top of 1.36.4.


---

diff --git a/0001-generator-Deprecate-direct-mode-guestfs_set_direct-g.patch b/0001-generator-Deprecate-direct-mode-guestfs_set_direct-g.patch
index 2849dc8..d4f2679 100644
--- a/0001-generator-Deprecate-direct-mode-guestfs_set_direct-g.patch
+++ b/0001-generator-Deprecate-direct-mode-guestfs_set_direct-g.patch
@@ -1,4 +1,4 @@
-From 29ae313bc407d60449ba84808f98ec846eb3dc39 Mon Sep 17 00:00:00 2001
+From e331353969e0f868951ddc02d7605a2a437ded73 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Thu, 2 Mar 2017 12:42:46 +0000
 Subject: [PATCH 01/10] generator: Deprecate direct mode (guestfs_set_direct,
@@ -13,7 +13,7 @@ Subject: [PATCH 01/10] generator: Deprecate direct mode (guestfs_set_direct,
  4 files changed, 33 insertions(+), 29 deletions(-)
 
 diff --git a/generator/actions_properties.ml b/generator/actions_properties.ml
-index 8f6455b..87144b1 100644
+index 8f6455b81..87144b14f 100644
 --- a/generator/actions_properties.ml
 +++ b/generator/actions_properties.ml
 @@ -260,34 +260,6 @@ C<guestfs_set_event_callback>)." };
@@ -52,7 +52,7 @@ index 8f6455b..87144b1 100644
      style = RErr, [Bool "recoveryproc"], [];
      fish_alias = ["recovery-proc"]; config_only = true;
 diff --git a/generator/actions_properties_deprecated.ml b/generator/actions_properties_deprecated.ml
-index def17b9..5327782 100644
+index def17b926..53277822e 100644
 --- a/generator/actions_properties_deprecated.ml
 +++ b/generator/actions_properties_deprecated.ml
 @@ -125,6 +125,36 @@ Return the current backend.
@@ -93,7 +93,7 @@ index def17b9..5327782 100644
  
  let daemon_functions = [
 diff --git a/rescue/rescue.c b/rescue/rescue.c
-index ed40ba6..572a844 100644
+index 45967b2ad..b692e5a07 100644
 --- a/rescue/rescue.c
 +++ b/rescue/rescue.c
 @@ -295,9 +295,12 @@ main (int argc, char *argv[])
@@ -110,7 +110,7 @@ index ed40ba6..572a844 100644
    {
      /* The libvirt backend doesn't support direct mode.  As a temporary
 diff --git a/test-tool/test-tool.c b/test-tool/test-tool.c
-index 20e2a32..2ae266d 100644
+index 20e2a32fa..2ae266d7d 100644
 --- a/test-tool/test-tool.c
 +++ b/test-tool/test-tool.c
 @@ -224,7 +224,6 @@ main (int argc, char *argv[])
@@ -122,5 +122,5 @@ index 20e2a32..2ae266d 100644
    printf ("guestfs_get_hv: %s\n", p);
    free (p);
 -- 
-2.9.3
+2.12.0
 
diff --git a/0002-New-API-internal-get-console-socket-to-support-virt-.patch b/0002-New-API-internal-get-console-socket-to-support-virt-.patch
index f1ddf45..026b4ee 100644
--- a/0002-New-API-internal-get-console-socket-to-support-virt-.patch
+++ b/0002-New-API-internal-get-console-socket-to-support-virt-.patch
@@ -1,4 +1,4 @@
-From 7e7ba9a06c729bed1e782641488e64a2cb805cec Mon Sep 17 00:00:00 2001
+From 9e1f7b3613680d9e5aaaf4f41a1ff8528cf6c64d Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Thu, 2 Mar 2017 11:06:27 +0000
 Subject: [PATCH 02/10] New API: internal-get-console-socket to support
@@ -19,7 +19,7 @@ of the console socket.
  create mode 100644 lib/rescue.c
 
 diff --git a/generator/actions_core.ml b/generator/actions_core.ml
-index ed89f74..765a7fe 100644
+index 5e487df02..259ca9051 100644
 --- a/generator/actions_core.ml
 +++ b/generator/actions_core.ml
 @@ -1722,6 +1722,17 @@ call it returns a simple true/false boolean result, instead
@@ -41,7 +41,7 @@ index ed89f74..765a7fe 100644
  
  let daemon_functions = [
 diff --git a/generator/actions_properties_deprecated.ml b/generator/actions_properties_deprecated.ml
-index 5327782..f36509e 100644
+index 53277822e..f36509e75 100644
 --- a/generator/actions_properties_deprecated.ml
 +++ b/generator/actions_properties_deprecated.ml
 @@ -128,7 +128,7 @@ See C<guestfs_set_backend> and L<guestfs(3)/BACKEND>." };
@@ -63,7 +63,7 @@ index 5327782..f36509e 100644
      shortdesc = "get direct appliance mode flag";
      longdesc = "\
 diff --git a/lib/Makefile.am b/lib/Makefile.am
-index e1ab1bf..774274b 100644
+index e1ab1bff9..774274ba6 100644
 --- a/lib/Makefile.am
 +++ b/lib/Makefile.am
 @@ -116,6 +116,7 @@ libguestfs_la_SOURCES = \
@@ -75,7 +75,7 @@ index e1ab1bf..774274b 100644
  	structs-compare.c \
  	structs-copy.c \
 diff --git a/lib/conn-socket.c b/lib/conn-socket.c
-index 2cd261a..8ecfed8 100644
+index 2cd261a2b..8ecfed856 100644
 --- a/lib/conn-socket.c
 +++ b/lib/conn-socket.c
 @@ -1,5 +1,5 @@
@@ -114,7 +114,7 @@ index 2cd261a..8ecfed8 100644
  
  /**
 diff --git a/lib/guestfs-internal.h b/lib/guestfs-internal.h
-index 7126b88..5e9d97c 100644
+index 7126b88c7..5e9d97c07 100644
 --- a/lib/guestfs-internal.h
 +++ b/lib/guestfs-internal.h
 @@ -373,6 +373,9 @@ struct connection_ops {
@@ -129,7 +129,7 @@ index 7126b88..5e9d97c 100644
  /**
 diff --git a/lib/rescue.c b/lib/rescue.c
 new file mode 100644
-index 0000000..ae7811a
+index 000000000..ae7811a31
 --- /dev/null
 +++ b/lib/rescue.c
 @@ -0,0 +1,47 @@
@@ -181,5 +181,5 @@ index 0000000..ae7811a
 +  return g->conn->ops->get_console_sock (g, g->conn);
 +}
 -- 
-2.9.3
+2.12.0
 
diff --git a/0003-lib-Return-EPIPE-for-appliance-closed-the-connection.patch b/0003-lib-Return-EPIPE-for-appliance-closed-the-connection.patch
index 1fc86de..1dd775c 100644
--- a/0003-lib-Return-EPIPE-for-appliance-closed-the-connection.patch
+++ b/0003-lib-Return-EPIPE-for-appliance-closed-the-connection.patch
@@ -1,4 +1,4 @@
-From 4ddc1bbeb283e145055deefdd2d8b9a0cb06cd89 Mon Sep 17 00:00:00 2001
+From 77b910bf8326ef5ff38042fe4458e48ae9acca3c Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Fri, 3 Mar 2017 10:14:20 +0000
 Subject: [PATCH 03/10] lib: Return EPIPE for "appliance closed the connection
@@ -10,7 +10,7 @@ Subject: [PATCH 03/10] lib: Return EPIPE for "appliance closed the connection
  1 file changed, 8 insertions(+), 5 deletions(-)
 
 diff --git a/lib/errors.c b/lib/errors.c
-index c2af611..ace6a89 100644
+index c2af611ee..ace6a89cf 100644
 --- a/lib/errors.c
 +++ b/lib/errors.c
 @@ -358,12 +358,15 @@ void
@@ -35,5 +35,5 @@ index c2af611..ace6a89 100644
  
  /**
 -- 
-2.9.3
+2.12.0
 
diff --git a/0004-rescue-Modify-virt-rescue-so-it-doesn-t-use-direct-m.patch b/0004-rescue-Modify-virt-rescue-so-it-doesn-t-use-direct-m.patch
index ac28d30..68b2842 100644
--- a/0004-rescue-Modify-virt-rescue-so-it-doesn-t-use-direct-m.patch
+++ b/0004-rescue-Modify-virt-rescue-so-it-doesn-t-use-direct-m.patch
@@ -1,4 +1,4 @@
-From c3f60523655194eddc31c0e56765bd8f0a04d463 Mon Sep 17 00:00:00 2001
+From 0a58e959a8e32e5b232b2852ef5a4ea62ecdbfeb Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Thu, 2 Mar 2017 13:46:48 +0000
 Subject: [PATCH 04/10] rescue: Modify virt-rescue so it doesn't use direct
@@ -25,13 +25,13 @@ only using 80x24 of the screen because of the serial console.
 
 (cherry picked from commit 32d60801443647b3523b9374c431fefdbf054e3c)
 ---
- appliance/init     |  91 ++++++++--------
+ appliance/init     | 101 +++++++++---------
  rescue/Makefile.am |   1 +
  rescue/rescue.c    | 306 +++++++++++++++++++++++++++++++++++++++++++++--------
- 3 files changed, 312 insertions(+), 86 deletions(-)
+ 3 files changed, 317 insertions(+), 91 deletions(-)
 
 diff --git a/appliance/init b/appliance/init
-index 8a26e1a..810f84d 100755
+index 8a26e1a02..810f84d22 100755
 --- a/appliance/init
 +++ b/appliance/init
 @@ -159,59 +159,62 @@ if test "$guestfs_verbose" = 1 && test "$guestfs_boot_analysis" != 1; then
@@ -67,27 +67,19 @@ index 8a26e1a..810f84d 100755
 +    $cmd
  else
 -  # Run virt-rescue shell.
-+    # Run virt-rescue shell.
- 
+-
 -  # Get name of the serial port, from console= passed by libguestfs.
 -  guestfs_serial=$(grep -Eo 'console=[^[:space:]]+' /proc/cmdline |
 -                   sed s/console=//)
-+    # We need a daemon, even in virt-rescue.
-+    $cmd &
- 
+-
 -  # Remove LD_PRELOAD=libSegFault set above.
 -  unset LD_PRELOAD
-+    # Get name of the serial port, from console= passed by libguestfs.
-+    guestfs_serial=$(grep -Eo 'console=[^[:space:]]+' /proc/cmdline |
-+                     sed s/console=//)
- 
+-
 -  :> $HOME/.bashrc
 -  grep -Eo 'TERM=[^[:space:]]+' /proc/cmdline >> $HOME/.bashrc
 -  echo "PS1='><rescue> '" >> $HOME/.bashrc
 -  echo "export TERM PS1" >> $HOME/.bashrc
-+    # Remove LD_PRELOAD=libSegFault set above.
-+    unset LD_PRELOAD
- 
+-
 -  # The shell is opened by default on /dev/console, which (on Linux)
 -  # is not a controlling terminal, causing job control to fail.  For
 -  # how we work around this, see:
@@ -97,11 +89,7 @@ index 8a26e1a..810f84d 100755
 -    setsid bash -c \
 -      "exec bash </dev/$guestfs_serial >/dev/$guestfs_serial 2>&1"
 -  }
-+    :> $HOME/.bashrc
-+    grep -Eo 'TERM=[^[:space:]]+' /proc/cmdline >> $HOME/.bashrc
-+    echo "PS1='><rescue> '" >> $HOME/.bashrc
-+    echo "export TERM PS1" >> $HOME/.bashrc
- 
+-
 -  echo
 -  echo "------------------------------------------------------------"
 -  echo
@@ -115,6 +103,23 @@ index 8a26e1a..810f84d 100755
 -  echo
 -  echo "virt-rescue: Syncing the disk now before exiting ..."
 -  echo
++    # Run virt-rescue shell.
++
++    # We need a daemon, even in virt-rescue.
++    $cmd &
++
++    # Get name of the serial port, from console= passed by libguestfs.
++    guestfs_serial=$(grep -Eo 'console=[^[:space:]]+' /proc/cmdline |
++                     sed s/console=//)
++
++    # Remove LD_PRELOAD=libSegFault set above.
++    unset LD_PRELOAD
++
++    :> $HOME/.bashrc
++    grep -Eo 'TERM=[^[:space:]]+' /proc/cmdline >> $HOME/.bashrc
++    echo "PS1='><rescue> '" >> $HOME/.bashrc
++    echo "export TERM PS1" >> $HOME/.bashrc
++
 +    # The shell is opened by default on /dev/console, which (on Linux)
 +    # is not a controlling terminal, causing job control to fail.  For
 +    # how we work around this, see:
@@ -142,7 +147,7 @@ index 8a26e1a..810f84d 100755
  
  sync
 diff --git a/rescue/Makefile.am b/rescue/Makefile.am
-index 7919aaf..99d4b79 100644
+index 7919aafd5..99d4b79ae 100644
 --- a/rescue/Makefile.am
 +++ b/rescue/Makefile.am
 @@ -30,6 +30,7 @@ virt_rescue_SOURCES = \
@@ -154,7 +159,7 @@ index 7919aaf..99d4b79 100644
  	-I$(top_srcdir)/common/utils -I$(top_builddir)/common/utils \
  	-I$(top_srcdir)/lib -I$(top_builddir)/lib \
 diff --git a/rescue/rescue.c b/rescue/rescue.c
-index 572a844..43f41f9 100644
+index b692e5a07..b145dcd40 100644
 --- a/rescue/rescue.c
 +++ b/rescue/rescue.c
 @@ -23,21 +23,32 @@
@@ -266,7 +271,7 @@ index 572a844..43f41f9 100644
 +  free (append_full);
  
    /* Add drives. */
-   add_drives (drvs, 'a');
+   add_drives (drvs);
 @@ -347,22 +338,253 @@ main (int argc, char *argv[])
    /* Free up data structures, no longer needed after this point. */
    free_drives (drvs);
@@ -277,15 +282,11 @@ index 572a844..43f41f9 100644
 +   * output of the appliance console during launch and shutdown.
 +   * After launch, we will read the console messages directly from the
 +   * socket and they won't be passed through the event callback.
-    */
--  if (!verbose)
--    guestfs_set_error_handler (g, NULL, NULL);
++   */
 +  if (guestfs_set_event_callback (g, log_message_callback,
 +                                  GUESTFS_EVENT_APPLIANCE, 0, NULL) == -1)
 +    exit (EXIT_FAILURE);
- 
--  /* We expect launch to fail, so ignore the return value, and don't
--   * bother with explicit guestfs_shutdown either.
++
 +  /* Run the appliance. */
 +  if (guestfs_launch (g) == -1)
 +    exit (EXIT_FAILURE);
@@ -304,15 +305,20 @@ index 572a844..43f41f9 100644
 +
 +  /* Save the initial state of the tty so we always have the original
 +   * state to go back to.
-+   */
+    */
+-  if (!verbose)
+-    guestfs_set_error_handler (g, NULL, NULL);
 +  if (tcgetattr (STDIN_FILENO, &old_termios) == -1) {
 +    perror ("tcgetattr: stdin");
 +    exit (EXIT_FAILURE);
 +  }
-+
+ 
+-  /* We expect launch to fail, so ignore the return value, and don't
+-   * bother with explicit guestfs_shutdown either.
 +  /* Put stdin in raw mode so that we can receive ^C and other
 +   * special keys.
-+   */
+    */
+-  ignore_value (guestfs_launch (g));
 +  raw_tty ();
 +
 +  /* Restore the tty settings when the process exits. */
@@ -320,8 +326,7 @@ index 572a844..43f41f9 100644
 +
 +  /* Catch tty stop and cont signals so we can cleanup.
 +   * See https://www.gnu.org/software/libc/manual/html_node/Signaling-Yourself.html
-    */
--  ignore_value (guestfs_launch (g));
++   */
 +  signal (SIGTSTP, tstp_handler);
 +  signal (SIGCONT, cont_handler);
 +
@@ -529,5 +534,5 @@ index 572a844..43f41f9 100644
  
  static int
 -- 
-2.9.3
+2.12.0
 
diff --git a/0005-rescue-Implement-m-and-i-options.patch b/0005-rescue-Implement-m-and-i-options.patch
index 220f903..514a64d 100644
--- a/0005-rescue-Implement-m-and-i-options.patch
+++ b/0005-rescue-Implement-m-and-i-options.patch
@@ -1,4 +1,4 @@
-From 8825bc7b3d43dd00ca805516fdc4da59be2a39dd Mon Sep 17 00:00:00 2001
+From 706de149540c627800bc65bba49074177e719ffd Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Fri, 3 Mar 2017 13:52:31 +0000
 Subject: [PATCH 05/10] rescue: Implement -m and -i options.
@@ -21,7 +21,7 @@ page, since it is no longer needed.
  4 files changed, 126 insertions(+), 56 deletions(-)
 
 diff --git a/appliance/init b/appliance/init
-index 810f84d..968429c 100755
+index 810f84d22..968429c4b 100755
 --- a/appliance/init
 +++ b/appliance/init
 @@ -180,6 +180,10 @@ else
@@ -51,7 +51,7 @@ index 810f84d..968429c 100755
      run_bash_with_ctty
      echo
 diff --git a/rescue/Makefile.am b/rescue/Makefile.am
-index 99d4b79..c83c434 100644
+index 99d4b79ae..c83c43458 100644
 --- a/rescue/Makefile.am
 +++ b/rescue/Makefile.am
 @@ -35,7 +35,7 @@ virt_rescue_CPPFLAGS = \
@@ -72,7 +72,7 @@ index 99d4b79..c83c434 100644
  	$(top_builddir)/common/utils/libutils.la \
  	$(top_builddir)/lib/libguestfs.la \
 diff --git a/rescue/rescue.c b/rescue/rescue.c
-index 43f41f9..9f5c8b8 100644
+index b145dcd40..2b461378d 100644
 --- a/rescue/rescue.c
 +++ b/rescue/rescue.c
 @@ -23,7 +23,6 @@
@@ -192,7 +192,7 @@ index 43f41f9..9f5c8b8 100644
    free (append_full);
  
 -  /* Add drives. */
--  add_drives (drvs, 'a');
+-  add_drives (drvs);
 -
 -  /* Free up data structures, no longer needed after this point. */
 -  free_drives (drvs);
@@ -206,7 +206,7 @@ index 43f41f9..9f5c8b8 100644
  
 -  /* Run the appliance. */
 +  /* Do the guest drives and mountpoints. */
-+  add_drives (drvs, 'a');
++  add_drives (drvs);
    if (guestfs_launch (g) == -1)
      exit (EXIT_FAILURE);
 +  if (inspector)
@@ -259,7 +259,7 @@ index 43f41f9..9f5c8b8 100644
    /* Save the initial state of the tty so we always have the original
     * state to go back to.
 diff --git a/rescue/virt-rescue.pod b/rescue/virt-rescue.pod
-index b8aa326..b651f84 100644
+index b8aa32637..b651f84e7 100644
 --- a/rescue/virt-rescue.pod
 +++ b/rescue/virt-rescue.pod
 @@ -6,9 +6,7 @@ virt-rescue - Run a rescue shell on a virtual machine
@@ -396,5 +396,5 @@ index b8aa326..b651f84 100644
  
  See L<guestfish(1)/OPENING DISKS FOR READ AND WRITE>.
 -- 
-2.9.3
+2.12.0
 
diff --git a/0006-rescue-Implement-escape-sequences.patch b/0006-rescue-Implement-escape-sequences.patch
index 20e5d8f..88943b6 100644
--- a/0006-rescue-Implement-escape-sequences.patch
+++ b/0006-rescue-Implement-escape-sequences.patch
@@ -1,4 +1,4 @@
-From 43fce2182988513cb74a122431b74af15b856bb5 Mon Sep 17 00:00:00 2001
+From 50a9f9e5d5fc45c1fd035f2ea990d8b7d27d3e32 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Sat, 4 Mar 2017 11:47:59 +0000
 Subject: [PATCH 06/10] rescue: Implement escape sequences.
@@ -44,7 +44,7 @@ unmounting filesystems ...
  create mode 100644 rescue/rescue.h
 
 diff --git a/rescue/Makefile.am b/rescue/Makefile.am
-index c83c434..eb60baf 100644
+index c83c43458..eb60bafa4 100644
 --- a/rescue/Makefile.am
 +++ b/rescue/Makefile.am
 @@ -26,7 +26,9 @@ EXTRA_DIST = \
@@ -60,7 +60,7 @@ index c83c434..eb60baf 100644
  	-DGUESTFS_WARN_DEPRECATED=1 \
 diff --git a/rescue/escape.c b/rescue/escape.c
 new file mode 100644
-index 0000000..f7f7d84
+index 000000000..f7f7d84c4
 --- /dev/null
 +++ b/rescue/escape.c
 @@ -0,0 +1,302 @@
@@ -367,7 +367,7 @@ index 0000000..f7f7d84
 +  }
 +}
 diff --git a/rescue/rescue.c b/rescue/rescue.c
-index 9f5c8b8..44f7e61 100644
+index 2b461378d..5281b1161 100644
 --- a/rescue/rescue.c
 +++ b/rescue/rescue.c
 @@ -1,5 +1,5 @@
@@ -467,7 +467,7 @@ index 9f5c8b8..44f7e61 100644
      /* Log message from appliance. */
 diff --git a/rescue/rescue.h b/rescue/rescue.h
 new file mode 100644
-index 0000000..ccffb5e
+index 000000000..ccffb5eb3
 --- /dev/null
 +++ b/rescue/rescue.h
 @@ -0,0 +1,47 @@
@@ -519,7 +519,7 @@ index 0000000..ccffb5e
 +
 +#endif /* RESCUE_H */
 diff --git a/rescue/virt-rescue.pod b/rescue/virt-rescue.pod
-index b651f84..bd6f954 100644
+index b651f84e7..bd6f954e9 100644
 --- a/rescue/virt-rescue.pod
 +++ b/rescue/virt-rescue.pod
 @@ -128,6 +128,29 @@ not used at all.
@@ -611,5 +611,5 @@ index b651f84..bd6f954 100644
  
  If you are testing a tool inside virt-rescue and the tool (B<not>
 -- 
-2.9.3
+2.12.0
 
diff --git a/0007-rescue-Move-suggest-code-to-separate-file.patch b/0007-rescue-Move-suggest-code-to-separate-file.patch
index 0b4a739..c3d4c45 100644
--- a/0007-rescue-Move-suggest-code-to-separate-file.patch
+++ b/0007-rescue-Move-suggest-code-to-separate-file.patch
@@ -1,4 +1,4 @@
-From 521550ef7febe442f534cfc86c4a373126f3e98e Mon Sep 17 00:00:00 2001
+From 0e507fbd61b733702fc2b5062bb2054b8d3d090b Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Sat, 4 Mar 2017 15:35:09 +0000
 Subject: [PATCH 07/10] rescue: Move --suggest code to separate file.
@@ -15,7 +15,7 @@ Just code motion.
  create mode 100644 rescue/suggest.c
 
 diff --git a/rescue/Makefile.am b/rescue/Makefile.am
-index eb60baf..d478c8e 100644
+index eb60bafa4..d478c8e3d 100644
 --- a/rescue/Makefile.am
 +++ b/rescue/Makefile.am
 @@ -28,7 +28,8 @@ bin_PROGRAMS = virt-rescue
@@ -29,7 +29,7 @@ index eb60baf..d478c8e 100644
  virt_rescue_CPPFLAGS = \
  	-DGUESTFS_WARN_DEPRECATED=1 \
 diff --git a/rescue/rescue.c b/rescue/rescue.c
-index 44f7e61..6ef4607 100644
+index 5281b1161..a1aac53e4 100644
 --- a/rescue/rescue.c
 +++ b/rescue/rescue.c
 @@ -55,7 +55,6 @@ static void restore_tty (void);
@@ -67,7 +67,7 @@ index 44f7e61..6ef4607 100644
 -  read_only = 1;
 -
 -  /* Add drives. */
--  add_drives (drvs, 'a');
+-  add_drives (drvs);
 -
 -  /* Free up data structures, no longer needed after this point. */
 -  free_drives (drvs);
@@ -191,7 +191,7 @@ index 44f7e61..6ef4607 100644
  
  static void
 diff --git a/rescue/rescue.h b/rescue/rescue.h
-index ccffb5e..4f5a04a 100644
+index ccffb5eb3..4f5a04a71 100644
 --- a/rescue/rescue.h
 +++ b/rescue/rescue.h
 @@ -23,6 +23,8 @@
@@ -213,7 +213,7 @@ index ccffb5e..4f5a04a 100644
  #endif /* RESCUE_H */
 diff --git a/rescue/suggest.c b/rescue/suggest.c
 new file mode 100644
-index 0000000..07c9f47
+index 000000000..13141ccc2
 --- /dev/null
 +++ b/rescue/suggest.c
 @@ -0,0 +1,175 @@
@@ -273,7 +273,7 @@ index 0000000..07c9f47
 +  read_only = 1;
 +
 +  /* Add drives. */
-+  add_drives (drvs, 'a');
++  add_drives (drvs);
 +
 +  /* Free up data structures, no longer needed after this point. */
 +  free_drives (drvs);
@@ -393,5 +393,5 @@ index 0000000..07c9f47
 +#undef TEST_MOUNTABLE
 +}
 -- 
-2.9.3
+2.12.0
 
diff --git a/0008-rescue-docs-It-is-no-longer-necessary-to-mount-files.patch b/0008-rescue-docs-It-is-no-longer-necessary-to-mount-files.patch
index d6b55a7..b85e15a 100644
--- a/0008-rescue-docs-It-is-no-longer-necessary-to-mount-files.patch
+++ b/0008-rescue-docs-It-is-no-longer-necessary-to-mount-files.patch
@@ -1,4 +1,4 @@
-From 0862b461c299297689936c432ee62b8bc2f500a9 Mon Sep 17 00:00:00 2001
+From daea7d5d2a602e6448cc7fb25bf1d6aec25e08d7 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Fri, 24 Mar 2017 22:51:06 +0000
 Subject: [PATCH 08/10] rescue: docs: It is no longer necessary to mount
@@ -14,7 +14,7 @@ Fixes commit 33d2ae796119ae5dd38e2afcbf1ba4216bd99846.
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/rescue/virt-rescue.pod b/rescue/virt-rescue.pod
-index bd6f954..dfa74e2 100644
+index bd6f954e9..dfa74e204 100644
 --- a/rescue/virt-rescue.pod
 +++ b/rescue/virt-rescue.pod
 @@ -35,9 +35,9 @@ For live VMs you I<must> use the I<--ro> option.
@@ -31,5 +31,5 @@ index bd6f954..dfa74e2 100644
  To automatically mount the virtual machine's filesystems under
  F</sysroot> use the I<-i> option.  This uses libguestfs inspection to
 -- 
-2.9.3
+2.12.0
 
diff --git a/0009-rescue-docs-Note-that-you-can-run-virt-rescue-on-dis.patch b/0009-rescue-docs-Note-that-you-can-run-virt-rescue-on-dis.patch
index 8254666..a7d46fb 100644
--- a/0009-rescue-docs-Note-that-you-can-run-virt-rescue-on-dis.patch
+++ b/0009-rescue-docs-Note-that-you-can-run-virt-rescue-on-dis.patch
@@ -1,4 +1,4 @@
-From 5f60f8dad427af5a07c54613a26cbd9c02ee9b51 Mon Sep 17 00:00:00 2001
+From 47a4662ab9f4141430ca1b0f78cfee7efc17c264 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Fri, 24 Mar 2017 22:52:02 +0000
 Subject: [PATCH 09/10] rescue: docs: Note that you can run virt-rescue on
@@ -10,7 +10,7 @@ Subject: [PATCH 09/10] rescue: docs: Note that you can run virt-rescue on
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/rescue/virt-rescue.pod b/rescue/virt-rescue.pod
-index dfa74e2..5cfbd6e 100644
+index dfa74e204..5cfbd6e1c 100644
 --- a/rescue/virt-rescue.pod
 +++ b/rescue/virt-rescue.pod
 @@ -69,7 +69,8 @@ Virt-rescue can be used on I<any> disk image file or device, not just
@@ -24,5 +24,5 @@ index dfa74e2..5cfbd6e 100644
  You can get virt-rescue to give you scratch disk(s) to play with.
  This is useful for testing out Linux utilities (see I<--scratch>).
 -- 
-2.9.3
+2.12.0
 
diff --git a/0010-rescue-Don-t-document-suggest-option-in-help-output.patch b/0010-rescue-Don-t-document-suggest-option-in-help-output.patch
index 1b6f5e2..5e1b496 100644
--- a/0010-rescue-Don-t-document-suggest-option-in-help-output.patch
+++ b/0010-rescue-Don-t-document-suggest-option-in-help-output.patch
@@ -1,4 +1,4 @@
-From 1727f1d181ed66d5563f564911c9b68e631de10a Mon Sep 17 00:00:00 2001
+From a8543b586a81cb897db265841dc67bda710b9cac Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Sat, 25 Mar 2017 23:34:09 +0000
 Subject: [PATCH 10/10] rescue: Don't document --suggest option in --help
@@ -15,7 +15,7 @@ Updates/fixes commit 33d2ae796119ae5dd38e2afcbf1ba4216bd99846.
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/rescue/rescue.c b/rescue/rescue.c
-index 6ef4607..c88e9f3 100644
+index a1aac53e4..6f9dcd733 100644
 --- a/rescue/rescue.c
 +++ b/rescue/rescue.c
 @@ -101,7 +101,6 @@ usage (int status)
@@ -27,7 +27,7 @@ index 6ef4607..c88e9f3 100644
                "  -V|--version         Display version and exit\n"
                "  -w|--rw              Mount read-write\n"
 diff --git a/rescue/test-virt-rescue-docs.sh b/rescue/test-virt-rescue-docs.sh
-index 25f8f60..e5fbf26 100755
+index 25f8f6095..e5fbf26f4 100755
 --- a/rescue/test-virt-rescue-docs.sh
 +++ b/rescue/test-virt-rescue-docs.sh
 @@ -21,4 +21,5 @@ set -e
@@ -38,5 +38,5 @@ index 25f8f60..e5fbf26 100755
 +$top_srcdir/podcheck.pl virt-rescue.pod virt-rescue \
 +                        --ignore=--suggest
 -- 
-2.9.3
+2.12.0