Add patch to work around libvirt problem with relative socket paths.
This commit is contained in:
		
							parent
							
								
									b51f0e3048
								
							
						
					
					
						commit
						4bcef61e81
					
				
							
								
								
									
										57
									
								
								0001-tests-Provide-full-path-to-Unix-domain-sockets.patch
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										57
									
								
								0001-tests-Provide-full-path-to-Unix-domain-sockets.patch
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,57 @@ | |||||||
|  | From 06adc3dbfa162074a3cf20c58b8949f447b37ae5 Mon Sep 17 00:00:00 2001 | ||||||
|  | From: "Richard W.M. Jones" <rjones@redhat.com> | ||||||
|  | Date: Wed, 6 Jun 2018 19:29:35 +0100 | ||||||
|  | Subject: [PATCH] tests: Provide full path to Unix domain sockets. | ||||||
|  | 
 | ||||||
|  | Maybe a bug in libvirt? | ||||||
|  | https://www.redhat.com/archives/libvir-list/2018-June/msg00490.html | ||||||
|  | ---
 | ||||||
|  |  tests/test-cache.sh | 3 ++- | ||||||
|  |  tests/test-cow.sh   | 3 ++- | ||||||
|  |  2 files changed, 4 insertions(+), 2 deletions(-) | ||||||
|  | 
 | ||||||
|  | diff --git a/tests/test-cache.sh b/tests/test-cache.sh
 | ||||||
|  | index e5e9e82..ac99ce2 100755
 | ||||||
|  | --- a/tests/test-cache.sh
 | ||||||
|  | +++ b/tests/test-cache.sh
 | ||||||
|  | @@ -32,6 +32,7 @@
 | ||||||
|  |  # SUCH DAMAGE. | ||||||
|  |   | ||||||
|  |  set -e | ||||||
|  | +set -x
 | ||||||
|  |   | ||||||
|  |  files="cache.img cache.sock cache.pid" | ||||||
|  |  rm -f $files | ||||||
|  | @@ -69,7 +70,7 @@ cleanup ()
 | ||||||
|  |  trap cleanup INT QUIT TERM EXIT ERR | ||||||
|  |   | ||||||
|  |  # Open the overlay and perform some operations. | ||||||
|  | -guestfish --format=raw -a 'nbd://?socket=cache.sock' <<'EOF'
 | ||||||
|  | +guestfish --format=raw -a "nbd://?socket=`pwd`/cache.sock" <<'EOF'
 | ||||||
|  |    run | ||||||
|  |    part-disk /dev/sda gpt | ||||||
|  |    mkfs ext4 /dev/sda1 | ||||||
|  | diff --git a/tests/test-cow.sh b/tests/test-cow.sh
 | ||||||
|  | index 443ba38..4b798c8 100755
 | ||||||
|  | --- a/tests/test-cow.sh
 | ||||||
|  | +++ b/tests/test-cow.sh
 | ||||||
|  | @@ -32,6 +32,7 @@
 | ||||||
|  |  # SUCH DAMAGE. | ||||||
|  |   | ||||||
|  |  set -e | ||||||
|  | +set -x
 | ||||||
|  |   | ||||||
|  |  files="cow-base.img cow-diff.qcow2 cow.sock cow.pid" | ||||||
|  |  rm -f $files | ||||||
|  | @@ -70,7 +71,7 @@ cleanup ()
 | ||||||
|  |  trap cleanup INT QUIT TERM EXIT ERR | ||||||
|  |   | ||||||
|  |  # Write some data into the overlay. | ||||||
|  | -guestfish --format=raw -a 'nbd://?socket=cow.sock' -m /dev/sda1 <<EOF
 | ||||||
|  | +guestfish --format=raw -a "nbd://?socket=`pwd`/cow.sock" -m /dev/sda1 <<EOF
 | ||||||
|  |    fill-dir / 10000 | ||||||
|  |    fill-pattern "abcde" 5M /large | ||||||
|  |    write /hello "hello, world" | ||||||
|  | -- 
 | ||||||
|  | 2.16.2 | ||||||
|  | 
 | ||||||
| @ -26,6 +26,8 @@ URL:            https://github.com/libguestfs/nbdkit | |||||||
| 
 | 
 | ||||||
| Source0:        http://libguestfs.org/download/nbdkit/%{name}-%{version}.tar.gz | Source0:        http://libguestfs.org/download/nbdkit/%{name}-%{version}.tar.gz | ||||||
| 
 | 
 | ||||||
|  | Patch1:         0001-tests-Provide-full-path-to-Unix-domain-sockets.patch | ||||||
|  | 
 | ||||||
| %if 0%{?rhel} == 7 | %if 0%{?rhel} == 7 | ||||||
| # On RHEL 7, nothing in the virt stack is shipped on aarch64 and | # On RHEL 7, nothing in the virt stack is shipped on aarch64 and | ||||||
| # libguestfs was not shipped on POWER (fixed in 7.5).  We could in | # libguestfs was not shipped on POWER (fixed in 7.5).  We could in | ||||||
| @ -643,6 +645,7 @@ popd | |||||||
| %changelog | %changelog | ||||||
| * Wed Jun  6 2018 Richard W.M. Jones <rjones@redhat.com> - 1.3.1-1 | * Wed Jun  6 2018 Richard W.M. Jones <rjones@redhat.com> - 1.3.1-1 | ||||||
| - New upstream version 1.3.1. | - New upstream version 1.3.1. | ||||||
|  | - Add patch to work around libvirt problem with relative socket paths. | ||||||
| 
 | 
 | ||||||
| * Fri Apr  6 2018 Richard W.M. Jones <rjones@redhat.com> - 1.3.0-1 | * Fri Apr  6 2018 Richard W.M. Jones <rjones@redhat.com> - 1.3.0-1 | ||||||
| - Move to development branch version 1.3.0. | - Move to development branch version 1.3.0. | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user