Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-07-04 05:21:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Actually made ext3 work

Browse Source
This commit is contained in:
Michael Casadevall 2010-05-17 13:56:52 -04:00
parent c87828dd36
commit c88909a988
1 changed files with 39 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
livecd.sh
View File

@ -21,7 +21,7 @@ set -eu
# Boston, MA 02110-1301 USA. # # Boston, MA 02110-1301 USA. #
########################################################################## ##########################################################################
# Depends: debootstrap, rsync, python-minimal|python, procps, squashfs-tools, ltsp-server [i386], e2tools # Depends: debootstrap, rsync, python-minimal|python, procps, squashfs-tools, ltsp-server [i386], genext2fs
cleanup() { cleanup() {
for mnt in ${ROOT}dev/pts ${ROOT}dev/shm ${ROOT}.dev ${ROOT}dev \ for mnt in ${ROOT}dev/pts ${ROOT}dev/shm ${ROOT}.dev ${ROOT}dev \
@ -56,6 +56,36 @@ subst_package() {
} }
livefs_squash()
{
squashsort="http://people.ubuntu.com/~tfheen/livesort/${FSS}.list.${TARGETARCH}"
#if wget -O livecd.${FSS}.sort ${squashsort} > /dev/null 2>&1; then
if false; then
echo "Using the squashfs sort list from ${squashsort}."
else
echo "Unable to fetch squashfs sort list; using a blank list."
: > livecd.${FSS}.sort
fi
# make sure there is no old squashfs idling around
rm -f livecd.${FSS}.squashfs
mksquashfs ${ROOT} livecd.${FSS}.squashfs -sort livecd.${FSS}.sort
chmod 644 livecd.${FSS}.squashfs
}
livefs_ext2()
{
# Add 10MiB extra free space for first boot + ext3 journal
size=$(($(du -sx --block-size=1024 ${ROOT} | cut -f1) + (10240)))
echo "Building ext2 filesystem."
# remove any stale filesystem images
rm -f livecd.${FSS}.squashfs
genext2fs -b $size -d ${ROOT} livecd.${FSS}.ext2
}
if [ $(id -u) != 0 ];then if [ $(id -u) != 0 ];then
echo "must be run as root" echo "must be run as root"
exit 2 exit 2
@ -636,41 +666,21 @@ Pin-Priority: 550
# installation progress calculation. # installation progress calculation.
printf $(du -sx --block-size=1 ${ROOT} | cut -f1) > livecd.${FSS}.size || true printf $(du -sx --block-size=1 ${ROOT} | cut -f1) > livecd.${FSS}.size || true
livefs_squash()
{
squashsort="http://people.ubuntu.com/~tfheen/livesort/${FSS}.list.${TARGETARCH}"
#if wget -O livecd.${FSS}.sort ${squashsort} > /dev/null 2>&1; then
if false; then
echo "Using the squashfs sort list from ${squashsort}."
else
echo "Unable to fetch squashfs sort list; using a blank list."
: > livecd.${FSS}.sort
fi
# make sure there is no old squashfs idling around
rm -f livecd.${FSS}.squashfs
mksquashfs ${ROOT} livecd.${FSS}.squashfs -sort livecd.${FSS}.sort
chmod 644 livecd.${FSS}.squashfs
}
livefs_ext2()
{
size=$(du -sx --block-size=1024 ${ROOT} | cut -f1)
echo "Building ext2 filesystem."
# remove any stale filesystem images
rm -f livecd.${FSS}.squashfs
genext2fs -b $size -d ${ROOT} livecd.${FSS}.ext2
}
# Build our images
if [ "$IMAGE_FORMAT" = "ext2" ] || [ "$IMAGE_FORMAT" = "ext3" ]; then if [ "$IMAGE_FORMAT" = "ext2" ] || [ "$IMAGE_FORMAT" = "ext3" ]; then
livefs_ext2 livefs_ext2
else else
livefs_squash livefs_squash
fi 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
# LTSP chroot building (only in 32bit and for Edubuntu (DVD)) # LTSP chroot building (only in 32bit and for Edubuntu (DVD))
case $FS in case $FS in
edubuntu-dvd) edubuntu-dvd)