From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1UEErJ-0005P6-8R for mharc-grub-devel@gnu.org; Sat, 09 Mar 2013 03:10:25 -0500 Received: from eggs.gnu.org ([208.118.235.92]:50404) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UEErC-0005Oh-2f for grub-devel@gnu.org; Sat, 09 Mar 2013 03:10:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UEEr7-0004dX-25 for grub-devel@gnu.org; Sat, 09 Mar 2013 03:10:18 -0500 Received: from mail-bk0-x235.google.com ([2a00:1450:4008:c01::235]:54416) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UEEr6-0004ck-Rt for grub-devel@gnu.org; Sat, 09 Mar 2013 03:10:13 -0500 Received: by mail-bk0-f53.google.com with SMTP id j10so1029799bkw.26 for ; Sat, 09 Mar 2013 00:10:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:subject:date:message-id:x-mailer; bh=/I1dd5Hxmo3xDDyIc2UNvvjJHPSd6/+hKoewW2L/a+c=; b=SONaDKk006RhDY3oWOldefGYLeT6+onDZf0+J5SzschjpAU0ZTsCUDKy+lt+8W+Xna yvMrRDmU7nGugoJViBmkiiwrTAtvFu2ouPU9EYkmI5M/Zf+5AINVrpdAeU9CBt+H6Oe/ HxrfflB5sUiPOHy6sw0dShgQPUGLRJb1o1YoKyMPvXsG7RVDMyboubRkJMSZvLsMKHNa KuHzaNmTBSGTBmB69Fh3Co//A3tfCJNpn8vdUhDSQfrOLYXW7LbZ9iGVoYy0s+K4NX9p LJNAJtAkWQ83VvWCJXQa3D5wrFySodg6S+WktvakojGNqlEubpMlNBrcbjELnzd1jvyJ Y1Kg== X-Received: by 10.205.64.199 with SMTP id xj7mr1995896bkb.76.1362816611674; Sat, 09 Mar 2013 00:10:11 -0800 (PST) Received: from localhost.localdomain (ppp79-139-243-180.pppoe.spdop.ru. [79.139.243.180]) by mx.google.com with ESMTPS id fw3sm2140188bkc.9.2013.03.09.00.10.10 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 09 Mar 2013 00:10:10 -0800 (PST) From: Andrey Borzenkov To: grub-devel@gnu.org Subject: [PATCH] return failure from grub-mount if fuse_main failed Date: Sat, 9 Mar 2013 12:08:51 +0400 Message-Id: <1362816531-2222-1-git-send-email-arvidjaar@gmail.com> X-Mailer: git-send-email 1.7.10.4 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4008:c01::235 X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Mar 2013 08:10:24 -0000 Currently there is no way to check that mount was successful. It caused problem with os-prober which did not try kernel mount fallback. Return value of fuse_init is currenty unused, but still it looks wrong to always return success. In this case it should simply be void; if it returns value, let value be correct. Ref: https://bugzilla.novell.com/show_bug.cgi?id=802983 Signed-off-by: Andrey Borzenkov --- ChangeLog | 5 +++++ util/grub-mount.c | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3b4b3b4..bb9f431 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2013-03-09 Andrey Borzenkov + + * util/grub-mount.c (fuse_init): Return error if fuse_main + failed. + 2013-03-07 Andrey Borzenkov * grub-core/fs/iso9660.c (add_part): Remove always_inline attribute diff --git a/util/grub-mount.c b/util/grub-mount.c index d0ab6a2..1c59c59 100644 --- a/util/grub-mount.c +++ b/util/grub-mount.c @@ -407,7 +407,8 @@ fuse_init (void) return grub_errno; } - fuse_main (fuse_argc, fuse_args, &grub_opers, NULL); + if (fuse_main (fuse_argc, fuse_args, &grub_opers, NULL)) + grub_error (GRUB_ERR_UNKNOWN_FS, "fuse_main failed"); for (i = 0; i < num_disks; i++) { @@ -427,7 +428,7 @@ fuse_init (void) grub_free (loop_name); } - return GRUB_ERR_NONE; + return grub_errno; } static struct argp_option options[] = { -- tg: (475ef5e..) bnc/802983 (depends on: master)