Package: debian-installer Severity: normal Tags: patch Once tasksel 3.27 is in testing, but not before, d-i should stop preseeding desktop=xfce for kfreebsd and hurd. This version of tasksel defaults to xfce for those architectures and will handle any other architecture variations in a single place.
-- see shy jo
From 742e335531a1ed27757db3b3ce95bc330e7d51f6 Mon Sep 17 00:00:00 2001 From: Joey Hess <j...@kitenet.net> Date: Tue, 23 Sep 2014 14:59:10 -0400 Subject: [PATCH] remove desktop=xfce preseeding Moved to tasksel 3.27. --- build/boot/hurd/grub-hurd-cdrom.cfg | 2 +- build/boot/hurd/grub-hurd-pxe.cfg | 2 +- build/boot/kfreebsd/grub-kfreebsd-cdrom.cfg | 4 ---- build/boot/kfreebsd/grub-kfreebsd-pxe.cfg | 4 ---- build/config/kfreebsd.cfg | 2 -- 5 files changed, 2 insertions(+), 12 deletions(-) diff --git a/build/boot/hurd/grub-hurd-cdrom.cfg b/build/boot/hurd/grub-hurd-cdrom.cfg index cf93789..b50ceb5 100644 --- a/build/boot/hurd/grub-hurd-cdrom.cfg +++ b/build/boot/hurd/grub-hurd-cdrom.cfg @@ -37,7 +37,7 @@ menuentry "" { function boot_one { echo "Loading ..." set root=$cd - multiboot /boot/kernel/gnumach.gz $options desktop=xfce + multiboot /boot/kernel/gnumach.gz $options module --nounzip /boot/${gtk}initrd.gz initrd '$(ramdisk-create)' module /boot/kernel/ext2fs.static ext2fs \ --multiboot-command-line='${kernel-command-line}' \ diff --git a/build/boot/hurd/grub-hurd-pxe.cfg b/build/boot/hurd/grub-hurd-pxe.cfg index b45dee1..b5c9fc3 100644 --- a/build/boot/hurd/grub-hurd-pxe.cfg +++ b/build/boot/hurd/grub-hurd-pxe.cfg @@ -28,7 +28,7 @@ menuentry "" { function boot_one { echo "Loading ..." set root=$cd - multiboot $prefix/gnumach.gz $options desktop=xfce + multiboot $prefix/gnumach.gz $options module --nounzip /boot/${gtk}initrd.gz initrd '$(ramdisk-create)' module /boot/kernel/ext2fs.static ext2fs \ --multiboot-command-line='${kernel-command-line}' \ diff --git a/build/boot/kfreebsd/grub-kfreebsd-cdrom.cfg b/build/boot/kfreebsd/grub-kfreebsd-cdrom.cfg index a12c622..c252410 100644 --- a/build/boot/kfreebsd/grub-kfreebsd-cdrom.cfg +++ b/build/boot/kfreebsd/grub-kfreebsd-cdrom.cfg @@ -26,10 +26,6 @@ else set menu_color_highlight=white/blue fi -# See archived discussion: -# http://lists.debian.org/debian-bsd/2011/09/msg00051.html -set kFreeBSD.desktop=xfce - menuentry "Debian GNU/kFreeBSD installer boot menu" { true } diff --git a/build/boot/kfreebsd/grub-kfreebsd-pxe.cfg b/build/boot/kfreebsd/grub-kfreebsd-pxe.cfg index 72a601e..03f242b 100644 --- a/build/boot/kfreebsd/grub-kfreebsd-pxe.cfg +++ b/build/boot/kfreebsd/grub-kfreebsd-pxe.cfg @@ -17,10 +17,6 @@ else set menu_color_highlight=white/blue fi -# See archived discussion: -# http://lists.debian.org/debian-bsd/2011/09/msg00051.html -set kFreeBSD.desktop=xfce - menuentry "Debian GNU/kFreeBSD installer boot menu" { true } diff --git a/build/config/kfreebsd.cfg b/build/config/kfreebsd.cfg index fe3df2b..d4cd148 100644 --- a/build/config/kfreebsd.cfg +++ b/build/config/kfreebsd.cfg @@ -52,7 +52,6 @@ arch_cd_info_dir: (printf "[installer]\n"; \ printf "kernel=kfreebsd\n"; \ printf "arch=$(subst kfreebsd-,,$(ARCH))\n"; \ - printf "default_desktop=xfce\n"; \ #if [ -n "$(INITRD_GTK)" ]; then \ # printf "$(ARCH)/kfreebsd=boot/kernel/kfreebsd.gz\n$(ARCH)/kfreebsd_module=boot/mfsroot.gz\n"; \ # printf "$(ARCH)/gtk/kfreebsd=boot/kernel/kfreebsd.gz\n$(ARCH)/gtk/kfreebsd_module=boot/gtk/mfsroot.gz\n"; \ @@ -95,7 +94,6 @@ arch_miniiso: $(TEMP_INITRD) $(TEMP_KERNEL) $(TREE) (printf "[installer]\n"; \ printf "kernel=kfreebsd\n"; \ printf "arch=$(subst kfreebsd-,,$(ARCH))\n"; \ - printf "default_desktop=xfce\n"; \ if [ "$(TYPE)" = "netboot/gtk" ]; then \ printf "user_interface=graphical\n"; \ printf "$(ARCH)/gtk/kfreebsd=boot/kernel/kfreebsd.gz\n$(ARCH)/gtk/kfreebsd_module=boot/mfsroot.gz\n"; \ -- 2.1.0
signature.asc
Description: Digital signature