* grub-core/loader/arm/linux.c: Use common initrd functions.

diff --git a/ChangeLog b/ChangeLog
index fdf8c7fb20ea2c8af0be3cb21336a5d33c2a54cd..f6e3800a55203be24106aefaaef1ad3d59124085 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-12-18  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/loader/arm/linux.c: Use common initd functions.
+
 2013-12-18  Vladimir Serbinenko  <phcoder@gmail.com>
 
        Decrease number of strings to translate.

diff --git a/grub-core/loader/arm/linux.c b/grub-core/loader/arm/linux.c
index 7041743aa9064ec68d37750234b57f40a712df39..14a34bfbf63d42f7b4a750774212a09bc201121c 100644 (file)
--- a/grub-core/loader/arm/linux.c
+++ b/grub-core/loader/arm/linux.c
@@ -27,6 +27,7 @@
 #include <grub/cache.h>
 #include <grub/cpu/linux.h>
 #include <grub/lib/cmdline.h>
+#include <grub/linux.h>
 
 GRUB_MOD_LICENSE ("GPLv3+");
 
@@ -265,7 +266,8 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
                 int argc, char *argv[])
 {
   grub_file_t file;
-  int size;
+  grub_size_t size = 0;
+  struct grub_linux_initrd_context initrd_ctx;
 
   if (argc == 0)
     return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected"));
@@ -274,10 +276,11 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
   if (!file)
     return grub_errno;
 
-  size = grub_file_size (file);
-  if (size == 0)
+  if (grub_initrd_init (argc, argv, &initrd_ctx))
     goto fail;
 
+  size = grub_get_initrd_size (&initrd_ctx);
+
   if (initrd_start)
     grub_free ((void *) initrd_start);
 #ifdef GRUB_MACHINE_EFI
@@ -295,14 +298,8 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
   grub_dprintf ("loader", "Loading initrd to 0x%08x\n",
                (grub_addr_t) initrd_start);
 
-  if (grub_file_read (file, (void *) initrd_start, size) != size)
-    {
-      initrd_start = 0;
-      if (!grub_errno)
-       grub_error (GRUB_ERR_BAD_OS, N_("premature end of file %s"),
-                   argv[0]);
-      goto fail;
-    }
+  if (grub_initrd_load (&initrd_ctx, argv, (void *) initrd_start))
+    goto fail;
 
   initrd_end = initrd_start + size;