[debian-edu-commits] [Git][debian-edu/debian-edu-config][master] 2 commits: Revert "Adjust cf3/cf.workarounds. (Closes: #930122)"

[WolfgangSchweer]

WolfgangSchweer pushed to branch master at Debian Edu / debian-edu-config


Commits:
317f2212 by Wolfgang Schweer at 2019-06-10T12:13:27Z
Revert "Adjust cf3/cf.workarounds. (Closes: #930122)"

This reverts commit f9576741ad774033575df68ce0a9c048d940245a.

The fix has been done with a minimal debdiff in mind, but is ugly.
The issue will be dealt with more correctly.

- - - - -
a9b2d849 by Wolfgang Schweer at 2019-06-10T12:29:08Z
Set environment variable to deal with Firefox profile. (Closes: #930122)

This is a workaround for bug #930125, preventing firefox-esr startup issues
if the mozilla profile is on an NFS share).

Ship share/debian-edu-config/edu-firefox-nfs with NSS_SDB_USE_CACHE="yes"
as content. Thanks to Mike Gabriel for spotting the issue and providing
this information.

Add instructions to cf3/cf.workarounds to link the 'edu-firefox-nfs' file
to appropriate files below '/etc/X11/Xsession.d' and '/etc/profile.d'.

- - - - -


4 changed files:

- Makefile
- cf3/cf.workarounds
- debian/changelog
- + share/debian-edu-config/edu-firefox-nfs


Changes:

=====================================
Makefile
=====================================
@@ -389,6 +389,7 @@ install: install-testsuite
 		share/debian-edu-config/55xfce4-session-debian-edu \
 		share/debian-edu-config/lightdm-gtk-greeter.conf \
 		share/debian-edu-config/sudo-ldap.conf \
+		share/debian-edu-config/edu-firefox-nfs \
 		share/pam-configs/edu-group \
 		share/pam-configs/edu-umask \
 		share/perl5/Debian/Edu.pm \


=====================================
cf3/cf.workarounds
=====================================
@@ -23,6 +23,16 @@ files:
       link_from => ln_s("/usr/share/debian-edu-config/squid.resolvconf"),
       move_obstructions => "true";
 
+  debian.workstation.installation::
+  # Fix black frame issue for mozilla profile on NFS share (workaround for #930125).
+  # FIXME: check if this is still needed with firefox-esr 68.x
+    "/etc/X11/Xsession.d/99edu-firefox-nfs"
+      link_from => ln_s("/usr/share/debian-edu-config/edu-firefox-nfs"),
+      move_obstructions => "true";
+    "/etc/profile.d/edu-firefox-nfs.sh"
+      link_from => ln_s("/usr/share/debian-edu-config/edu-firefox-nfs"),
+      move_obstructions => "true";
+
 commands:
 
   debian.xfce.(ltspclient|ltspserver).installation::
@@ -30,17 +40,5 @@ commands:
   # but not in Buster). FIXME: Check if this is still needed for Bullseye.
     "/usr/bin/apt-get install -y xscreensaver"
       contain => in_shell;
-
-  debian.workstation.installation::
-  # Fix black frame issue for mozilla profile on NFS share (workaround for #930125).
-  # FIXME: check if this is still needed with firefox-esr 68.x
-    "/usr/bin/echo 'export NSS_SDB_USE_CACHE=\"yes\"' > /etc/X11/Xsession.d/99edu-firefox-nfs"
-      contain => in_shell;
-    "/usr/bin/chmod 644 /etc/X11/Xsession.d/99edu-firefox-nfs"
-      contain => in_shell;
-    "/usr/bin/echo 'export NSS_SDB_USE_CACHE=\"yes\"' > /etc/profile.d/edu-firefox.sh"
-      contain => in_shell;
-    "/usr/bin/chmod 644 /etc/profile.d/edu-firefox.sh"
-      contain => in_shell;
 }
 


=====================================
debian/changelog
=====================================
@@ -12,11 +12,14 @@ debian-edu-config (2.10.66) UNRELEASED; urgency=medium
       Buster development cycle to ease setups with ProxyDHCP.)
   * Adjust share/debian-edu-config/sudo-ldap.conf. (Closes: #929964)
     - Fix sudo-ldap configuration. (The LDAP URI is needed on LDAP clients.)
-  * Adjust cf3/cf.workarounds. (Closes: #930122)
-    - Add workaround for bug #930125 to prevent firefox-esr startup issues if
-      the mozilla profile is on an NFS share. This is done by setting a new
-      NSS_SDB_USE_CACHE environment variable to 'yes'. Thanks to Mike Gabriel
-      for spotting the issue and providing the related information.
+  * Set environment variable to deal with Firefox profile. (Closes: #930122)
+    This is a workaround for bug #930125, preventing firefox-esr startup issues
+    if the mozilla profile is on an NFS share).
+    - Ship share/debian-edu-config/edu-firefox-nfs with NSS_SDB_USE_CACHE="yes"
+      as content. Thanks to Mike Gabriel for spotting the issue and providing
+      this information.
+    - Add instructions to cf3/cf.workarounds to link the 'edu-firefox-nfs' file
+      to appropriate files below '/etc/X11/Xsession.d' and '/etc/profile.d'.
 
  -- Petter Reinholdtsen <pere at debian.org>  Sat, 20 Apr 2019 07:53:26 +0200
 


=====================================
share/debian-edu-config/edu-firefox-nfs
=====================================
@@ -0,0 +1 @@
+export NSS_SDB_USE_CACHE="yes"



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/compare/f9576741ad774033575df68ce0a9c048d940245a...a9b2d849c61357bd179d79dd4bcc2bf956763e2c

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/compare/f9576741ad774033575df68ce0a9c048d940245a...a9b2d849c61357bd179d79dd4bcc2bf956763e2c
You're receiving this email because of your account on salsa.debian.org.

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-edu-commits/attachments/20190610/4c9c71c5/attachment-0001.html>