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

Import patches-unapplied version 1.107 to ubuntu/lucid

Browse Source 
Imported using git-ubuntu import.

Changelog parent: c7f1a3bbd973513dbe97b44b55b19981236118d4

New changelog entries:
  * Deliver edubuntu/i386 ltsp sqaushfs image. LP: #531546
  * fix typo in deciding to remove /usr/share/icons/*/icon-theme.cache
    on kubuntu-ish images.
This commit is contained in:
LaMont Jones 2010-03-17 15:07:12 -06:00 committed by usd-importer
parent c7f1a3bbd9
commit 8a2fa455ea
4 changed files with 34 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
BuildLiveCD
View File

@ -27,7 +27,7 @@ fi
ARCH=$(dpkg --print-architecture) ARCH=$(dpkg --print-architecture)
SUBARCH="" SUBARCH=""
SUBARCHARG="" SUBARCHARG=""
DEFAULTSUITE="karmic" DEFAULTSUITE="lucid"
NEWSUITE="" NEWSUITE=""
SUITES="" SUITES=""
PROPOSED="" PROPOSED=""
@ -41,6 +41,11 @@ if [ "$1" = '-p' ]; then
PROPOSED='-p' PROPOSED='-p'
shift shift
fi fi
if [ "$1" = '--archive' ]; then
shift
PROPOSED="$PROPOSED -m $1"
shift
fi
if [ "$1" = '-d' ]; then if [ "$1" = '-d' ]; then
shift shift
NEWSUITE="$1" NEWSUITE="$1"

8
debian/changelog vendored
View File

@ -1,3 +1,11 @@
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 livecd-rootfs (1.106) lucid; urgency=low
* Delete Gnome icon cache for Kubuntu images * Delete Gnome icon cache for Kubuntu images

2
debian/control vendored
View File

@ -8,7 +8,7 @@ Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/livecd-rootfs/trunk
Package: livecd-rootfs Package: livecd-rootfs
Architecture: all Architecture: all
Depends: ${misc:Depends}, debootstrap, rsync, python-minimal | python, procps, squashfs-tools (>= 1:3.3-1), grep-dctrl, fdupes, lsb-release Depends: ${misc:Depends}, debootstrap, rsync, python-minimal | python, procps, squashfs-tools (>= 1:3.3-1), grep-dctrl, fdupes, lsb-release, ltsp-server [i386]
Suggests: partimage Suggests: partimage
Description: construction script for the livecd rootfs Description: construction script for the livecd rootfs
livecd-rootfs provides the script used to create the root filesystem livecd-rootfs provides the script used to create the root filesystem

21
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 # Depends: debootstrap, rsync, python-minimal|python, procps, squashfs-tools, ltsp-server
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 \
@ -584,7 +584,7 @@ Pin-Priority: 550
esac esac
# No point keeping Gnome icon cache around for Kubuntu # 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 rm -f ${ROOT}/usr/share/icons/*/icon-theme.cache
fi fi
@ -647,4 +647,21 @@ Pin-Priority: 550
livefs_squash livefs_squash
# LTSP chroot building (only in 32bit and for Edubuntu (DVD))
case $FS in
edubuntu)
if [ "$TARGETARCH" = "i386" ]; then
# Make sure we don't make everything fail here
ltsp-build-client --base $(pwd) --mirror $MIRROR --arch $TARGETARCH --dist $STE --chroot ltsp-live --purge-chroot --skipimage || true
ltsp-update-image --base $(pwd) --arch ltsp-live || true
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 done