|
 |
f96e0b |
From c59392f94ef1544cc8d24cecfbca69798ba7e556 Mon Sep 17 00:00:00 2001
|
|
|
f96e0b |
From: Andrey Borzenkov <arvidjaar@gmail.com>
|
|
|
f96e0b |
Date: Wed, 3 Apr 2013 11:28:16 +0200
|
|
|
f96e0b |
Subject: [PATCH 246/482] * util/grub-mount.c (fuse_init): Return error
|
|
|
f96e0b |
if fuse_main failed.
|
|
|
f96e0b |
|
|
|
f96e0b |
---
|
|
|
f96e0b |
ChangeLog | 5 +++++
|
|
|
f96e0b |
util/grub-mount.c | 5 +++--
|
|
|
f96e0b |
2 files changed, 8 insertions(+), 2 deletions(-)
|
|
|
f96e0b |
|
|
|
f96e0b |
diff --git a/ChangeLog b/ChangeLog
|
|
|
f96e0b |
index 56588dd..7cda161 100644
|
|
|
f96e0b |
--- a/ChangeLog
|
|
|
f96e0b |
+++ b/ChangeLog
|
|
|
f96e0b |
@@ -1,3 +1,8 @@
|
|
|
f96e0b |
+2013-04-03 Andrey Borzenkov <arvidjaar@gmail.com>
|
|
|
f96e0b |
+
|
|
|
f96e0b |
+ * util/grub-mount.c (fuse_init): Return error if fuse_main
|
|
|
f96e0b |
+ failed.
|
|
|
f96e0b |
+
|
|
|
f96e0b |
2013-04-03 Francesco Lavra <francescolavra.fl@gmail.com>
|
|
|
f96e0b |
|
|
|
f96e0b |
* include/grub/elf.h: Add missing ARM relocation codes and fix
|
|
|
f96e0b |
diff --git a/util/grub-mount.c b/util/grub-mount.c
|
|
|
f96e0b |
index d0ab6a2..4a2333a 100644
|
|
|
f96e0b |
--- a/util/grub-mount.c
|
|
|
f96e0b |
+++ b/util/grub-mount.c
|
|
|
f96e0b |
@@ -407,7 +407,8 @@ fuse_init (void)
|
|
|
f96e0b |
return grub_errno;
|
|
|
f96e0b |
}
|
|
|
f96e0b |
|
|
|
f96e0b |
- fuse_main (fuse_argc, fuse_args, &grub_opers, NULL);
|
|
|
f96e0b |
+ if (fuse_main (fuse_argc, fuse_args, &grub_opers, NULL))
|
|
|
f96e0b |
+ grub_error (GRUB_ERR_IO, "fuse_main failed");
|
|
|
f96e0b |
|
|
|
f96e0b |
for (i = 0; i < num_disks; i++)
|
|
|
f96e0b |
{
|
|
|
f96e0b |
@@ -427,7 +428,7 @@ fuse_init (void)
|
|
|
f96e0b |
grub_free (loop_name);
|
|
|
f96e0b |
}
|
|
|
f96e0b |
|
|
|
f96e0b |
- return GRUB_ERR_NONE;
|
|
|
f96e0b |
+ return grub_errno;
|
|
|
f96e0b |
}
|
|
|
f96e0b |
|
|
|
f96e0b |
static struct argp_option options[] = {
|
|
|
f96e0b |
--
|
|
|
f96e0b |
1.8.2.1
|
|
|
f96e0b |
|