# dev-loop_indep_mkbimage.diff
#
# The dependency of a loop-device is made dynamic,
# instead of statically using /dev/loop1.
#
# Mats Erik Andersson <address@hidden>
#
diff -Naur grub-0.97.orig/util/mkbimage grub-0.97.patched/util/mkbimage
--- grub-0.97.orig/util/mkbimage	2004-07-24 20:57:31.000000000 +0200
+++ grub-0.97.patched/util/mkbimage	2006-10-06 12:57:21.609356256 +0200
@@ -149,9 +149,10 @@
   if [ "$offset" = "0" ] ; then
     mkfs.$fs -F $image
   elif [ `id -u` = "0" ] ; then
-    losetup $lo_options /dev/loop1 $image
-    mkfs.$fs /dev/loop1
-    losetup -d /dev/loop1
+    temp_loop=$(losetup -f)
+    losetup $lo_options $temp_loop $image
+    mkfs.$fs $temp_loop
+    losetup -d $temp_loop
   else
     error must_be_root
   fi
@@ -185,13 +186,14 @@
 	$cp ${image}1/$file ${image}:$file
     done
   elif [ "`id -u`" = "0" ] ; then
-    losetup $lo_options /dev/loop1 $image
+    temp_loop=$(losetup -f)
+    losetup $lo_options $temp_loop $image
     mkdir ${image}.mnt
-    mount -t $fs /dev/loop1 ${image}.mnt
+    mount -t $fs $temp_loop ${image}.mnt
     cp -a ${image}1/* ${image}.mnt/ && sync
     umount ${image}.mnt
     rmdir ${image}.mnt
-    losetup -d /dev/loop1
+    losetup -d $temp_loop
   else
     error must_be_root
   fi