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

Changed genext2fs to loopmounting and added support for ext4

Browse Source
This commit is contained in:
Michael Casadevall 2010-05-26 01:35:52 -04:00
parent 2fa3e89b62
commit f367950cdb
2 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/changelog vendored
View File

@ -1,7 +1,7 @@
livecd-rootfs (1.116) UNRELEASED; urgency=low livecd-rootfs (1.116) UNRELEASED; urgency=low
* added new -f switch for changing image build type * added new -f switch for changing image build type
* added support for building ext2 and ext3 images in addition to squashfs * added support for building ext2/ext3/ext4 images in addition to squashfs
* fixed spacing in the livefs build code * fixed spacing in the livefs build code
* extended BuildLiveCD to handle the -f switch * extended BuildLiveCD to handle the -f switch
* reworked BuildLiveCD command line parsing to be more sane * reworked BuildLiveCD command line parsing to be more sane

43
livecd.sh
View File

@ -21,12 +21,13 @@ set -eu
# Boston, MA 02110-1301 USA. # # Boston, MA 02110-1301 USA. #
########################################################################## ##########################################################################
# Depends: debootstrap, rsync, python-minimal|python, procps, squashfs-tools, ltsp-server [i386], genext2fs # Depends: debootstrap, rsync, python-minimal|python, procps, squashfs-tools, ltsp-server [i386]
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 \
${ROOT}proc/sys/fs/binfmt_misc ${ROOT}proc ${ROOT}sys \ ${ROOT}proc/sys/fs/binfmt_misc ${ROOT}proc ${ROOT}sys \
${ROOT}lib/modules/*/volatile ${ROOT}var/{lock,run}; do ${ROOT}lib/modules/*/volatile ${ROOT}var/{lock,run} \
`pwd`/mount-livefs; do
umount $mnt || true umount $mnt || true
done done
@ -74,16 +75,33 @@ livefs_squash()
chmod 644 livecd.${FSS}.squashfs chmod 644 livecd.${FSS}.squashfs
} }
livefs_ext2() # This function could be extended for other non-ext filesystems, but
# they aren't consistant on how you format a non-block device
livefs_ext()
{ {
# Add 10MiB extra free space for first boot + ext3 journal # Add 10MiB extra free space for first boot + ext3 journal
size=$(($(du -sx --block-size=1024 ${ROOT} | cut -f1) + (10240))) size=$((($(du -sx --block-size=1024 ${ROOT} | cut -f1) + (10240)) * 1024))
echo "Building ext2 filesystem." mountpoint=`pwd`/mount-livefs/
echo "Building $IMAGEFORMAT filesystem."
# remove any stale filesystem images # remove any stale filesystem images
rm -f livecd.${FSS}.squashfs rm -f livecd.${FSS}.$IMAGEFORMAT
genext2fs -b $size -d ${ROOT} livecd.${FSS}.ext2 # Make blank filesystem, and loopmount it
dd if=/dev/zero of=livecd.$FSS.$IMAGEFORMAT bs=$size count=1
mkfs -t $IMAGEFORMAT -F livecd.$FSS.$IMAGEFORMAT
rm -fr $mountpoint
mkdir $mountpoint
mount -o loop ./livecd.$FSS.$IMAGEFORMAT $mountpoint
rm -fr $mountpoint/lost+found
# Copy everything from the rootfs into the ext2 image
cp -ar $ROOT/* $mountpoint
# Call cleanup again to unmount everything and make sure loop0 is cleared
cleanup
rm -rf mount-livefs
} }
if [ $(id -u) != 0 ];then if [ $(id -u) != 0 ];then
@ -668,18 +686,13 @@ Pin-Priority: 550
# Build our images # Build our images
if [ "$IMAGEFORMAT" = "ext2" ] || [ "$IMAGEFORMAT" = "ext3" ]; then if [ "$IMAGEFORMAT" = "ext2" ] || [ "$IMAGEFORMAT" = "ext3" ] \
livefs_ext2 || [ "$IMAGEFORMAT" = "ext4" ]; then
livefs_ext
else else
livefs_squash livefs_squash
fi fi
# Upgrade ext2->ext3 if that's what is requested
if [ "$IMAGEFORMAT" = "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)) # LTSP chroot building (only in 32bit and for Edubuntu (DVD))
case $FS in case $FS in
edubuntu-dvd) edubuntu-dvd)