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