Revert 13805: losetup -r is not portable
authorTim Deegan <Tim.Deegan@xensource.com>
Wed, 7 Feb 2007 12:25:18 +0000 (12:25 +0000)
committerTim Deegan <Tim.Deegan@xensource.com>
Wed, 7 Feb 2007 12:25:18 +0000 (12:25 +0000)
which breaks CD support on Debian Sarge, FC4, probably others.
Signed-off-by: Tim Deegan <Tim.Deegan@xensource.com>
tools/examples/block

index ac4313ecd924d679a162872362a81bffd34de8bc..2b6b9911254a76864bc57ac1e861c9b77491d8c7 100644 (file)
@@ -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"