Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-02-14 14:48:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed spacing in the livefs build code

Browse Source
This commit is contained in:
Michael Casadevall 2010-05-17 14:31:13 -04:00
parent c88909a988
commit a9defe1a47
2 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
debian/changelog vendored
View File

@ -2,8 +2,9 @@ livecd-rootfs (1.116) UNRELEASED; urgency=low
* added new -f switch for changing image build type
* added support for building ext2 and ext3 images in addition to squashfs
* fixed spacing in the livefs build code
-- Michael Casadevall <mcasadevall@ubuntu.com> Mon, 17 May 2010 12:47:16 -0400
-- Michael Casadevall <mcasadevall@ubuntu.com> Mon, 17 May 2010 13:59:28 -0400
livecd-rootfs (1.115) maverick; urgency=low

39
livecd.sh
View File

@ -656,30 +656,29 @@ Pin-Priority: 550
perl -i -nle 'print unless /^Package: language-(pack|support)/ .. /^$/;' \
${ROOT}/var/lib/apt/extended_states
# And run the cleanup function dead last, to umount /proc after nothing
# else needs to be run in the chroot (umounting it earlier breaks rm):
cleanup
# And run the cleanup function dead last, to umount /proc after nothing
# else needs to be run in the chroot (umounting it earlier breaks rm):
cleanup
# Squashfs does not report unpacked disk space usage, which is explained at
# <http://lkml.org/lkml/2006/6/16/163>. However, we would like to cache this
# number for partman's sufficient free space check and ubiquity's
# installation progress calculation.
printf $(du -sx --block-size=1 ${ROOT} | cut -f1) > livecd.${FSS}.size || true
# Squashfs does not report unpacked disk space usage, which is explained at
# <http://lkml.org/lkml/2006/6/16/163>. However, we would like to cache this
# number for partman's sufficient free space check and ubiquity's
# installation progress calculation.
printf $(du -sx --block-size=1 ${ROOT} | cut -f1) > livecd.${FSS}.size || true
# Build our images
if [ "$IMAGE_FORMAT" = "ext2" ] || [ "$IMAGE_FORMAT" = "ext3" ]; then
livefs_ext2
else
livefs_squash
fi
# Build our images
if [ "$IMAGE_FORMAT" = "ext2" ] || [ "$IMAGE_FORMAT" = "ext3" ]; then
livefs_ext2
else
livefs_squash
fi
# Upgrade ext2->ext3 if that's what is requested
if [ "$IMAGE_FORMAT" = "ext3" ]; then
tune2fs -j livecd.${FSS}.ext2
mv livecd.${FSS}.ext2 livecd.${FSS}.ext3
fi
exit
# Upgrade ext2->ext3 if that's what is requested
if [ "$IMAGE_FORMAT" = "ext3" ]; then
tune2fs -j livecd.${FSS}.ext2
mv livecd.${FSS}.ext2 livecd.${FSS}.ext3
fi
# LTSP chroot building (only in 32bit and for Edubuntu (DVD))
case $FS in