update to 2.7

[pve-qemu-kvm.git] / debian / patches / pve / 0013-vma-add-config-command-to-dump-the-config.patch

diff --git a/debian/patches/pve/0013-vma-add-config-command-to-dump-the-config.patch b/debian/patches/pve/0013-vma-add-config-command-to-dump-the-config.patch
index a268a154d72d75cad4cf31ca700eac45da7e88d0..1dbbaa0bf29877ac74fd1d86e2142d8678676960 100644 (file)
--- a/debian/patches/pve/0013-vma-add-config-command-to-dump-the-config.patch
+++ b/debian/patches/pve/0013-vma-add-config-command-to-dump-the-config.patch
@@ -1,17 +1,17 @@
-From 4cf741ef0ec95b62dab484f5630e0f5fd608220a Mon Sep 17 00:00:00 2001
+From fbe4db594bee11864b82c5839425348bc4133c9b Mon Sep 17 00:00:00 2001
 From: Wolfgang Bumiller <w.bumiller@proxmox.com>
 Date: Wed, 9 Dec 2015 14:46:49 +0100
-Subject: [PATCH 13/55] vma: add 'config' command to dump the config
+Subject: [PATCH 13/41] vma: add 'config' command to dump the config
 
 ---
  vma.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 64 insertions(+)
 
 diff --git a/vma.c b/vma.c
-index 3ad2f18..6a33352 100644
+index d55874a..79bdd00 100644
 --- a/vma.c
 +++ b/vma.c
-@@ -32,6 +32,7 @@ static void help(void)
+@@ -26,6 +26,7 @@ static void help(void)
          "usage: vma command [command options]\n"
          "\n"
          "vma list <filename>\n"
@@ -19,7 +19,7 @@ index 3ad2f18..6a33352 100644
          "vma create <filename> [-c config] <archive> pathname ...\n"
          "vma extract <filename> [-r <fifo>] <targetdir>\n"
          "vma verify <filename> [-v]\n"
-@@ -601,6 +602,67 @@ static int create_archive(int argc, char **argv)
+@@ -604,6 +605,67 @@ static int create_archive(int argc, char **argv)
      return 0;
  }
  
@@ -87,7 +87,7 @@ index 3ad2f18..6a33352 100644
  int main(int argc, char **argv)
  {
      const char *cmdname;
-@@ -630,6 +692,8 @@ int main(int argc, char **argv)
+@@ -633,6 +695,8 @@ int main(int argc, char **argv)
          return extract_content(argc, argv);
      } else if (!strcmp(cmdname, "verify")) {
          return verify_content(argc, argv);