diff options
| author | Olaf Hering <olaf@aepfle.de> | 2011-01-17 18:05:52 +0000 |
|---|---|---|
| committer | Olaf Hering <olaf@aepfle.de> | 2011-01-17 18:05:52 +0000 |
| commit | 86e440aebc540486dc37fa72f0e7b03dafd616e9 (patch) | |
| tree | 1c2c5e4155f533a3831f14c40025afe35b8660e6 | |
| parent | 5bea24d30771d837f9f934c70dbfbb4f157e7ad6 (diff) | |
| download | xen-86e440aebc540486dc37fa72f0e7b03dafd616e9.tar.gz xen-86e440aebc540486dc37fa72f0e7b03dafd616e9.tar.bz2 xen-86e440aebc540486dc37fa72f0e7b03dafd616e9.zip | |
tools/hotplug/Linux: allow hardlinked files for block device images
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 <olaf@aepfle.de>
Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
| -rw-r--r-- | tools/hotplug/Linux/block | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/hotplug/Linux/block b/tools/hotplug/Linux/block index 122e93e35b..06de5c92a2 100644 --- a/tools/hotplug/Linux/block +++ b/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" ] |