2021-11-30 10:23:03 +00:00
|
|
|
diff -up cups-2.3.3op2/config-scripts/cups-defaults.m4.conf-timeoutstartsec cups-2.3.3op2/config-scripts/cups-defaults.m4
|
|
|
|
|
--- cups-2.3.3op2/config-scripts/cups-defaults.m4.conf-timeoutstartsec 2021-11-29 13:50:14.568976028 +0100
|
|
|
|
|
+++ cups-2.3.3op2/config-scripts/cups-defaults.m4 2021-11-29 13:51:02.785567762 +0100
|
|
|
|
|
@@ -482,3 +482,18 @@ AC_ARG_WITH([idle_exit_timeout], AS_HELP
|
|
|
|
|
])
|
|
|
|
|
|
|
|
|
|
AC_SUBST([EXIT_TIMEOUT])
|
2021-11-29 12:48:46 +00:00
|
|
|
+
|
|
|
|
|
+dnl set TimeoutStartSec for cups.service
|
|
|
|
|
+dnl - if used as --without-*, it sets TimeoutStartSec to infinity
|
|
|
|
|
+AC_ARG_WITH([systemd-timeoutstartsec],
|
|
|
|
|
+ AS_HELP_STRING([--with-systemd-timeoutstartsec],
|
|
|
|
|
+ [set TimeoutStartSec value in cups.service, default=default value in systemd]), [
|
|
|
|
|
+ AS_IF([ test "x$withval" = "xno" ], [
|
|
|
|
|
+ TIMEOUTSTARTSEC="TimeoutStartSec=infinity"
|
|
|
|
|
+ ], [
|
|
|
|
|
+ TIMEOUTSTARTSEC="TimeoutStartSec=$withval"
|
|
|
|
|
+ ])
|
|
|
|
|
+], [
|
|
|
|
|
+ TIMEOUTSTARTSEC=""
|
|
|
|
|
+])
|
|
|
|
|
+AC_SUBST([TIMEOUTSTARTSEC])
|
2021-11-30 10:23:03 +00:00
|
|
|
diff -up cups-2.3.3op2/scheduler/cups.service.in.conf-timeoutstartsec cups-2.3.3op2/scheduler/cups.service.in
|
|
|
|
|
--- cups-2.3.3op2/scheduler/cups.service.in.conf-timeoutstartsec 2021-11-29 13:50:14.551976172 +0100
|
|
|
|
|
+++ cups-2.3.3op2/scheduler/cups.service.in 2021-11-29 13:50:14.568976028 +0100
|
2021-11-29 12:48:46 +00:00
|
|
|
@@ -8,6 +8,7 @@ Requires=cups.socket
|
|
|
|
|
ExecStart=@sbindir@/cupsd -l
|
|
|
|
|
Type=notify
|
|
|
|
|
Restart=on-failure
|
|
|
|
|
+@TIMEOUTSTARTSEC@
|
|
|
|
|
|
|
|
|
|
[Install]
|
|
|
|
|
Also=cups.socket cups.path
|
