From mboxrd@z Thu Jan 1 00:00:00 1970 From: Olaf Hering Subject: [PATCH] hotplug: allow hardlinked files for block device images Date: Fri, 26 Nov 2010 14:55:55 +0100 Message-ID: <20101126135555.GA27483@aepfle.de> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Return-path: Content-Disposition: inline List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: xen-devel@lists.xensource.com List-Id: xen-devel@lists.xenproject.org tools/hotplug/Linux/block change for this losetup -a output: (inode 12 is listed twice due to hardlinks) /dev/loop0: [0809]:139267 (/abuild/vdisk-sles11_2-disk0) /dev/loop1: [0809]:139266 (/abuild/vdisk-sles11_1-disk1) /dev/loop3: [0809]:139267 (/abuild/vdisk-sles11_2-disk0) /dev/loop5: [0809]:139273 (/abuild/vdisk-sles11_5-disk1) /dev/loop8: [0809]:12 (/abuild/bootiso-xenpaging-sles11_5.iso) /dev/loop10: [0809]:12 (/abuild/bootiso-xenpaging-sles11_4.iso) /dev/loop11: [0809]:139271 (/abuild/vdisk-sles11_4-disk0) Without this change, $dev would contain /dev/loop8\n/dev/loop10 Applies to 4.0 and 4.1 Signed-off-by: Olaf Hering --- tools/hotplug/Linux/block | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- xen-4.0.1-testing.orig/tools/hotplug/Linux/block +++ xen-4.0.1-testing/tools/hotplug/Linux/block @@ -279,8 +279,8 @@ mount it read-write in a guest domain." fatal "Unable to lookup $file: dev: $dev inode: $inode" fi - shared_list=$(losetup -a | grep ' \[0*'${dev}'\]:'${inode} | - cut -d : -f 1) + shared_list=$(losetup -a | + sed -n -e "s@^\([^:]\+\)\(:[[:blank:]]\[${dev}\]:${inode}[[:blank:]](${file})\)@\1@p" ) for dev in "$shared_list" do if [ -n "$dev" ]