From c137ae55e821b27bb81457f149b55cb79d39d72f Mon Sep 17 00:00:00 2001 From: Adam Conrad Date: Fri, 30 Sep 2005 13:26:15 +0000 Subject: [PATCH] tocd changes --- debian/changelog | 7 ++++++- livecd.sh | 24 +++++++++++++++++++++++- 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1ef7896a..8c99932f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ livecd-rootfs (0.24) hoary-cat-UNRELEASED; urgency=low + [ LaMont Jones ] * Incorporate e2fs-zero.py from Paul Sladen: http://www.paul.sladen.org/ubuntu/e2fszero/e2fs-zero.py And use it instead of partimage. Suggest: partimage instead of @@ -8,7 +9,11 @@ livecd-rootfs (0.24) hoary-cat-UNRELEASED; urgency=low * some HPPA fixes, allow architectures to have more than just main. * add debian/compat - -- LaMont Jones Thu, 29 Sep 2005 19:07:57 -0600 + [ Adam Conrad ] + * Incorporate 'tocd' target, including hideous hack to get the + germinate output from Colin's lists at people.ubuntu.com + + -- Adam Conrad Fri, 30 Sep 2005 23:25:02 +1000 livecd-rootfs (0.23) hoary-cat; urgency=low diff --git a/livecd.sh b/livecd.sh index e7f14b35..705fc947 100755 --- a/livecd.sh +++ b/livecd.sh @@ -98,7 +98,7 @@ fi for arg in "$@"; do case "$arg" in - ubuntu|kubuntu|base) + ubuntu|kubuntu|base|tocd) ;; *) echo bad name >&2; @@ -138,6 +138,28 @@ Flags: seen base) LIST="$LIST ubuntu-base" ;; + tocd) + LIST="$LIST ubuntu-base" + tocdtmp=`mktemp -d` || exit 1 + tocdgerminate='http://people.ubuntu.com/~cjwatson/germinate-output/tocd3.1-breezy/' + if wget -O "$tocdtmp"/desktop "$tocdgerminate"/desktop; then + tocddesktop=`awk '{print $1}' "$tocdtmp"/desktop | egrep -v '^-|^Package|^\|' | tr '\n' ' '` + echo "TheOpenCD desktop package list is: $tocddesktop" + else + echo "Unable to fetch tocd-desktop germinate output." + [ -d "$tocdtmp" ] && rm -rf "$tocdtmp" + exit 1 + fi + if wget -O "$tocdtmp"/live "$tocdgerminate"/live; then + tocdlive=`awk '{print $1}' "$tocdtmp"/live | egrep -v '^-|^Package|^\|' | tr '\n' ' '` + echo "TheOpenCD live package list is: $tocdlive" + else + echo "Unable to fetch tocd-live germinate output." + [ -d "$tocdtmp" ] && rm -rf "$tocdtmp" + exit 1 + fi + [ -d "$tocdtmp" ] && rm -rf "$tocdtmp" + LIST="$LIST $tocddesktop $tocdlive" esac dpkg -l livecd-rootfs # get our version # in the log.