From 54bcd26b87f073f8626cb8fa5e41b4a41059c998 Mon Sep 17 00:00:00 2001
From: Oliver Grawert <ogra@ubuntu.com>
Date: Fri, 23 Jul 2010 10:39:16 +0200
Subject: [PATCH] Import patches-unapplied version 1.142 to ubuntu/maverick

Imported using git-ubuntu import.

Changelog parent: fc9058007ea5214d9124bd23573b2275c8f94c10

New changelog entries:
  * do not fail if losetup -d does not find a device
---
 debian/changelog | 6 ++++++
 livecd.sh        | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 49611d00..eadbf9a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+livecd-rootfs (1.142) maverick; urgency=low
+
+  * do not fail if losetup -d does not find a device
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Fri, 23 Jul 2010 10:39:16 +0200
+
 livecd-rootfs (1.141) maverick; urgency=low
 
   * add some debug output to teh ext2 image creation to see whats going on
diff --git a/livecd.sh b/livecd.sh
index 3d8a61a8..c8b9d2ab 100755
--- a/livecd.sh
+++ b/livecd.sh
@@ -102,7 +102,7 @@ livefs_ext2()
   # clean up
   umount ${MOUNTPOINT}
   rm -rf ${MOUNTPOINT}
-  losetup -d $DEV
+  losetup -d $DEV || true
   chmod 644 livecd.${FSS}.ext2
 }