Hello community, here is the log from the commit of package grub2 for openSUSE:Factory checked in at 2013-03-05 16:31:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/grub2 (Old) and /work/SRC/openSUSE:Factory/.grub2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "grub2", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/grub2/grub2.changes 2013-02-21 15:32:21.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2013-03-05 16:31:14.000000000 +0100 @@ -1,0 +2,11 @@ +Mon Mar 4 16:48:32 UTC 2013 - [email protected] + +- grub2-grub-mount-return-failure-if-FUSE-failed.patch - return error + if fuse_main failed (bnc#802983) + +------------------------------------------------------------------- +Mon Feb 25 13:31:31 UTC 2013 - [email protected] + +- Fix build for SLES 11. + +------------------------------------------------------------------- New: ---- grub2-grub-mount-return-failure-if-FUSE-failed.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ grub2.spec ++++++ --- /var/tmp/diff_new_pack.ZEDsOV/_old 2013-03-05 16:31:17.000000000 +0100 +++ /var/tmp/diff_new_pack.ZEDsOV/_new 2013-03-05 16:31:17.000000000 +0100 @@ -46,7 +46,7 @@ BuildRequires: python BuildRequires: xz-devel %ifarch x86_64 -%if 0%{?suse_version} >= 1230 || 0%{?sles_version} >= 11 +%if 0%{?suse_version} >= 1230 || 0%{?suse_version} == 1110 BuildRequires: pesign-obs-integration %endif %endif @@ -79,7 +79,7 @@ %endif %endif -%if 0%{?suse_version} == 1110 || 0%{?sles_version} == 11 +%if 0%{?suse_version} == 1110 %define only_efi %{nil} %define only_x86_64 %{nil} %endif @@ -133,6 +133,7 @@ Patch29: grub2-secureboot-chainloader.patch Patch30: grub2-cdpath.patch Patch31: efidisk-ahci-workaround +Patch32: grub2-grub-mount-return-failure-if-FUSE-failed.patch PreReq: perl-Bootloader Requires: gettext-runtime %if 0%{?suse_version} >= 1140 @@ -233,7 +234,7 @@ %patch0 -p1 %patch1 -p1 # Workaround SLE11's patch utility did not rename the file for us -%if 0%{?suse_version} == 1110 || 0%{?sles_version} == 11 +%if 0%{?suse_version} == 1110 mv docs/grub.texi docs/grub2.texi %endif %patch2 -p1 @@ -268,6 +269,7 @@ %patch29 -p1 %patch30 -p1 %patch31 -p1 +%patch32 -p1 # README.openSUSE cp %{SOURCE3} . @@ -355,7 +357,7 @@ %install %ifarch %{efi} %ifarch x86_64 -%if 0%{?suse_version} >= 1230 || 0%{?sles_version} >= 11 +%if 0%{?suse_version} >= 1230 || 0%{?suse_version} == 1110 export BRP_PESIGN_FILES="%{_libdir}/%{name}/%{grubefiarch}/grub.efi" %endif %endif ++++++ grub2-grub-mount-return-failure-if-FUSE-failed.patch ++++++ From: Andrey Borzenkov <[email protected]> To: [email protected] Subject: [PATCH] return failure from grub-mount if fuse_main failed 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 <[email protected]> --- util/grub-mount.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) Index: grub-2.00/util/grub-mount.c =================================================================== --- grub-2.00.orig/util/grub-mount.c +++ grub-2.00/util/grub-mount.c @@ -383,7 +383,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++) { @@ -403,7 +404,7 @@ fuse_init (void) grub_free (loop_name); } - return GRUB_ERR_NONE; + return grub_errno; } static struct argp_option options[] = { -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
