Use "stat -L" to determine the physical device. Now one can use lvm's

/dev/vgXXlvolYY symlinks in domU config files.
PKGREVISION++

3 files changed, 21 insertions, 9 deletions

diff --git a/sysutils/xentools45/Makefile b/sysutils/xentools45/Makefile
index 2070c8b4b11..8e823d3986b 100644
--- a/sysutils/xentools45/Makefile
+++ b/sysutils/xentools45/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.32 2016/05/12 15:42:58 bouyer Exp $
+# $NetBSD: Makefile,v 1.33 2016/05/21 20:11:21 bad Exp $
 
 VERSION=	4.5.3
-#PKGREVISION=	0
+PKGREVISION=	1
 VERSION_IPXE=	9a93db3f0947484e30e753bbd61a10b17336e20e
 
 DISTNAME=		xen-${VERSION}
diff --git a/sysutils/xentools45/distinfo b/sysutils/xentools45/distinfo
index d1eaed32f26..bcbc0686dc1 100644
--- a/sysutils/xentools45/distinfo
+++ b/sysutils/xentools45/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.23 2016/05/12 21:13:47 abs Exp $
+$NetBSD: distinfo,v 1.24 2016/05/21 20:11:21 bad Exp $
 
 SHA1 (ipxe-git-9a93db3f0947484e30e753bbd61a10b17336e20e.tar.gz) = fecadf952821e830ce1a1d19655288eef8488f88
 RMD160 (ipxe-git-9a93db3f0947484e30e753bbd61a10b17336e20e.tar.gz) = 539bfa12db7054228250d6dd380bbf96c1a040f8
@@ -29,7 +29,7 @@ SHA1 (patch-firmware_etherboot_Makefile) = f55e14948b7191e533a82b8fc3575f1052f23
 SHA1 (patch-firmware_etherboot_patches_series) = 2fa1342c78094c6dd5d60a07c236c4a1c0599fc4
 SHA1 (patch-firmware_hvmloader_Makefile) = bc5e81ddfc5e95887c2af4bb32eced9c5748b3c6
 SHA1 (patch-hotplug_NetBSD_Makefile) = 6f6ec768b595c332a8757437a64509c0370e52da
-SHA1 (patch-hotplug_NetBSD_block) = 243ec06924ba1b711203cb41620e0374dfd172ef
+SHA1 (patch-hotplug_NetBSD_block) = f7ef26d13578b00138f459f6d16662d53820458c
 SHA1 (patch-hotplug_NetBSD_vif-bridge) = ac4cc7446715330b504b8cce8cbd47c8035cf33c
 SHA1 (patch-hotplug_NetBSD_vif-ip) = ed23b0c16d87bd05230399d921e28860c5857b01
 SHA1 (patch-hotplug_common_Makefile) = 1c8af96a3d0d1d5e9c168b1eb75fabb3e2164a19
diff --git a/sysutils/xentools45/patches/patch-hotplug_NetBSD_block b/sysutils/xentools45/patches/patch-hotplug_NetBSD_block
index e0d11bf34ff..c5ad1394851 100644
--- a/sysutils/xentools45/patches/patch-hotplug_NetBSD_block
+++ b/sysutils/xentools45/patches/patch-hotplug_NetBSD_block
@@ -1,9 +1,12 @@
-$NetBSD: patch-hotplug_NetBSD_block,v 1.2 2016/04/04 14:47:19 bad Exp $
+$NetBSD: patch-hotplug_NetBSD_block,v 1.3 2016/05/21 20:11:21 bad Exp $
 
 Lock the block script to avoid races during vnd configuration.
 
---- hotplug/NetBSD/block.orig	2015-11-03 09:11:18.000000000 +0000
-+++ hotplug/NetBSD/block
+Use "stat -L" to get device major/minor numbers through symlinks e.g. for
+lvm volumes.
+
+--- hotplug/NetBSD/block.orig	2016-03-23 14:57:27.000000000 +0100
++++ hotplug/NetBSD/block	2016-05-21 17:08:01.000000000 +0200
 @@ -6,8 +6,9 @@
  
  DIR=$(dirname "$0")
@@ -15,7 +18,7 @@ Lock the block script to avoid races during vnd configuration.
  export PATH
  
  error() {
-@@ -62,6 +63,7 @@ case $xstatus in
+@@ -62,6 +63,7 @@
  			available_disks="$available_disks $disk"
  			eval $disk=free
  		done
@@ -23,7 +26,7 @@ Lock the block script to avoid races during vnd configuration.
  		# Mark the used vnd(4) devices as ``used''.
  		for disk in `sysctl hw.disknames`; do
  			case $disk in
-@@ -77,6 +79,7 @@ case $xstatus in
+@@ -77,6 +79,7 @@
  				break	
  			fi
  		done
@@ -31,3 +34,12 @@ Lock the block script to avoid races during vnd configuration.
  		if [ x$device = x ] ; then
  			error "no available vnd device"
  		fi
+@@ -86,7 +89,7 @@
+ 		device=$xparams
+ 		;;
+ 	esac
+-	physical_device=$(stat -f '%r' "$device")
++	physical_device=$(stat -L -f '%r' "$device")
+ 	xenstore-write $xpath/physical-device $physical_device
+ 	xenstore-write $xpath/hotplug-status connected
+ 	exit 0