From f9b94ae52ea4bb20d4ffb952a709e6c377952753 Mon Sep 17 00:00:00 2001 From: Oliver Grawert Date: Wed, 9 Mar 2011 16:48:35 +0100 Subject: [PATCH] the name of the flavour needs to be ubuntu-headless, not just headless --- debian/changelog | 6 ++++++ livecd.sh | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 88915bef..9e08b051 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (1.162) UNRELEASED; urgency=low + + * the name of the flavour needs to be ubuntu-headless, not just headless + + -- Oliver Grawert Wed, 09 Mar 2011 16:46:28 +0100 + livecd-rootfs (1.161) natty; urgency=low * add ubuntu-headless as allowed flavour to BuildLiveCD diff --git a/livecd.sh b/livecd.sh index 7eb83e1e..72d210e4 100755 --- a/livecd.sh +++ b/livecd.sh @@ -203,9 +203,9 @@ esac; done; shift $((OPTIND-1)) if (( $# == 0 )) || [ "X$1" = "Xall" ]; then - set -- ubuntu kubuntu kubuntu-mobile kubuntu-netbook edubuntu xubuntu mythbuntu gobuntu base headless + set -- ubuntu kubuntu kubuntu-mobile kubuntu-netbook edubuntu xubuntu mythbuntu gobuntu base ubuntu-headless if [ "$ARCH" = "i386" ]; then - set -- ubuntu ubuntu-dvd kubuntu kubuntu-dvd kubuntu-mobile kubuntu-netbook edubuntu edubuntu-dvd mythbuntu xubuntu gobuntu base headless + set -- ubuntu ubuntu-dvd kubuntu kubuntu-dvd kubuntu-mobile kubuntu-netbook edubuntu edubuntu-dvd mythbuntu xubuntu gobuntu base ubuntu-headless fi fi @@ -217,7 +217,7 @@ fi for arg in "$@"; do case "$arg" in - ubuntu|ubuntu-dvd|ubuntu-lpia|edubuntu|edubuntu-dvd|kubuntu|kubuntu-dvd|kubuntu-mobile|kubuntu-netbook|xubuntu|mythbuntu|gobuntu|ubuntu-mid|ubuntu-netbook|ubuntu-moblin-remix|base|headless|tocd) + ubuntu|ubuntu-dvd|ubuntu-lpia|edubuntu|edubuntu-dvd|kubuntu|kubuntu-dvd|kubuntu-mobile|kubuntu-netbook|xubuntu|mythbuntu|gobuntu|ubuntu-mid|ubuntu-netbook|ubuntu-moblin-remix|base|ubuntu-headless|tocd) ;; *) echo bad name >&2; @@ -318,7 +318,7 @@ Flags: seen LIST="$LIST minimal^ standard^" LIVELIST="$LIVE_BOOT_SCRIPTS" ;; - headless) + ubuntu-headless) LIST="$LIST minimal^ standard^" LIVELIST="$LIVE_BOOT_SCRIPTS" ;;