[debian-edu-commits] [Git][debian-edu/debian-edu-config][master] Add workaround for CUPS bug #977198

[Wolfgang Schweer]

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


Commits:
665390a6 by Wolfgang Schweer at 2020-12-12T14:16:31+01:00
Add workaround for CUPS bug #977198

Add override file share/debian-edu-config/cups.service.

Adjust cf3/cf.workarounds to activate the override file.

This makes sure that the cups service starts after the nslcd one (needed
because the Debian Edu cups-files.conf refers to an LDAP group).

Signed-off-by: Wolfgang Schweer <wschweer at arcor.de>

- - - - -


3 changed files:

- cf3/cf.workarounds
- debian/changelog
- + share/debian-edu-config/cups.service


Changes:

=====================================
cf3/cf.workarounds
=====================================
@@ -1,4 +1,19 @@
 bundle agent workarounds
 {
+# Add cups service override file, drop once cups bug 977198 has been fixed.
 
+vars:
+
+  "cups_file" string => "/usr/lib/systemd/cups.service.conf.d/.";
+
+files:
+
+  debian.server.installation::
+
+    "$(cups_file)"
+      create => "true";
+
+    "/usr/lib/systemd/cups.service.conf.d/override.conf"
+      copy_from => local_cp("/usr/share/debian-edu-config/cups.service"),
+      perms => mog("644","root","root");
 }


=====================================
debian/changelog
=====================================
@@ -13,6 +13,11 @@ debian-edu-config (2.11.39) UNRELEASED; urgency=medium
       Debian Installer.
   * share/man/man8/debian-edu-ltsp-install: Correct image type description.
   * sbin/debian-edu-pxeinstall: use the now available homeworld theme.
+  * Workaround for CUPS bug (#977198, cups service fails randomly after reboot):
+    - Add override file share/debian-edu-config/cups.service.
+    - Adjust cf3/cf.workarounds to activate the override file.
+    This makes sure that the cups service starts after the nslcd one (needed
+    because the Debian Edu cups-files.conf refers to an LDAP group).
 
  -- Wolfgang Schweer <wschweer at arcor.de>  Thu, 10 Dec 2020 09:36:49 +0100
 


=====================================
share/debian-edu-config/cups.service
=====================================
@@ -0,0 +1,14 @@
+[Unit]
+Description=CUPS Scheduler
+Documentation=man:cupsd(8)
+After=networ.target sssd.service ypbind.service nslcd.service
+Requires=cups.socket
+
+[Service]
+ExecStart=/usr/sbin/cupsd -l
+Type=notify
+Restart=on-failure
+
+[Install]
+Also=cups.socket cups.path
+WantedBy=printer.target



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/commit/665390a69a5e641a83da7225e6b5f62617320ce9

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/commit/665390a69a5e641a83da7225e6b5f62617320ce9
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/20201212/3c24aab2/attachment-0001.html>