debian/debian-edu-config.postinst

@@ -121,7 +121,8 @@ configure)
             if [ -f /etc/ldap/slapd-debian-edu.conf ] ; then
                 ln -s /etc/ldap/slapd-debian-edu.conf /etc/ldap/slapd.conf
             fi
-            if [ -f /usr/share/debian-edu-config/tools/create-debian-edu-certs ] ; then
+            if [ -f /usr/share/debian-edu-config/tools/create-debian-edu-certs ] && \
+                ! running_from_di ; then
                 /usr/share/debian-edu-config/tools/create-debian-edu-certs --force-overwrite
             fi
         else

share/debian-edu-config/tools/improve-desktop-l10n

@@ -14,7 +14,8 @@ for lang in $(echo $langsfull) ; do
         if ! [ -z "$(apt-cache search $i-$baselang-$langcountry)" ]; then
             apt-get -yq install $i-$baselang-$langcountry
         else
-            if ! [ -z "$(apt-cache search $i-$baselang)" ]; then
+            if ! [ -z "$(apt-cache search $i-$baselang)" ] && \
+                ! [ "thunderbird-l10n-en" = "$i-$baselang" ] ; then
                 apt-get -y install $i-$baselang
         fi
         fi

share/debian-edu-config/tools/install-task-pkgs

@@ -210,4 +210,3 @@ for d in gnome kde mate lxde lxqt xfce ; do
 	    apt-get -yq install task-$d-desktop
 	fi
 done
-apt-get -yq install task-desktop