diff --git a/.bzr/branch/revision-history b/.bzr/branch/revision-history index fdc9ba72..cf1fe434 100644 --- a/.bzr/branch/revision-history +++ b/.bzr/branch/revision-history @@ -143,4 +143,6 @@ doko@salsa-20071007121443-tsaye6lzm7b0h2dv cjwatson@canonical.com-20071018135643-4b1vd4ii2vho8epy cjwatson@canonical.com-20071024160911-4egvg829efwoni0v cjwatson@canonical.com-20071024221916-bghv57czypc7wpwb -cjwatson@canonical.com-20071024222240-yr2ehi0b2rlfip9x \ No newline at end of file +cjwatson@canonical.com-20071024222240-yr2ehi0b2rlfip9x +cjwatson@canonical.com-20071029215702-otqasvgd1no8g0c3 +cjwatson@canonical.com-20071029220456-dldduflcjy339owi \ No newline at end of file diff --git a/.bzr/checkout/dirstate b/.bzr/checkout/dirstate index c5d50206..d50d7ca5 100644 Binary files a/.bzr/checkout/dirstate and b/.bzr/checkout/dirstate differ diff --git a/.bzr/repository/inventory.kndx b/.bzr/repository/inventory.kndx index e1fd8dbc..ae03e5c3 100644 --- a/.bzr/repository/inventory.kndx +++ b/.bzr/repository/inventory.kndx @@ -146,4 +146,6 @@ doko@salsa-20071007121443-tsaye6lzm7b0h2dv line-delta 64945 373 141 : cjwatson@canonical.com-20071018135643-4b1vd4ii2vho8epy line-delta 65318 373 142 : cjwatson@canonical.com-20071024160911-4egvg829efwoni0v fulltext 65691 1086 143 : cjwatson@canonical.com-20071024221916-bghv57czypc7wpwb line-delta 66777 373 144 : -cjwatson@canonical.com-20071024222240-yr2ehi0b2rlfip9x line-delta 67150 304 145 : \ No newline at end of file +cjwatson@canonical.com-20071024222240-yr2ehi0b2rlfip9x line-delta 67150 304 145 : +cjwatson@canonical.com-20071029215702-otqasvgd1no8g0c3 line-delta 67454 372 146 : +cjwatson@canonical.com-20071029220456-dldduflcjy339owi line-delta 67826 307 147 : \ No newline at end of file diff --git a/.bzr/repository/inventory.knit b/.bzr/repository/inventory.knit index bc73f3e0..5d00b17b 100644 Binary files a/.bzr/repository/inventory.knit and b/.bzr/repository/inventory.knit differ diff --git a/.bzr/repository/knits/5b/x_%4ca%4dont_%4aones_%3clamont.jones@canonical.com%3e_%54hu_%4aan__6_23%3a41%3a24_2005_11810.1.kndx b/.bzr/repository/knits/5b/x_%4ca%4dont_%4aones_%3clamont.jones@canonical.com%3e_%54hu_%4aan__6_23%3a41%3a24_2005_11810.1.kndx index 12452dd8..f9c32937 100644 --- a/.bzr/repository/knits/5b/x_%4ca%4dont_%4aones_%3clamont.jones@canonical.com%3e_%54hu_%4aan__6_23%3a41%3a24_2005_11810.1.kndx +++ b/.bzr/repository/knits/5b/x_%4ca%4dont_%4aones_%3clamont.jones@canonical.com%3e_%54hu_%4aan__6_23%3a41%3a24_2005_11810.1.kndx @@ -96,4 +96,6 @@ doko@salsa-20071007121443-tsaye6lzm7b0h2dv line-delta 43430 247 91 : cjwatson@canonical.com-20071018135643-4b1vd4ii2vho8epy line-delta 43677 264 92 : cjwatson@canonical.com-20071024160911-4egvg829efwoni0v line-delta 43941 153 93 : cjwatson@canonical.com-20071024221916-bghv57czypc7wpwb line-delta 44094 175 94 : -cjwatson@canonical.com-20071024222240-yr2ehi0b2rlfip9x line-delta 44269 216 95 : \ No newline at end of file +cjwatson@canonical.com-20071024222240-yr2ehi0b2rlfip9x line-delta 44269 216 95 : +cjwatson@canonical.com-20071029215702-otqasvgd1no8g0c3 line-delta 44485 245 96 : +cjwatson@canonical.com-20071029220456-dldduflcjy339owi line-delta 44730 216 97 : \ No newline at end of file diff --git a/.bzr/repository/knits/5b/x_%4ca%4dont_%4aones_%3clamont.jones@canonical.com%3e_%54hu_%4aan__6_23%3a41%3a24_2005_11810.1.knit b/.bzr/repository/knits/5b/x_%4ca%4dont_%4aones_%3clamont.jones@canonical.com%3e_%54hu_%4aan__6_23%3a41%3a24_2005_11810.1.knit index 19a79c36..a1e7b450 100644 Binary files a/.bzr/repository/knits/5b/x_%4ca%4dont_%4aones_%3clamont.jones@canonical.com%3e_%54hu_%4aan__6_23%3a41%3a24_2005_11810.1.knit and b/.bzr/repository/knits/5b/x_%4ca%4dont_%4aones_%3clamont.jones@canonical.com%3e_%54hu_%4aan__6_23%3a41%3a24_2005_11810.1.knit differ diff --git a/.bzr/repository/knits/5f/x_%4ca%4dont_%4aones_%3clamont.jones@canonical.com%3e_%54hu_%4aan__6_23%3a41%3a24_2005_11810.5.kndx b/.bzr/repository/knits/5f/x_%4ca%4dont_%4aones_%3clamont.jones@canonical.com%3e_%54hu_%4aan__6_23%3a41%3a24_2005_11810.5.kndx index 88ca44a5..45ef61ab 100644 --- a/.bzr/repository/knits/5f/x_%4ca%4dont_%4aones_%3clamont.jones@canonical.com%3e_%54hu_%4aan__6_23%3a41%3a24_2005_11810.5.kndx +++ b/.bzr/repository/knits/5f/x_%4ca%4dont_%4aones_%3clamont.jones@canonical.com%3e_%54hu_%4aan__6_23%3a41%3a24_2005_11810.5.kndx @@ -100,4 +100,5 @@ doko@salsa-20071004110523-ab0qzrldakrxi9ap line-delta 62619 284 95 : cjwatson@canonical.com-20071004132601-q4vup64i8pslbjqf line-delta 62903 165 96 : doko@salsa-20071007121443-tsaye6lzm7b0h2dv line-delta 63068 245 97 : cjwatson@canonical.com-20071018135643-4b1vd4ii2vho8epy line-delta 63313 202 98 : -cjwatson@canonical.com-20071024221916-bghv57czypc7wpwb line-delta 63515 216 99 : \ No newline at end of file +cjwatson@canonical.com-20071024221916-bghv57czypc7wpwb line-delta 63515 216 99 : +cjwatson@canonical.com-20071029215702-otqasvgd1no8g0c3 line-delta 63731 353 100 : \ No newline at end of file diff --git a/.bzr/repository/knits/5f/x_%4ca%4dont_%4aones_%3clamont.jones@canonical.com%3e_%54hu_%4aan__6_23%3a41%3a24_2005_11810.5.knit b/.bzr/repository/knits/5f/x_%4ca%4dont_%4aones_%3clamont.jones@canonical.com%3e_%54hu_%4aan__6_23%3a41%3a24_2005_11810.5.knit index 2f395be6..42db2347 100644 Binary files a/.bzr/repository/knits/5f/x_%4ca%4dont_%4aones_%3clamont.jones@canonical.com%3e_%54hu_%4aan__6_23%3a41%3a24_2005_11810.5.knit and b/.bzr/repository/knits/5f/x_%4ca%4dont_%4aones_%3clamont.jones@canonical.com%3e_%54hu_%4aan__6_23%3a41%3a24_2005_11810.5.knit differ diff --git a/.bzr/repository/revisions.kndx b/.bzr/repository/revisions.kndx index 4ea5d50e..fd0176ff 100644 --- a/.bzr/repository/revisions.kndx +++ b/.bzr/repository/revisions.kndx @@ -146,4 +146,6 @@ doko@salsa-20071007121443-tsaye6lzm7b0h2dv fulltext 48401 392 141 : cjwatson@canonical.com-20071018135643-4b1vd4ii2vho8epy fulltext 48793 388 142 : cjwatson@canonical.com-20071024160911-4egvg829efwoni0v fulltext 49181 367 143 : cjwatson@canonical.com-20071024221916-bghv57czypc7wpwb fulltext 49548 373 144 : -cjwatson@canonical.com-20071024222240-yr2ehi0b2rlfip9x fulltext 49921 355 145 : \ No newline at end of file +cjwatson@canonical.com-20071024222240-yr2ehi0b2rlfip9x fulltext 49921 355 145 : +cjwatson@canonical.com-20071029215702-otqasvgd1no8g0c3 fulltext 50276 366 146 : +cjwatson@canonical.com-20071029220456-dldduflcjy339owi fulltext 50642 360 147 : \ No newline at end of file diff --git a/.bzr/repository/revisions.knit b/.bzr/repository/revisions.knit index 03bdb0b4..08d2d146 100644 Binary files a/.bzr/repository/revisions.knit and b/.bzr/repository/revisions.knit differ diff --git a/debian/changelog b/debian/changelog index 7b6f1fea..fc2b6e1d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (0.43) hardy; urgency=low + + * Add Gobuntu support. + + -- Colin Watson Mon, 29 Oct 2007 17:57:17 -0400 + livecd-rootfs (0.42) hardy; urgency=low * Create /spu directory and spu group for powerpc+ps3 builds. diff --git a/livecd.sh b/livecd.sh index c4b233cb..074b0f0f 100755 --- a/livecd.sh +++ b/livecd.sh @@ -65,7 +65,6 @@ export DEBIAN_FRONTEND=noninteractive export LANG=C export CASPER_GENERATE_UUID=1 SRCMIRROR=http://archive.ubuntu.com/ubuntu -COMP="main restricted" ARCH=$(dpkg --print-installation-architecture) OPTMIRROR= @@ -89,7 +88,6 @@ select_mirror () { USERMIRROR=http://ports.ubuntu.com/ubuntu-ports SECMIRROR=${USERMIRROR} SECSRCMIRROR=${SRCMIRROR} - #COMP="main restricted universe" ;; *) USERMIRROR=http://ports.ubuntu.com/ubuntu-ports @@ -131,15 +129,15 @@ esac; done; shift $((OPTIND-1)) if (( $# == 0 )) || [ "X$1" = "Xall" ]; then - set -- ubuntu kubuntu edubuntu xubuntu base + set -- ubuntu kubuntu edubuntu xubuntu gobuntu base if [ "$ARCH" = "i386" ]; then - set -- ubuntu ubuntu-lpia kubuntu edubuntu xubuntu base + set -- ubuntu ubuntu-lpia kubuntu edubuntu xubuntu gobuntu base fi fi for arg in "$@"; do case "$arg" in - ubuntu|ubuntu-lpia|edubuntu|kubuntu|xubuntu|base|tocd) + ubuntu|ubuntu-lpia|edubuntu|kubuntu|xubuntu|gobuntu|base|tocd) ;; *) echo bad name >&2; @@ -154,6 +152,7 @@ for FS in "$@"; do IMG=livecd.${FSS}.fsimg MOUNTS="${ROOT}dev/pts ${ROOT}dev/shm ${ROOT}.dev ${ROOT}dev ${ROOT}proc ${ROOT}sys" DEV="" + COMP="main restricted" select_mirror @@ -186,6 +185,11 @@ Flags: seen LIST="$LIST minimal^ standard^ xterm libgoffice-gtk-0-4 xubuntu-desktop^" LIVELIST="xubuntu-live^ xresprobe laptop-detect casper lupin-casper" ;; + gobuntu) + LIST="$LIST minimal^ standard^ gobuntu-desktop^" + LIVELIST="gobuntu-live^ xresprobe laptop-detect casper lupin-casper" + COMP="main" + ;; base) LIST="$LIST minimal^ standard^" LIVELIST="casper lupin-casper"