Your message dated Wed, 29 Oct 2014 17:48:40 +0000 with message-id <E1XjXMO-0004gd-Vx@franck.debian.org> and subject line Bug#762487: fixed in debian-cd 3.1.16 has caused the Debian Bug report #762487, regarding desktop selection changes to be marked as done. This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact owner@bugs.debian.org immediately.) -- 762487: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=762487 Debian Bug Tracking System Contact owner@bugs.debian.org with problems
--- Begin Message ---
- To: Debian Bug Tracking System <submit@bugs.debian.org>
- Subject: desktop selection changes
- From: Joey Hess <joeyh@debian.org>
- Date: Mon, 22 Sep 2014 15:20:09 -0400
- Message-id: <20140922192009.GA31619@kitenet.net>
Package: debian-cd Severity: important Changes to desktop selection in tasksel and recently to d-i are going to need updates to debian-cd. The attached patch might work, or at least point in the right direction. -- see shy joFrom 723ae4c5fb37461863d2312cfb25a201e7594cfd Mon Sep 17 00:00:00 2001 From: Joey Hess <joey@kitenet.net> Date: Mon, 22 Sep 2014 15:14:47 -0400 Subject: [PATCH] adapt desktop handling for tasksel/d-i changes tasksel now allows selecting the desktop, and d-i has dropped the boot menu desktop selection. This patch attempts to update debian-cd for these changes, removing the desktop boot menus from the CDs. CD images for specific desktops (xfce/kde/mate/etc) should still override the default tasksel desktop. untested --- tools/boot/jessie/boot-x86 | 14 +---- tools/boot/jessie/common.sh | 4 +- tools/boot/jessie/x86-desktop.sh | 109 +-------------------------------------- 3 files changed, 5 insertions(+), 122 deletions(-) diff --git a/tools/boot/jessie/boot-x86 b/tools/boot/jessie/boot-x86 index df42c96..e42dee0 100644 --- a/tools/boot/jessie/boot-x86 +++ b/tools/boot/jessie/boot-x86 @@ -150,19 +150,16 @@ extra_image () { done } -# If multiple desktops are to be supported, set the default one -ORIG_DESKTOP= case "$DESKTOP" in $UNSPEC_DESKTOP_DEFAULT) # default from tasksel DESKTOP= ;; all) - ORIG_DESKTOP=$DESKTOP + # default from tasksel DESKTOP= ;; light) - ORIG_DESKTOP=$DESKTOP DESKTOP=xfce ;; esac @@ -377,14 +374,7 @@ if [ -n "$KERNEL_PARAMS" ]; then done fi -case "$ORIG_DESKTOP" in - all) - modify_for_all_desktop ;; - light) - modify_for_light_desktop ;; - *) - modify_for_single_desktop ;; -esac +set_default_desktop # Add autorun if [ -f boot$N/setup.exe ]; then diff --git a/tools/boot/jessie/common.sh b/tools/boot/jessie/common.sh index a09c8af..8a38b09 100644 --- a/tools/boot/jessie/common.sh +++ b/tools/boot/jessie/common.sh @@ -27,8 +27,8 @@ UNSPEC_DESKTOP_DEFAULT="$($BASEDIR/tools/apt-selection cache depends task-deskto exit }')" -# Only i386 and amd64 support desktop selection with the 'light' and 'all' -# desktops; make sure other arches get a working config +# Only i386 and amd64 use DESKTOP to set the default desktop; +# make sure other arches get a working config if [ "$ARCH" != i386 ] && [ "$ARCH" != amd64 ]; then if [ "$DESKTOP" = all ] || [ "$DESKTOP" = "$UNSPEC_DESKTOP_DEFAULT" ] ; then DESKTOP= diff --git a/tools/boot/jessie/x86-desktop.sh b/tools/boot/jessie/x86-desktop.sh index 8560d67..707c0f8 100644 --- a/tools/boot/jessie/x86-desktop.sh +++ b/tools/boot/jessie/x86-desktop.sh @@ -26,10 +26,6 @@ multiarch_workaround() { boot$N/isolinux/amdtxt.cfg || true sed -i "/^include menu.cfg/ a\include instsel.cfg" \ boot$N/isolinux/prompt.cfg - if [ -e boot$N/isolinux/desktop/prompt.cfg ]; then - sed -i "/^default install/ a\include instsel.cfg" \ - boot$N/isolinux/desktop/prompt.cfg - fi cat >boot$N/isolinux/instsel.cfg <<EOF default install-select label install-select @@ -38,26 +34,7 @@ label install-select EOF } -create_desktop_dir() { - local desktop=$1 title - - case $desktop in - kde) title=KDE ;; - xfce) title=Xfce ;; - lxde) title=LXDE ;; - gnome) title=Gnome ;; - esac - - cp -r boot$N/isolinux/desktop boot$N/isolinux/$desktop - sed -i "s:%desktop%:$desktop: - s:%dt-name%:$title:" boot$N/isolinux/$desktop/*.cfg -} - -modify_for_single_desktop() { - # Cleanup - rm -f boot$N/isolinux/dtmenu.cfg - rm -fr boot$N/isolinux/desktop - +set_default_desktop() { # Set default desktop, or remove if not applicable if [ "$DESKTOP" ]; then sed -i "s:%desktop%:$DESKTOP:g" boot$N/isolinux/*.cfg @@ -65,87 +42,3 @@ modify_for_single_desktop() { sed -i "s/desktop=%desktop% //" boot$N/isolinux/*.cfg fi } - -modify_for_light_desktop() { - local desktop - - for file in boot$N/isolinux/{,amd}{,ad}{txt,gtk}.cfg; do - if [ -e $file ]; then - mv $file boot$N/isolinux/desktop - fi - done - sed -i "s/desktop=%desktop% //" boot$N/isolinux/*.cfg - - for desktop in xfce lxde; do - create_desktop_dir $desktop - done - - # Cleanup - rm -r boot$N/isolinux/desktop - rm boot$N/isolinux/prompt.cfg boot$N/isolinux/dtmenu.cfg - - # Create new "top level" menu file - cat >boot$N/isolinux/menu.cfg <<EOF -menu hshift 13 -menu width 49 - -include stdmenu.cfg -menu title Desktop environment menu -menu begin lxde-desktop - include stdmenu.cfg - menu label ^LXDE - menu title LXDE desktop boot menu - text help - Select the 'Lightweight X11 Desktop Environment' for the Desktop task - endtext - label mainmenu-lxde - menu label ^Back.. - menu exit - include lxde/menu.cfg -menu end -menu begin xfce-desktop - include stdmenu.cfg - menu label ^Xfce - menu title Xfce desktop boot menu - text help - Select the 'Xfce lightweight desktop environment' for the Desktop task - endtext - label mainmenu-xfce - menu label ^Back.. - menu exit - include xfce/menu.cfg -menu end -menu begin rescue - include stdmenu.cfg - menu label ^System rescue - menu title System rescue boot menu - label mainmenu-rescue - menu label ^Back.. - menu exit - include rqtxt.cfg - include amdrqtxt.cfg - include rqgtk.cfg - include amdrqgtk.cfg -menu end -EOF -} - -modify_for_all_desktop() { - local desktop - - for file in boot$N/isolinux/{,amd}{,ad}{txt,gtk}.cfg; do - if [ -e $file ]; then - cp $file boot$N/isolinux/desktop - fi - done - sed -i "s/desktop=%desktop% //" boot$N/isolinux/*.cfg - - for desktop in kde xfce lxde gnome; do - if [ $desktop != $UNSPEC_DESKTOP_DEFAULT ] ; then - create_desktop_dir $desktop - fi - done - - # Cleanup - rm -r boot$N/isolinux/desktop -} -- 2.1.0Attachment: signature.asc
Description: Digital signature
--- End Message ---
--- Begin Message ---
- To: 762487-close@bugs.debian.org
- Subject: Bug#762487: fixed in debian-cd 3.1.16
- From: Steve McIntyre <93sam@debian.org>
- Date: Wed, 29 Oct 2014 17:48:40 +0000
- Message-id: <E1XjXMO-0004gd-Vx@franck.debian.org>
Source: debian-cd Source-Version: 3.1.16 We believe that the bug you reported is fixed in the latest version of debian-cd, which is due to be installed in the Debian FTP archive. A summary of the changes between this version and the previous one is attached. Thank you for reporting the bug, which will now be closed. If you have further comments please address them to 762487@bugs.debian.org, and the maintainer will reopen the bug report if appropriate. Debian distribution maintenance software pp. Steve McIntyre <93sam@debian.org> (supplier of updated debian-cd package) (This message was generated automatically at their request; if you believe that there is a problem with it please contact the archive administrators by mailing ftpmaster@ftp-master.debian.org) -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Format: 1.8 Date: Wed, 29 Oct 2014 17:33:10 +0000 Source: debian-cd Binary: debian-cd Architecture: source all Version: 3.1.16 Distribution: unstable Urgency: medium Maintainer: Debian CD Group <debian-cd@lists.debian.org> Changed-By: Steve McIntyre <93sam@debian.org> Description: debian-cd - Tools for building (Official) Debian CD set Closes: 751814 756774 758512 759343 762487 762613 766411 767223 Changes: debian-cd (3.1.16) unstable; urgency=medium . [ Steve McIntyre ] * Fix changelog date for 3.1.15. Closes: #751814 * Fix up Gnome CD set installing xfce - logic in boot menu creation was broken. Closes: #756774 * Update kernel flavours for armhf to just use armmp and armmp-lpae * Update arch lists to match what's in Jessie: remove sparc and ia64, add arm64. * Add Debian-mate and Debian-cinnamon top-level tasks for new CD desktop options * Extend FORCE_SID_TASKSEL usage in update_tasks to also affect desktop choice algorithm * Add experimental support for arm64 booting via UEFI * Use new tasksel interface to determine default desktop. Closes: #762613 * Do not look for isolinux/desktop/*cfg files for appending kernel params for Jessie. Closes: #767223, #766411. Thanks to Prema and Vagrant for (identical!) patches. :-) . [ Philipp Hahn ] * Fix word-splitting regexp in generate_di_list. Closes: #758512. * Improve correctstatus speed. Closes: #759343 . [ Joey Hess ] * adapt desktop handling for tasksel/d-i changes. Closes: #762487 . [ Aurelien Jarno ] * Add initial support for ppc64el . [ Ian Campbell ] * Force MKISOFO=xorriso for arm64 too * The d-i supplied grub.cfg has the correct entries in it already Checksums-Sha1: ed499d5442947c63472e4bf7fb634de22f69f825 1711 debian-cd_3.1.16.dsc 73f49aceeddbcc928922047ab68eae337e53c78e 685208 debian-cd_3.1.16.tar.xz 048d9115bfe7f9470b88989c4d25ccb0b398aa42 705604 debian-cd_3.1.16_all.deb Checksums-Sha256: a7eddeafd635d35f11cfe35dfeabe2efc54f00c80fa2cf71fb501948b218eb25 1711 debian-cd_3.1.16.dsc f50e5cbc898d631a8e54d3ca5c0be4508284b23d7544c72728325cdc5358861f 685208 debian-cd_3.1.16.tar.xz 4597c9b6be04ad638b375f25828a610990601c9c2e0d42dad50854b02d16a0b2 705604 debian-cd_3.1.16_all.deb Files: 6749823c47c1171b0cc11bd214762a30 1711 admin extra debian-cd_3.1.16.dsc 8b4fb3c1535a951334a3b1dcdfffc207 685208 admin extra debian-cd_3.1.16.tar.xz fc16f53c5a58e49d2e8ef1b5005d501f 705604 admin extra debian-cd_3.1.16_all.deb -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQIcBAEBCAAGBQJUUSZJAAoJEFh5eVc0QmhOXBwP+QHhlu3OdEqlbRMWoyKALCDa KNOucJgx81UJ/m+nCF6AtrYHmt2Ys1dBHuTaLJEAl892966SIaSYRKcn913eVksr kdnk4xSADnlJmBDEfjDh+CkFkoGoBIemJqyr203h8kfuAcxnqKNbvsguwEQLer3h pyveMz9XOsmXpWE5jOq37UoE8ew68O6engnxhtZMOpT1dckBmK50253lCrVtRI0v ZfGPpXsTZ8z58LOPcFDtRtzteFnwqbS7iv0XWL2GAX/tslNkP9HZ1mueLYHsC7L/ F4g4bCuEL4bBCWFWTq7zsx2zMqU6zfIdBhEZmMiXCX2v1EFzoC4ek0nxduf0CW0m L+G7+XpBYphgMqRGd7Rxt+ixChVnI+0mRWjT/b37XygrB4PV3c6QMEPic5bK/1u7 dSH1UOOk9zLPxBNBdeu01Z49hOLpt89rcV00ZzTLU/6UogLD93ZMz3oYfCUvQBB9 nHou0OTfTtDwQn+mf6K4sJhGqDY+DoHICOjJgkSjz/Ua4l8dupaBZqRe6DlWD401 702nGNVJ94i0YprazuAMjzvV3aDROYsP+xIc10cjGDGZ4TuERs7y4u/jS4PANmE7 qjMay04A5odO30bzj7yuQCABCWYzXMjG+E3KWpw6vtryNUrXsyWrMWeBKku2oqhw ou3IFdg99Nxvce0lUrjo =Kmqd -----END PGP SIGNATURE-----
--- End Message ---