summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Chamberlain <steven@pyro.eu.org>2015-05-02 22:04:41 +0100
committerHolger Levsen <holger@layer-acht.org>2015-05-03 12:25:15 +0200
commitd1c46af24950bc3c69fe7dc851a78ec034988d1b (patch)
tree5615ffe527026062d057629e4e51ddae7af509f8
parentd716c73f7cdcc663d4cc1ac0b9e47cfb856a9044 (diff)
downloadjenkins.debian.net-d1c46af24950bc3c69fe7dc851a78ec034988d1b.tar.xz
g-i: really install xfce in _xfce preseed configs
Syntax for preseeding desktop selection changed in jessie and later.
-rw-r--r--d-i-preseed-cfgs/debian_jessie_xfce_preseed.cfg6
-rw-r--r--d-i-preseed-cfgs/debian_sid_daily_xfce_preseed.cfg6
2 files changed, 2 insertions, 10 deletions
diff --git a/d-i-preseed-cfgs/debian_jessie_xfce_preseed.cfg b/d-i-preseed-cfgs/debian_jessie_xfce_preseed.cfg
index e420e6fc..fda634f1 100644
--- a/d-i-preseed-cfgs/debian_jessie_xfce_preseed.cfg
+++ b/d-i-preseed-cfgs/debian_jessie_xfce_preseed.cfg
@@ -301,11 +301,7 @@ d-i partman/confirm_nooverwrite boolean true
### Package selection
#tasksel tasksel/first multiselect standard, web-server
-tasksel tasksel/first multiselect standard, desktop
-# If the desktop task is selected, install the kde and xfce desktops
-# instead of the default gnome desktop.
-#tasksel tasksel/desktop multiselect kde, xfce
-tasksel tasksel/desktop multiselect xfce
+tasksel tasksel/first multiselect standard, xfce-desktop
# Individual additional packages to install
#d-i pkgsel/include string openssh-server build-essential
diff --git a/d-i-preseed-cfgs/debian_sid_daily_xfce_preseed.cfg b/d-i-preseed-cfgs/debian_sid_daily_xfce_preseed.cfg
index b68138d5..e4647901 100644
--- a/d-i-preseed-cfgs/debian_sid_daily_xfce_preseed.cfg
+++ b/d-i-preseed-cfgs/debian_sid_daily_xfce_preseed.cfg
@@ -301,11 +301,7 @@ d-i partman/confirm_nooverwrite boolean true
### Package selection
#tasksel tasksel/first multiselect standard, web-server
-tasksel tasksel/first multiselect standard, desktop
-# If the desktop task is selected, install the kde and xfce desktops
-# instead of the default gnome desktop.
-#tasksel tasksel/desktop multiselect kde, xfce
-tasksel tasksel/desktop multiselect xfce
+tasksel tasksel/first multiselect standard, xfce-desktop
# Individual additional packages to install
#d-i pkgsel/include string openssh-server build-essential