update GRUB

1 files changed, 12 insertions, 12 deletions

diff --git a/resources/grub/patch/grub.johnlane.ie/0001-Cryptomount-support-LUKS-detached-header.patch b/resources/grub/patch/grub.johnlane.ie/0001-Cryptomount-support-LUKS-detached-header.patch
index ed27dc4..fa3c805 100644
--- a/resources/grub/patch/grub.johnlane.ie/0001-Cryptomount-support-LUKS-detached-header.patch
+++ b/resources/grub/patch/grub.johnlane.ie/0001-Cryptomount-support-LUKS-detached-header.patch
@@ -1,7 +1,7 @@
-From 5c643ba894421ac78c3fe18ff9548d8e9fa82ed4 Mon Sep 17 00:00:00 2001
+From bc2a23386d123d37510c3cff1f7e607e7cf49cb1 Mon Sep 17 00:00:00 2001
 From: John Lane <john@lane.uk.net>
 Date: Tue, 23 Jun 2015 11:16:30 +0100
-Subject: [PATCH 1/5] Cryptomount support LUKS detached header
+Subject: [PATCH 1/6] Cryptomount support LUKS detached header
 
 ---
  grub-core/disk/cryptodisk.c | 22 ++++++++++++++++++----
@@ -11,10 +11,10 @@ Subject: [PATCH 1/5] Cryptomount support LUKS detached header
  4 files changed, 63 insertions(+), 16 deletions(-)
 
 diff --git a/grub-core/disk/cryptodisk.c b/grub-core/disk/cryptodisk.c
-index 82a3dcb..6f596a0 100644
+index 1e03a09..dd8870d 100644
 --- a/grub-core/disk/cryptodisk.c
 +++ b/grub-core/disk/cryptodisk.c
-@@ -40,6 +40,7 @@ static const struct grub_arg_option options[] =
+@@ -41,6 +41,7 @@ static const struct grub_arg_option options[] =
      /* TRANSLATORS: It's still restricted to cryptodisks only.  */
      {"all", 'a', 0, N_("Mount all."), 0, 0},
      {"boot", 'b', 0, N_("Mount all volumes with `boot' flag set."), 0, 0},
@@ -22,7 +22,7 @@ index 82a3dcb..6f596a0 100644
      {0, 0, 0, 0, 0, 0}
    };
  
-@@ -803,6 +804,7 @@ grub_util_cryptodisk_get_uuid (grub_disk_t disk)
+@@ -808,6 +809,7 @@ grub_util_cryptodisk_get_uuid (grub_disk_t disk)
  
  static int check_boot, have_it;
  static char *search_uuid;
@@ -30,7 +30,7 @@ index 82a3dcb..6f596a0 100644
  
  static void
  cryptodisk_close (grub_cryptodisk_t dev)
-@@ -827,13 +829,13 @@ grub_cryptodisk_scan_device_real (const char *name, grub_disk_t source)
+@@ -832,13 +834,13 @@ grub_cryptodisk_scan_device_real (const char *name, grub_disk_t source)
  
    FOR_CRYPTODISK_DEVS (cr)
    {
@@ -46,7 +46,7 @@ index 82a3dcb..6f596a0 100644
      if (err)
      {
        cryptodisk_close (dev);
-@@ -874,7 +876,7 @@ grub_cryptodisk_cheat_mount (const char *sourcedev, const char *cheat)
+@@ -879,7 +881,7 @@ grub_cryptodisk_cheat_mount (const char *sourcedev, const char *cheat)
  
    FOR_CRYPTODISK_DEVS (cr)
    {
@@ -55,7 +55,7 @@ index 82a3dcb..6f596a0 100644
      if (grub_errno)
        return grub_errno;
      if (!dev)
-@@ -928,6 +930,18 @@ grub_cmd_cryptomount (grub_extcmd_context_t ctxt, int argc, char **args)
+@@ -933,6 +935,18 @@ grub_cmd_cryptomount (grub_extcmd_context_t ctxt, int argc, char **args)
    if (argc < 1 && !state[1].set && !state[2].set)
      return grub_error (GRUB_ERR_BAD_ARGUMENT, "device name required");
  
@@ -74,7 +74,7 @@ index 82a3dcb..6f596a0 100644
    have_it = 0;
    if (state[0].set)
      {
-@@ -1125,7 +1139,7 @@ GRUB_MOD_INIT (cryptodisk)
+@@ -1140,7 +1154,7 @@ GRUB_MOD_INIT (cryptodisk)
  {
    grub_disk_dev_register (&grub_cryptodisk_dev);
    cmd = grub_register_extcmd ("cryptomount", grub_cmd_cryptomount, 0,
@@ -220,7 +220,7 @@ index 86c50c6..66e64c0 100644
  	{
  	  grub_free (split_key);
 diff --git a/include/grub/cryptodisk.h b/include/grub/cryptodisk.h
-index f2ad2a7..16dee3c 100644
+index 32f564a..4e6e89a 100644
 --- a/include/grub/cryptodisk.h
 +++ b/include/grub/cryptodisk.h
 @@ -20,6 +20,7 @@
@@ -231,7 +231,7 @@ index f2ad2a7..16dee3c 100644
  #include <grub/crypto.h>
  #include <grub/list.h>
  #ifdef GRUB_UTIL
-@@ -106,8 +107,8 @@ struct grub_cryptodisk_dev
+@@ -107,8 +108,8 @@ struct grub_cryptodisk_dev
    struct grub_cryptodisk_dev **prev;
  
    grub_cryptodisk_t (*scan) (grub_disk_t disk, const char *check_uuid,
@@ -243,5 +243,5 @@ index f2ad2a7..16dee3c 100644
  typedef struct grub_cryptodisk_dev *grub_cryptodisk_dev_t;
  
 -- 
-2.1.2
+1.9.1