rpms
/
libguestfs
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Add upstream patch to skip mount-local test if /dev/fuse not writable.

This commit is contained in:
Richard W.M. Jones 2012-07-20 08:37:33 +01:00
parent e68dcf7da1
commit 65d6c9ef4d
2 changed files with 39 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
0001-ocaml-Skip-mount-local-test-if-dev-fuse-is-not-writa.patch Normal file
View File

@ -0,0 +1,31 @@
From 184b9d7c11f771a74c981f739c28fa0713f3e3e7 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Fri, 20 Jul 2012 08:34:46 +0100
Subject: [PATCH] ocaml: Skip mount-local test if /dev/fuse is not writable.
---
ocaml/t/guestfs_500_mount_local.ml | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/ocaml/t/guestfs_500_mount_local.ml b/ocaml/t/guestfs_500_mount_local.ml
index fb22d02..3047544 100644
--- a/ocaml/t/guestfs_500_mount_local.ml
+++ b/ocaml/t/guestfs_500_mount_local.ml
@@ -30,6 +30,14 @@ let debug = true (* overview debugging messages *)
let rec main () =
Random.self_init ();
+ let fuse_writable =
+ try access "/dev/fuse" [W_OK]; true with Unix_error _ -> false in
+ if not fuse_writable then (
+ printf "%s: test skipped because /dev/fuse is not writable.\n"
+ Sys.executable_name;
+ exit 77
+ );
+
(* Allow the test to be skipped by setting this environment variable.
* This is for RHEL 5, where FUSE doesn't work very reliably.
*)
--
1.7.10.4

9
libguestfs.spec
View File

@ -22,7 +22,7 @@ Summary: Access and modify virtual machine disk images
Name: libguestfs
Epoch: 1
Version: 1.19.22
Release: 1%{?dist}
Release: 2%{?dist}
License: LGPLv2+
Group: Development/Libraries
URL: http://libguestfs.org/
@ -34,6 +34,9 @@ Patch1: ruby-1.9-vendor-not-site.patch
BuildRequires: autoconf, automake, libtool, gettext-devel
%endif
# Upstream patch to disable OCaml FUSE test when /dev/fuse is not writable.
Patch2: 0001-ocaml-Skip-mount-local-test-if-dev-fuse-is-not-writa.patch
# Non-upstream patch to remove udev from the packagelist. systemd now
# 'obsoletes' udev, but febootstrap doesn't get this relationship
# right. When udev disappears from the repository we can remove this
@ -684,6 +687,7 @@ for %{name}.
autoreconf -i
%endif
%patch2 -p1
%patch4 -p1
mkdir -p daemon/m4
@ -1039,6 +1043,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Thu Jul 19 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.19.22-2
- Add upstream patch to skip mount-local test if /dev/fuse not writable.
* Thu Jul 19 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.19.22-1
- New upstream version 1.19.22.