From 1e7fcd0c0b076ab8d0dac4ce97f59f4749233eb0 Mon Sep 17 00:00:00 2001
From: Anders Kaseorg <andersk@mit.edu>
Date: Sun, 4 May 2008 20:45:44 -0400
Subject: [PATCH] losetup -f finds an unused loop device.

svn path=/trunk/packages/sipb-xen-dom0/; revision=500
---
 files/usr/sbin/sipb-xen-losetup |   18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/files/usr/sbin/sipb-xen-losetup b/files/usr/sbin/sipb-xen-losetup
index 5776248..b876187 100755
--- a/files/usr/sbin/sipb-xen-losetup
+++ b/files/usr/sbin/sipb-xen-losetup
@@ -2,25 +2,17 @@
 
 import sys
 import os
-from subprocess import call
+from subprocess import call, Popen, PIPE
 
 def losetup(source, offset=0):
-  # XXX we avoid colliding with other instances of ourself,
-  #     but when it comes to other loop-device users we just
-  #     pick a range things don't seem to use and hope...
   lockfilename = '/tmp/losetup.lock'
   os.close(os.open(lockfilename, os.O_CREAT+os.O_EXCL)) #lock
   try:
-    loopdevice = None
-    for i in xrange(32,60): # totally arbitrary, just looks to be unused on black-mesa
-      filename = '/dev/loop%d'%i
-      if 0 == len(file(filename).read(1)):
-        loopdevice = filename # it's empty
-        break
-    if loopdevice is not None:
-      call(['losetup', '-o', str(offset), loopdevice, source])
-    else:
+    loopdevice = Popen(['losetup', '-f'], stdout=PIPE).communicate()[0].rstrip()
+    if loopdevice == '':
       raise RuntimeError('out of loop devices for copying VM image: too many at once?')
+    if call(['losetup', '-o', str(offset), loopdevice, source]) != 0:
+      raise RuntimeError('losetup failed')
   finally:
     os.unlink(lockfilename) #unlock
   return loopdevice
-- 
1.7.9.5