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

* added new -f switch for changing image build type

Browse Source 
* added support for building ext2 and ext3 images in addition to squashfs
This commit is contained in:
Michael Casadevall 2010-05-17 12:59:17 -04:00
parent a5a4108d44
commit c87828dd36
2 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
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
-- Michael Casadevall <mcasadevall@ubuntu.com> Mon, 17 May 2010 12:47:16 -0400
livecd-rootfs (1.115) maverick; urgency=low livecd-rootfs (1.115) maverick; urgency=low
* use a tmpfs for the livefs root directory, to get some speed * use a tmpfs for the livefs root directory, to get some speed

23
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] # Depends: debootstrap, rsync, python-minimal|python, procps, squashfs-tools, ltsp-server [i386], e2tools
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 \
@ -118,11 +118,12 @@ EXCLUDE=""
LIST="" LIST=""
SUBARCH="" SUBARCH=""
PROPOSED="" PROPOSED=""
IMAGE_FORMAT="squashfs"
# must be in the "team / PPA name" form; e.g. "moblin/ppa"; the default PPA # must be in the "team / PPA name" form; e.g. "moblin/ppa"; the default PPA
# name is "ppa", don't omit it # name is "ppa", don't omit it
PPA="" PPA=""
while getopts :d:e:i:I:m:S:s:a:p name; do case $name in while getopts :d:e:i:I:m:S:s:a:f:p name; do case $name in
d) STE=$OPTARG;; d) STE=$OPTARG;;
e) EXCLUDE="$EXCLUDE $OPTARG";; e) EXCLUDE="$EXCLUDE $OPTARG";;
i) LIST="$LIST $OPTARG";; i) LIST="$LIST $OPTARG";;
@ -131,6 +132,7 @@ while getopts :d:e:i:I:m:S:s:a:p name; do case $name in
S) USZ="$OPTARG";; S) USZ="$OPTARG";;
s) SUBARCH="$OPTARG";; s) SUBARCH="$OPTARG";;
a) ARCH="$OPTARG";; a) ARCH="$OPTARG";;
f) IMAGE_FORMAT="$OPTARG";;
p) PROPOSED="yes";; p) PROPOSED="yes";;
\?) echo bad usage >&2; exit 2;; \?) echo bad usage >&2; exit 2;;
\:) echo missing argument >&2; exit 2;; \:) echo missing argument >&2; exit 2;;
@ -652,7 +654,22 @@ Pin-Priority: 550
chmod 644 livecd.${FSS}.squashfs chmod 644 livecd.${FSS}.squashfs
} }
livefs_squash 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
}
if [ "$IMAGE_FORMAT" = "ext2" ] || [ "$IMAGE_FORMAT" = "ext3" ]; then
livefs_ext2
else
livefs_squash
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