From 5cdaaa7c164dfdd77d4fa553d059e4dca346d26f Mon Sep 17 00:00:00 2001 From: Oliver Grawert Date: Mon, 26 Jul 2010 14:26:08 +0200 Subject: [PATCH] Import patches-unapplied version 1.143 to ubuntu/maverick Imported using git-ubuntu import. Changelog parent: 54bcd26b87f073f8626cb8fa5e41b4a41059c998 New changelog entries: * add more spare space to the ext2 filesystem images to compensate journal overhead and make it possible to run oem-config even without resizing * do not reserve 5% for root in the ext2 image files. --- debian/changelog | 8 ++++++++ livecd.sh | 6 +++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index eadbf9a9..cd745eed 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +livecd-rootfs (1.143) maverick; urgency=low + + * add more spare space to the ext2 filesystem images to compensate journal + overhead and make it possible to run oem-config even without resizing + * do not reserve 5% for root in the ext2 image files. + + -- Oliver Grawert Mon, 26 Jul 2010 14:26:08 +0200 + livecd-rootfs (1.142) maverick; urgency=low * do not fail if losetup -d does not find a device diff --git a/livecd.sh b/livecd.sh index c8b9d2ab..6b38d6cd 100755 --- a/livecd.sh +++ b/livecd.sh @@ -76,8 +76,8 @@ livefs_squash() livefs_ext2() { - # Add 10MiB extra free space for first boot + ext3 journal - size=$(($(du -ks ${ROOT} | cut -f1) + (10240))) + # Add 500MiB extra free space for first boot + ext3 journal + size=$(($(du -ks ${ROOT} | cut -f1) + (512000))) # DEBUG: get the detected size in the log echo "size variable set to: ${size}" MOUNTPOINT=$(mktemp -d) @@ -89,7 +89,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 -F livecd.${FSS}.ext2 + mke2fs -m 0 -F livecd.${FSS}.ext2 # DEBUG: see if the image size matches the detected size value ls -l livecd.${FSS}.ext2 mount -o loop=${DEV} livecd.${FSS}.ext2 ${MOUNTPOINT}