From: Tim Deegan <Tim.Deegan@xensource.com>
Date: Wed, 7 Feb 2007 12:25:18 +0000 (+0000)
Subject: Revert 13805: losetup -r is not portable
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~15348^2~3
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=b364d04f1d59e2276ce598f26ab9c48d1dc351d9;p=xen.git

Revert 13805: losetup -r is not portable
which breaks CD support on Debian Sarge, FC4, probably others.
Signed-off-by: Tim Deegan <Tim.Deegan@xensource.com>
---

diff --git a/tools/examples/block b/tools/examples/block
index ac4313ecd9..2b6b991125 100644
--- a/tools/examples/block
+++ b/tools/examples/block
@@ -367,13 +367,7 @@ mount it read-write in a guest domain."
           fatal 'Failed to find an unused loop device'
         fi
 
-        cmode=`canonicalise_mode $mode`
-        if [ "$cmode" == 'r' ]
-        then
-          do_or_die losetup -r "$loopdev" "$file"
-        else
-          do_or_die losetup "$loopdev" "$file"
-        fi
+        do_or_die losetup "$loopdev" "$file"
         xenstore_write "$XENBUS_PATH/node" "$loopdev"
         write_dev "$loopdev"
         release_lock "block"