summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2008-11-30 11:37:06 +0100
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:03:45 +0100
commit95f40a04d62e51ac8b426c799aade6a815e9dd7b (patch)
tree4ad7f41bcd80753ce95c33c1993a991e5be75c0a
parentd7c4506eceb1ca15635b3b7a2c2aee0719d63462 (diff)
downloadvyos-live-build-95f40a04d62e51ac8b426c799aade6a815e9dd7b.tar.gz
vyos-live-build-95f40a04d62e51ac8b426c799aade6a815e9dd7b.zip
Updating lxde-desktop support.
-rwxr-xr-xexamples/cron/images.sh2
-rwxr-xr-xfunctions/defaults.sh5
-rw-r--r--lists/lxde2
3 files changed, 7 insertions, 2 deletions
diff --git a/examples/cron/images.sh b/examples/cron/images.sh
index c94f39183..e31b3757d 100755
--- a/examples/cron/images.sh
+++ b/examples/cron/images.sh
@@ -2,7 +2,7 @@
# Static variables
DISTRIBUTIONS="${DISTRIBUTIONS:-etch lenny sid}"
-FLAVOURS="${FLAVOURS:-standard rescue gnome-desktop kde-desktop xfce-desktop}"
+FLAVOURS="${FLAVOURS:-standard rescue gnome-desktop kde-desktop lxde-desktop xfce-desktop}"
SOURCE="${SOURCE:-enabled}"
MIRROR="${MIRROR:-http://mirror/ftp.debian.org/debian/}"
diff --git a/functions/defaults.sh b/functions/defaults.sh
index 3636c219d..0469ca04b 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -483,6 +483,11 @@ Set_defaults ()
LH_TASKS="$(echo ${LH_TASKS} | sed -e 's|standard||' -e 's|laptop||' -e 's|kde-desktop||' -e 's|desktop||') standard laptop kde-desktop desktop"
;;
+ lxde-desktop)
+ LH_PACKAGES_LISTS="$(echo ${LH_PACKAGES_LISTS} | sed -e 's|lxde-desktop||') standard-x11"
+ LH_TASKS="$(echo ${LH_TASKS} | sed -e 's|standard||' -e 's|laptop||' -e 's|lxde-desktop||' -e 's|desktop||') standard laptop lxde-desktop desktop"
+ ;;
+
xfce-desktop)
LH_PACKAGES_LISTS="$(echo ${LH_PACKAGES_LISTS} | sed -e 's|xfce-desktop||') standard-x11"
LH_TASKS="$(echo ${LH_TASKS} | sed -e 's|standard||' -e 's|laptop||' -e 's|xfce-desktop||' -e 's|desktop||') standard laptop xfce-desktop desktop"
diff --git a/lists/lxde b/lists/lxde
index 03938a1db..2a86246a2 100644
--- a/lists/lxde
+++ b/lists/lxde
@@ -3,5 +3,5 @@
## LH: LXDE
#include <standard-x11>
-gdm lxde lxsession-lite lxrandr lxappearance lxnm
+gdm lxde lxnm
desktop-base