diff --git a/.bzr/README b/.bzr/README new file mode 100644 index 00000000..4f8e767e --- /dev/null +++ b/.bzr/README @@ -0,0 +1,3 @@ +This is a Bazaar control directory. +Do not change any files in this directory. +See http://bazaar-vcs.org/ for more information about Bazaar. diff --git a/.bzr/branch-format b/.bzr/branch-format new file mode 100644 index 00000000..9eb09b73 --- /dev/null +++ b/.bzr/branch-format @@ -0,0 +1 @@ +Bazaar-NG meta directory, format 1 diff --git a/.bzr/branch/branch.conf b/.bzr/branch/branch.conf new file mode 100644 index 00000000..786c3fb1 --- /dev/null +++ b/.bzr/branch/branch.conf @@ -0,0 +1,8 @@ +parent_location = bzr+ssh://bazaar.launchpad.net/~ubuntu-core-dev/livecd-rootfs/trunk/ +gtk_global_commit_message = ''' 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. +''' +gtk_file_commit_messages = de +push_location = bzr+ssh://bazaar.launchpad.net/~ubuntu-core-dev/livecd-rootfs/trunk/ diff --git a/.bzr/branch/format b/.bzr/branch/format new file mode 100644 index 00000000..dc392f44 --- /dev/null +++ b/.bzr/branch/format @@ -0,0 +1 @@ +Bazaar Branch Format 7 (needs bzr 1.6) diff --git a/.bzr/branch/last-revision b/.bzr/branch/last-revision new file mode 100644 index 00000000..3887f5d8 --- /dev/null +++ b/.bzr/branch/last-revision @@ -0,0 +1 @@ +319 lamont@debian.org-20100324133047-5k5cb0qkr4w4r41m diff --git a/.bzr/branch/tags b/.bzr/branch/tags new file mode 100644 index 00000000..1925520a --- /dev/null +++ b/.bzr/branch/tags @@ -0,0 +1 @@ +d5:0.10045:lool@dooz.org-20091022120946-ude4k00wrup5zi1u5:0.10158:evan.dandrea@canonical.com-20091118182236-wjse47vyhq4331c34:0.6854:cjwatson@canonical.com-20080922105353-5g6nbd3z6auod9o84:0.6947:ogra@ubuntu.com-20080923105752-3is4oq7h0rvr7m1t4:0.7050:stevenk@ubuntu.com-20080926061032-4cmvys3uwn0urof64:0.7147:ogra@ubuntu.com-20080929212513-932wmh9jhu2254c84:0.7254:cjwatson@canonical.com-20081009012107-bcithv5mtfr13wdr4:0.7350:superm1@ubuntu.com-20081105013351-lgows8lwl8gynab14:0.7450:superm1@ubuntu.com-20081108155125-k9hgpa9dpccasza14:0.7550:stevenk@ubuntu.com-20090110000926-kti0aa3w3gm87tl64:0.7654:cjwatson@canonical.com-20090120234103-0oedx9z8fwfgebmg4:0.7754:cjwatson@canonical.com-20090129172302-12n6za4eg8ti5iqs4:0.7850:stevenk@ubuntu.com-20090323105302-bzrig75pk422ae8o4:0.7954:cjwatson@canonical.com-20090403000814-c0f4i899uyvq3le14:0.8050:stevenk@ubuntu.com-20090416104708-ytmlukba1r2qbok24:0.8154:cjwatson@canonical.com-20090508233530-xqdymqe6ii8eanbt4:0.8254:cjwatson@canonical.com-20090529072059-0303r4t3a2terv5u4:0.8354:cjwatson@canonical.com-20090529093922-h2qylvtfqgwqocs24:0.8460:steve.langasek@canonical.com-20090610202236-hzpkmw79nuly34iu4:0.8554:cjwatson@canonical.com-20090623163248-2e75g8ph1wr63bck4:0.8650:stevenk@ubuntu.com-20090630021433-f32fyu1qvauh1y5y4:0.8754:cjwatson@canonical.com-20090707120821-n7o4gmu5cgvs76314:0.8850:superm1@ubuntu.com-20090723080906-su6zimlrtqy6bmdj4:0.8950:stevenk@ubuntu.com-20090805132344-m6jy87gv6cmus3384:0.9047:ogra@ubuntu.com-20090811090144-eek0pgpf01i0zjim4:0.9150:superm1@ubuntu.com-20090814032033-i87zsm015fivhf494:0.9247:ogra@ubuntu.com-20090821173859-y8ixof4s2zb3vs394:0.9347:ogra@ubuntu.com-20090825163952-pxo05zcb6icy931e4:0.9445:lool@dooz.org-20090827103704-ces9mmhqskcdzxgm4:0.9550:stevenk@ubuntu.com-20090901073549-hyto6dxcpijmyb1u4:0.9654:cjwatson@canonical.com-20090915121422-j8ycjw2o2xsk2fim4:0.9745:lool@dooz.org-20090915225223-bkp0tzqk3dllogno4:0.9840:lool@bee-20090923074648-95yic2eel4ietxl34:0.9945:lool@dooz.org-20091004115344-a657lipup0e45we65:1.10258:evan.dandrea@canonical.com-20091119211317-msuqwz83h8lrtnf45:1.10347:ogra@ubuntu.com-20091207104326-192mmbzylr7gz8bk5:1.10450:stevenk@ubuntu.com-20091218032148-0127dc53ulzxt15h5:1.10560:steve.langasek@canonical.com-20100127011800-utoua1rehbsdyiqi5:1.10654:jriddell@canonical.com-20100308114808-2z6cywa7itr3u46m5:1.10949:lamont@debian.org-20100324133047-5k5cb0qkr4w4r41me \ No newline at end of file diff --git a/.bzr/checkout/conflicts b/.bzr/checkout/conflicts new file mode 100644 index 00000000..0dc2d3a0 --- /dev/null +++ b/.bzr/checkout/conflicts @@ -0,0 +1 @@ +BZR conflict list format 1 diff --git a/.bzr/checkout/dirstate b/.bzr/checkout/dirstate new file mode 100644 index 00000000..2197dd96 Binary files /dev/null and b/.bzr/checkout/dirstate differ diff --git a/.bzr/checkout/format b/.bzr/checkout/format new file mode 100644 index 00000000..e0261c79 --- /dev/null +++ b/.bzr/checkout/format @@ -0,0 +1 @@ +Bazaar Working Tree Format 6 (bzr 1.14) diff --git a/.bzr/checkout/views b/.bzr/checkout/views new file mode 100644 index 00000000..e69de29b diff --git a/.bzr/repository/format b/.bzr/repository/format new file mode 100644 index 00000000..b200528b --- /dev/null +++ b/.bzr/repository/format @@ -0,0 +1 @@ +Bazaar repository format 2a (needs bzr 1.16 or later) diff --git a/.bzr/repository/indices/431432956c92936d1f6c3f76290d09d5.cix b/.bzr/repository/indices/431432956c92936d1f6c3f76290d09d5.cix new file mode 100644 index 00000000..0095681d --- /dev/null +++ b/.bzr/repository/indices/431432956c92936d1f6c3f76290d09d5.cix @@ -0,0 +1,6 @@ +B+Tree Graph Index 2 +node_ref_lists=0 +key_elements=1 +len=1 +row_lengths=1 +x 1 PfN5088 y/NSXm':Q[TZ%!<<g  r?f8 \ No newline at end of file diff --git a/.bzr/repository/indices/431432956c92936d1f6c3f76290d09d5.iix b/.bzr/repository/indices/431432956c92936d1f6c3f76290d09d5.iix new file mode 100644 index 00000000..7f8f0698 Binary files /dev/null and b/.bzr/repository/indices/431432956c92936d1f6c3f76290d09d5.iix differ diff --git a/.bzr/repository/indices/431432956c92936d1f6c3f76290d09d5.rix b/.bzr/repository/indices/431432956c92936d1f6c3f76290d09d5.rix new file mode 100644 index 00000000..41af8ea3 Binary files /dev/null and b/.bzr/repository/indices/431432956c92936d1f6c3f76290d09d5.rix differ diff --git a/.bzr/repository/indices/431432956c92936d1f6c3f76290d09d5.six b/.bzr/repository/indices/431432956c92936d1f6c3f76290d09d5.six new file mode 100644 index 00000000..a2afde6b --- /dev/null +++ b/.bzr/repository/indices/431432956c92936d1f6c3f76290d09d5.six @@ -0,0 +1,5 @@ +B+Tree Graph Index 2 +node_ref_lists=0 +key_elements=1 +len=0 +row_lengths= diff --git a/.bzr/repository/indices/431432956c92936d1f6c3f76290d09d5.tix b/.bzr/repository/indices/431432956c92936d1f6c3f76290d09d5.tix new file mode 100644 index 00000000..c3cf18ab Binary files /dev/null and b/.bzr/repository/indices/431432956c92936d1f6c3f76290d09d5.tix differ diff --git a/.bzr/repository/indices/5185d0af88fc5856747e257bd598e49a.cix b/.bzr/repository/indices/5185d0af88fc5856747e257bd598e49a.cix new file mode 100644 index 00000000..ad61fe34 Binary files /dev/null and b/.bzr/repository/indices/5185d0af88fc5856747e257bd598e49a.cix differ diff --git a/.bzr/repository/indices/5185d0af88fc5856747e257bd598e49a.iix b/.bzr/repository/indices/5185d0af88fc5856747e257bd598e49a.iix new file mode 100644 index 00000000..72ab7f12 Binary files /dev/null and b/.bzr/repository/indices/5185d0af88fc5856747e257bd598e49a.iix differ diff --git a/.bzr/repository/indices/5185d0af88fc5856747e257bd598e49a.rix b/.bzr/repository/indices/5185d0af88fc5856747e257bd598e49a.rix new file mode 100644 index 00000000..f72d17f6 Binary files /dev/null and b/.bzr/repository/indices/5185d0af88fc5856747e257bd598e49a.rix differ diff --git a/.bzr/repository/indices/5185d0af88fc5856747e257bd598e49a.six b/.bzr/repository/indices/5185d0af88fc5856747e257bd598e49a.six new file mode 100644 index 00000000..f921fd7e Binary files /dev/null and b/.bzr/repository/indices/5185d0af88fc5856747e257bd598e49a.six differ diff --git a/.bzr/repository/indices/5185d0af88fc5856747e257bd598e49a.tix b/.bzr/repository/indices/5185d0af88fc5856747e257bd598e49a.tix new file mode 100644 index 00000000..1054657f Binary files /dev/null and b/.bzr/repository/indices/5185d0af88fc5856747e257bd598e49a.tix differ diff --git a/.bzr/repository/indices/b31336f44699d1d57514355f2fe74838.cix b/.bzr/repository/indices/b31336f44699d1d57514355f2fe74838.cix new file mode 100644 index 00000000..296d0f5b --- /dev/null +++ b/.bzr/repository/indices/b31336f44699d1d57514355f2fe74838.cix @@ -0,0 +1,6 @@ +B+Tree Graph Index 2 +node_ref_lists=0 +key_elements=1 +len=1 +row_lengths=1 +x PLRL5<}n/uU.*@[\ D` nsʩE \ No newline at end of file diff --git a/.bzr/repository/indices/b31336f44699d1d57514355f2fe74838.iix b/.bzr/repository/indices/b31336f44699d1d57514355f2fe74838.iix new file mode 100644 index 00000000..f382626d Binary files /dev/null and b/.bzr/repository/indices/b31336f44699d1d57514355f2fe74838.iix differ diff --git a/.bzr/repository/indices/b31336f44699d1d57514355f2fe74838.rix b/.bzr/repository/indices/b31336f44699d1d57514355f2fe74838.rix new file mode 100644 index 00000000..1f1a13cd Binary files /dev/null and b/.bzr/repository/indices/b31336f44699d1d57514355f2fe74838.rix differ diff --git a/.bzr/repository/indices/b31336f44699d1d57514355f2fe74838.six b/.bzr/repository/indices/b31336f44699d1d57514355f2fe74838.six new file mode 100644 index 00000000..a2afde6b --- /dev/null +++ b/.bzr/repository/indices/b31336f44699d1d57514355f2fe74838.six @@ -0,0 +1,5 @@ +B+Tree Graph Index 2 +node_ref_lists=0 +key_elements=1 +len=0 +row_lengths= diff --git a/.bzr/repository/indices/b31336f44699d1d57514355f2fe74838.tix b/.bzr/repository/indices/b31336f44699d1d57514355f2fe74838.tix new file mode 100644 index 00000000..9a0fdb2a Binary files /dev/null and b/.bzr/repository/indices/b31336f44699d1d57514355f2fe74838.tix differ diff --git a/.bzr/repository/pack-names b/.bzr/repository/pack-names new file mode 100644 index 00000000..37930e7c Binary files /dev/null and b/.bzr/repository/pack-names differ diff --git a/.bzr/repository/packs/431432956c92936d1f6c3f76290d09d5.pack b/.bzr/repository/packs/431432956c92936d1f6c3f76290d09d5.pack new file mode 100644 index 00000000..b6214c7c Binary files /dev/null and b/.bzr/repository/packs/431432956c92936d1f6c3f76290d09d5.pack differ diff --git a/.bzr/repository/packs/5185d0af88fc5856747e257bd598e49a.pack b/.bzr/repository/packs/5185d0af88fc5856747e257bd598e49a.pack new file mode 100644 index 00000000..facb84b5 Binary files /dev/null and b/.bzr/repository/packs/5185d0af88fc5856747e257bd598e49a.pack differ diff --git a/.bzr/repository/packs/b31336f44699d1d57514355f2fe74838.pack b/.bzr/repository/packs/b31336f44699d1d57514355f2fe74838.pack new file mode 100644 index 00000000..bd40ef34 Binary files /dev/null and b/.bzr/repository/packs/b31336f44699d1d57514355f2fe74838.pack differ diff --git a/.bzrignore b/.bzrignore new file mode 100644 index 00000000..0c673e57 --- /dev/null +++ b/.bzrignore @@ -0,0 +1,4 @@ +debian/*.debhelper* +debian/*.substvars +debian/files +debian/livecd-rootfs diff --git a/BuildLiveCD b/BuildLiveCD index e7ff8318..62570762 100755 --- a/BuildLiveCD +++ b/BuildLiveCD @@ -27,7 +27,7 @@ fi ARCH=$(dpkg --print-architecture) SUBARCH="" SUBARCHARG="" -DEFAULTSUITE="lucid" +DEFAULTSUITE="karmic" NEWSUITE="" SUITES="" PROPOSED="" @@ -41,11 +41,6 @@ if [ "$1" = '-p' ]; then PROPOSED='-p' shift fi -if [ "$1" = '--archive' ]; then - shift - PROPOSED="$PROPOSED -m $1" - shift -fi if [ "$1" = '-d' ]; then shift NEWSUITE="$1" diff --git a/debian/changelog b/debian/changelog index f8c05570..e06f5784 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +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 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 diff --git a/debian/control b/debian/control index 89f43f25..3e3f0728 100644 --- a/debian/control +++ b/debian/control @@ -2,13 +2,13 @@ Source: livecd-rootfs Section: devel Priority: optional Build-Depends: debhelper (>= 7) -Maintainer: LaMont Jones +Maintainer: Adam Conrad Standards-Version: 3.6.1.0 Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/livecd-rootfs/trunk Package: livecd-rootfs Architecture: all -Depends: ${misc:Depends}, debootstrap, rsync, python-minimal | python, procps, squashfs-tools (>= 1:3.3-1), grep-dctrl, fdupes, lsb-release, ltsp-server [i386] +Depends: ${misc:Depends}, debootstrap, rsync, python-minimal | python, procps, squashfs-tools (>= 1:3.3-1), grep-dctrl, fdupes, lsb-release Suggests: partimage Description: construction script for the livecd rootfs livecd-rootfs provides the script used to create the root filesystem diff --git a/livecd.sh b/livecd.sh index cbbf155e..27c30487 100755 --- a/livecd.sh +++ b/livecd.sh @@ -651,9 +651,8 @@ Pin-Priority: 550 case $FS in edubuntu-dvd) 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 + 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