On Thu, Jul 07, 2016 at 11:11:52AM +0200, Wolfgang Schweer wrote:
> On Wed, Jul 06, 2016 at 04:20:32PM +0000, Holger Levsen wrote:
> > On Wed, Jul 06, 2016 at 05:22:07PM +0200, Wolfgang Schweer wrote:
> > > IIRC as additional debian-edu-config change the firefox-esr
> > > related commit 03bc8f34 from master is needed.
> >
> > thanks, picked and changelog ammended.
>
> I suppose that d-e-c preinst needs some code to cope with renamed /
> obsolete files / symlinks. Also, the case that someone had already
> applied the firefox migration script (mentioned on the status page)
> has to be considered.
Not quite sure, but these changes to d-e-c postinst and preinst seem to
handle all cases. Please test:
diff --git a/debian/debian-edu-config.postinst b/debian/debian-edu-config.postinst
index a0b192f..b4bc494 100644
--- a/debian/debian-edu-config.postinst
+++ b/debian/debian-edu-config.postinst
@@ -236,6 +236,17 @@ configure)
rm_conffile debian-edu-config /etc/powerdns/pdns.d/pdns-debian-edu.conf
fi
+ if dpkg --compare-versions "$2" le "1.818+deb8u1" && [ -e /etc/firefox-esr ] ; then
+ # for networked profiles only.
+ if egrep Standalone /etc/debian-edu/config; then
+ :
+ else
+ if ! [ -e /etc/firefox-esr/debian-edu-networked.js ] ; then
+ ln -s /usr/share/debian-edu-config/firefox-networked-prefs.js /etc/firefox-esr/debian-edu-networked.js
+ fi
+ fi
+ fi
+
# sssd refuses to read the file if it has any other mode
chmod 600 /etc/sssd/sssd-debian-edu.conf
chown root:root /etc/sssd/sssd-debian-edu.conf
diff --git a/debian/debian-edu-config.preinst b/debian/debian-edu-config.preinst
index d78ed68..2e34148 100644
--- a/debian/debian-edu-config.preinst
+++ b/debian/debian-edu-config.preinst
@@ -49,6 +49,32 @@ upgrade)
rm_conffile debian-edu-config /etc/init.d/open-backdoor
fi
+ if dpkg --compare-versions "$2" le "1.818+deb8u1" && [ -e /etc/firefox-esr ] ; then
+ if [ -e /etc/X11/Xsession.d/06debian-edu-iceweasel-ltsp ] ; then
+ rm /etc/X11/Xsession.d/06debian-edu-iceweasel-ltsp
+ fi
+ if [ -e /etc/apt/apt.conf.d/99-edu-prefer-iceweasel ] ; then
+ rm /etc/apt/apt.conf.d/99-edu-prefer-iceweasel
+ fi
+ if [ -e /etc/init.d/iceweasel-ldapconf ] ; then
+ rm /etc/init.d/iceweasel-ldapconf
+ fi
+ if [ -e /etc/cfengine/debian-edu/cf.iceweasel ] ; then
+ rm /etc/cfengine/debian-edu/cf.iceweasel
+ fi
+ if [ -e /usr/share/debian-edu-config/iceweacel-networked-prefs.js ] ; then
+ rm /usr/share/debian-edu-config/iceweacel-networked-prefs.js
+ fi
+ if [ -L /etc/iceweasel/pref/debian-edu-networked.js ] ; then
+ rm /etc/iceweasel/pref/debian-edu-networked.js
+ fi
+ if [ -e /etc/iceweasel/pref/debian-edu-homepage-ldap.js ] ; then
+ rm /etc/iceweasel/pref/debian-edu-homepage-ldap.js
+ fi
+ if [ -L /etc/firefox-esr/debian-edu-networked.js ] ; then
+ rm /etc/firefox-esr/debian-edu-networked.js
+ fi
+ fi
;;
esac
Wolfgang
Attachment:
signature.asc
Description: Digital signature