Add leading slash to findiso bootoption
authorMichael Prokop <mika@grml.org>
Thu, 2 Jul 2009 08:42:30 +0000 (10:42 +0200)
committerMichael Prokop <mika@grml.org>
Thu, 2 Jul 2009 08:42:30 +0000 (10:42 +0200)
debian/changelog
debian/patches/07_support_findiso.dpatch

index 223e189..05eeda1 100644 (file)
@@ -1,3 +1,12 @@
+live-initramfs (1.157.1-1grml.08) UNRELEASED; urgency=low
+
+  * debian/patches/07_support_findiso.dpatch: insert a leading "/"
+    in front of the FINDISO argument so it doesn't hit persons
+    who forget a slash in the bootoption. Suggested by
+    Philip Hands <phil@hands.com> - thanks!
+
+ -- Michael Prokop <mika@grml.org>  Thu, 02 Jul 2009 10:40:33 +0200
+
 live-initramfs (1.157.1-1grml.07) unstable; urgency=low
 
   * Apply PXE patch on our own networking script instead of
index b9ef67c..1375666 100755 (executable)
@@ -31,11 +31,11 @@ diff -urNad live-initramfs-grml~/scripts/live live-initramfs-grml/scripts/live
                mount -t ${fstype} -o ro,noatime "${devname}" ${mountpoint} || continue
 +              if [ -n "${FINDISO}" ]
 +              then
-+                      if [ -f ${mountpoint}${FINDISO} ]; then
++                      if [ -f ${mountpoint}/${FINDISO} ]; then
 +                              umount ${mountpoint}
 +                              mkdir /live/findiso -p
 +                              mount -t ${fstype} -o ro,noatime "${devname}" /live/findiso
-+                              loopdevname=$(setup_loop "/live/findiso${FINDISO}" "loop" "/sys/block/loop*" "" '')
++                              loopdevname=$(setup_loop "/live/findiso/${FINDISO}" "loop" "/sys/block/loop*" "" '')
 +                              devname="${loopdevname}"
 +                              mount -t iso9660 -o ro,noatime "${devname}" ${mountpoint}
 +                      fi