From fd7f799638022c9de8a7401aeec9b2d239fd730f Mon Sep 17 00:00:00 2001
From: Oliver Grawert <ogra@ubuntu.com>
Date: Thu, 22 Jul 2010 09:11:14 +0200
Subject: [PATCH] Import patches-unapplied version 1.140 to ubuntu/maverick
Imported using git-ubuntu import.
Changelog parent: 082b2f2d3a054448d14a0a71ff3f270fbe14e9f0
New changelog entries:
* tell mke2fs that we _really_ want a filesystem on this "non-blockdevice"
---
debian/changelog | 6 ++++++
livecd.sh | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index abf9cd17..c5b0895f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+livecd-rootfs (1.140) maverick; urgency=low
+
+ * tell mke2fs that we _really_ want a filesystem on this "non-blockdevice"
+
+ -- Oliver Grawert <ogra@ubuntu.com> Thu, 22 Jul 2010 09:11:14 +0200
+
livecd-rootfs (1.139) maverick; urgency=low
[ Steve Langasek ]
diff --git a/livecd.sh b/livecd.sh
index 0ac3084b..098b39aa 100755
--- a/livecd.sh
+++ b/livecd.sh
@@ -87,7 +87,7 @@ livefs_ext2()
# create an empty ext2 image and loop mount it
dd if=/dev/zero of=livecd.${FSS}.ext2 bs=1024 count=0 seek=$size
- mke2fs livecd.${FSS}.ext2
+ mke2fs -F livecd.${FSS}.ext2
mount -o loop=${DEV} livecd.${FSS}.ext2 ${MOUNTPOINT}
# copy chroot content to image