[debian-edu-commits] debian-edu/ 01/01: tools/install-missing-taskpkgs: remove check for desktop-task, improve comments.

[Wolfgang Schweer]

This is an automated email from the git hooks/post-receive script.

schweer-guest pushed a commit to branch upgrade-tmp
in repository debian-edu-config.

commit d4ae2ddb64a9eb8a76a733dc599d0d6e8d874172
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Wed Mar 18 16:56:59 2015 +0100

    tools/install-missing-taskpkgs: remove check for desktop-task, improve comments.
---
 .../tools/install-missing-taskpkgs                 | 46 ++++++++++++----------
 1 file changed, 25 insertions(+), 21 deletions(-)

diff --git a/share/debian-edu-config/tools/install-missing-taskpkgs b/share/debian-edu-config/tools/install-missing-taskpkgs
index f2cc1e2..ee44864 100755
--- a/share/debian-edu-config/tools/install-missing-taskpkgs
+++ b/share/debian-edu-config/tools/install-missing-taskpkgs
@@ -41,17 +41,6 @@ if test -r /etc/debian-edu/config ; then
     . /etc/debian-edu/config
 fi
 
-# Check if the desktop type selection worked
-check_desktop_task() {
-    desktop=$(debconf-show tasksel |tr -d "*" |awk '/tasksel\/desktop/ {print $2}')
-    pkg="education-desktop-$desktop"
-    if deb_installed "$pkg" ; then
-	echo "$0: Desktop package $pkg is installed."
-    else
-	echo "error: $0: Desktop package $pkg is not installed."
-    fi
-}
-
 retval=0
 
 apt-get update
@@ -63,19 +52,15 @@ for value in `echo $PROFILE |sed 's/ /-/g' | sed 's/,-/ /g'`; do
     case $value in
 	Standalone)
 	    check_installed_task education-standalone
-	    check_desktop_task
 	    ;;
 	Workstation)
 	    check_installed_task education-workstation
-	    check_desktop_task
 	    ;;
 	Roaming-Workstation)
 	    check_installed_task education-roaming-workstation
-	    check_desktop_task
 	    ;;
 	Thin-Client-Server|LTSP-server)
 	    check_installed_task education-thin-client-server
-	    check_desktop_task
 	    ;;
 	Main-Server|Server)
 	    check_installed_task education-main-server
@@ -93,16 +78,35 @@ for value in `echo $PROFILE |sed 's/ /-/g' | sed 's/,-/ /g'`; do
 done
 
 # FIXME: Check if this list is still valid for stretch.
-# Some packages are unwanted for the LTSP chroot (list from 032-edu-pkgs),
+# Some packages are unwanted for the LTSP chroot
 # so remove them. Remove as well automatically installed packages.
-unwanted="cups cups-browsed readahead readahead-fedora hdparm hddtemp lvm2 \
-munin-node xfs resolvconf network-manager wpasupplicant openvpn ppp \
-modemmanager consolekit cups network-manager-openvpn network-manager-pptp \
-network-manager-vpnc popularity-contest system-config-lvm"
+# (The list of packages has been gathered from
+# share/ltsp/plugins/ltsp-build-client/Debian-custom/032-edu-pkgs.)
+unwanted_in_ltsp_chroot="cups \
+cups-browsed \
+readahead \
+readahead-fedora \
+hdparm \
+hddtemp \
+lvm2 \
+munin-node \
+xfs \
+resolvconf \
+network-manager \
+wpasupplicant \
+openvpn \
+ppp \
+modemmanager \
+consolekit \
+network-manager-openvpn \
+network-manager-pptp \
+network-manager-vpnc \
+popularity-contest \
+system-config-lvm"
 
 # Remove only if called inside LTSP chroot
 if [ -f /etc/lts.conf ] ; then
-     for i in $(echo $unwanted); do
+     for i in $unwanted_in_ltsp_chroot; do
           apt-get --auto-remove -y purge $i
      done
 fi

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-config.git