mirror of
https://git.launchpad.net/livecd-rootfs
synced 2025-03-26 10:21:20 +00:00
build ltsp image as part of edubuntu-dvd/i386, depends ltsp-server. LP: #531546
use mksquashfs directly, instead of ltsp-update-image fix typo checking for kubuntu-ish releases vs icon-theme.cache Make me the maintainer.
This commit is contained in:
parent
ac03233921
commit
f503ef620c
23
debian/changelog
vendored
23
debian/changelog
vendored
@ -1,3 +1,26 @@
|
||||
livecd-rootfs (1.109) lucid; urgency=low
|
||||
|
||||
* if the ltsp squashfs image build fails, fail the build.
|
||||
* use mksquashfs directly, instead of ltsp-update-image
|
||||
|
||||
-- LaMont Jones <lamont@ubuntu.com> Wed, 24 Mar 2010 05:15:39 -0600
|
||||
|
||||
livecd-rootfs (1.108) lucid; urgency=low
|
||||
|
||||
* Deliver edubuntu-dvd/i386 ltsp squashfs image, since that's what
|
||||
actually gets built these days.
|
||||
* Update maintainer field.
|
||||
|
||||
-- LaMont Jones <lamont@ubuntu.com> Mon, 22 Mar 2010 21:40:59 -0600
|
||||
|
||||
livecd-rootfs (1.107) lucid; urgency=low
|
||||
|
||||
* Deliver edubuntu/i386 ltsp sqaushfs image. LP: #531546
|
||||
* fix typo in deciding to remove /usr/share/icons/*/icon-theme.cache
|
||||
on kubuntu-ish images.
|
||||
|
||||
-- LaMont Jones <lamont@ubuntu.com> Wed, 17 Mar 2010 15:07:12 -0600
|
||||
|
||||
livecd-rootfs (1.106) lucid; urgency=low
|
||||
|
||||
* Delete Gnome icon cache for Kubuntu images
|
||||
|
20
livecd.sh
20
livecd.sh
@ -21,7 +21,7 @@ set -eu
|
||||
# Boston, MA 02110-1301 USA. #
|
||||
##########################################################################
|
||||
|
||||
# Depends: debootstrap, rsync, python-minimal|python, procps, squashfs-tools
|
||||
# Depends: debootstrap, rsync, python-minimal|python, procps, squashfs-tools, ltsp-server
|
||||
|
||||
cleanup() {
|
||||
for mnt in ${ROOT}dev/pts ${ROOT}dev/shm ${ROOT}.dev ${ROOT}dev \
|
||||
@ -584,7 +584,7 @@ Pin-Priority: 550
|
||||
esac
|
||||
|
||||
# No point keeping Gnome icon cache around for Kubuntu
|
||||
if [ "$FS" = "kubuntu" || "$FS" = "kubuntu-netbook" ]; then
|
||||
if [ "$FS" = "kubuntu" ] || [ "$FS" = "kubuntu-netbook" ]; then
|
||||
rm -f ${ROOT}/usr/share/icons/*/icon-theme.cache
|
||||
fi
|
||||
|
||||
@ -647,4 +647,20 @@ Pin-Priority: 550
|
||||
|
||||
livefs_squash
|
||||
|
||||
# LTSP chroot building (only in 32bit and for Edubuntu (DVD))
|
||||
case $FS in
|
||||
edubuntu-dvd)
|
||||
if [ "$TARGETARCH" = "i386" ]; then
|
||||
ltsp-build-client --base $(pwd) --mirror $MIRROR --arch $TARGETARCH --dist $STE --chroot ltsp-live --purge-chroot --skipimage
|
||||
mksquashfs $(pwd)/ltsp-live $(pwd)/images/ltsp-live.img -noF -noD -noI -no-exports -e cdrom
|
||||
rm -Rf $(pwd)/ltsp-live
|
||||
if [ -f $(pwd)/images/ltsp-live.img ]; then
|
||||
mv $(pwd)/images/ltsp-live.img livecd.$FS-ltsp.squashfs
|
||||
rmdir --ignore-fail-on-non-empty $(pwd)/images/
|
||||
else
|
||||
echo "LTSP: Unable to build the chroot, see above for details."
|
||||
fi
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
Loading…
x
Reference in New Issue
Block a user