From 6ae6083c9e4cb1c8bc63f8b6570ece1952840614 Mon Sep 17 00:00:00 2001 From: Frans Pop Date: Tue, 14 Oct 2008 08:22:07 +0000 Subject: [PATCH] easy-build: support creating KDE and Xce CDs --- easy-build.sh | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/easy-build.sh b/easy-build.sh index 11e30bc5..7aa9ad52 100755 --- a/easy-build.sh +++ b/easy-build.sh @@ -6,7 +6,7 @@ set -e ## See also CONF.sh for the meaning of variables used here. show_usage() { - echo "Usage: $(basename $0) BC|NETINST|CD|DVD [ ...]" + echo "Usage: $(basename $0) [-d kde|xfce] BC|NETINST|CD|DVD [ ...]" } @@ -24,6 +24,24 @@ if [ $# -eq 0 ]; then exit 1 fi +desktop= +if [ "$1" = "-d" ]; then + case $2 in + gnome) + # Ignore (gnome is default) + shift 2 + ;; + kde|xfce) + desktop=$2 + shift 2 + ;; + *) + show_usage + exit 1 + ;; + esac +fi + export DISKTYPE="$1" shift @@ -115,6 +133,17 @@ case $DISKTYPE in ;; esac +# By default a GNOME CD/DVD is built, but KDE and Xfce are supported too +if [ "$desktop" ] && ([ $DISKTYPE = CD ] || [ $DISKTYPE = DVD ]); then + TASK=tasks/Debian_${CODENAME}-${desktop} + if [ $CODENAME = etch ]; then + KERNEL_PARAMS="tasks=\"${desktop}-desktop, standard\"" + else + KERNEL_PARAMS="desktop=$desktop" + fi + DESKTOP=$desktop + export TASK KERNEL_PARAMS DESKTOP +fi if [ "$LOCAL" ] && [ "$UPDATE_LOCAL" ]; then echo "Updating Packages files for local repository..."