cups: Remove 5 minutes delay in start_service line in install.sh paks file

Message ID 20230704191733.1290026-1-adolf.belka@ipfire.org
State Staged
Commit a87bea7d39d83a66f90bf626a376c754bc725261
Headers
Series cups: Remove 5 minutes delay in start_service line in install.sh paks file |

Commit Message

Adolf Belka July 4, 2023, 7:17 p.m. UTC
  - When cups is installed (including when doing a Core Update that includes a cups update)
   the 5 min delay for starting cups means that it has not restarted by the time that the
   reboot for the CU has been started. There are then error messages that say that cups
   couldn't be stopped as it was not running.
- When a normal reboot is carried out withoutr any update of cups then the startup has
   no delay and it starts without any trouble.
- This patch removes the 300 secs delay from the start_service line in the install.sh paks
   file.
- The PAK_VER is bumped to ensure that this change is shipped

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
---
 lfs/cups                 | 2 +-
 src/paks/cups/install.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
  

Comments

Peter Müller July 9, 2023, 3:01 p.m. UTC | #1
Reviewed-by: Peter Müller <peter.mueller@ipfire.org>

> - When cups is installed (including when doing a Core Update that includes a cups update)
>    the 5 min delay for starting cups means that it has not restarted by the time that the
>    reboot for the CU has been started. There are then error messages that say that cups
>    couldn't be stopped as it was not running.
> - When a normal reboot is carried out withoutr any update of cups then the startup has
>    no delay and it starts without any trouble.
> - This patch removes the 300 secs delay from the start_service line in the install.sh paks
>    file.
> - The PAK_VER is bumped to ensure that this change is shipped
> 
> Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
> ---
>  lfs/cups                 | 2 +-
>  src/paks/cups/install.sh | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/lfs/cups b/lfs/cups
> index 70839736f..cae829432 100644
> --- a/lfs/cups
> +++ b/lfs/cups
> @@ -33,7 +33,7 @@ DL_FROM    = $(URL_IPFIRE)
>  DIR_APP    = $(DIR_SRC)/cups-$(VER)
>  TARGET     = $(DIR_INFO)/$(THISAPP)
>  PROG       = cups
> -PAK_VER    = 36
> +PAK_VER    = 37
>  
>  DEPS       = avahi cups-filters dbus ghostscript libexif
>  
> diff --git a/src/paks/cups/install.sh b/src/paks/cups/install.sh
> index cc5866971..f1d45b697 100644
> --- a/src/paks/cups/install.sh
> +++ b/src/paks/cups/install.sh
> @@ -25,7 +25,7 @@
>  extract_files
>  restore_backup "${NAME}"
>  /etc/init.d/messagebus reload
> -start_service --delay 300 --background ${NAME}
> +start_service --background ${NAME}
>  ln -svf ../init.d/cups /etc/rc.d/rc0.d/K00cups
>  ln -svf ../init.d/cups /etc/rc.d/rc3.d/S25cups
>  ln -svf ../init.d/cups /etc/rc.d/rc6.d/K00cups
  

Patch

diff --git a/lfs/cups b/lfs/cups
index 70839736f..cae829432 100644
--- a/lfs/cups
+++ b/lfs/cups
@@ -33,7 +33,7 @@  DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/cups-$(VER)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = cups
-PAK_VER    = 36
+PAK_VER    = 37
 
 DEPS       = avahi cups-filters dbus ghostscript libexif
 
diff --git a/src/paks/cups/install.sh b/src/paks/cups/install.sh
index cc5866971..f1d45b697 100644
--- a/src/paks/cups/install.sh
+++ b/src/paks/cups/install.sh
@@ -25,7 +25,7 @@ 
 extract_files
 restore_backup "${NAME}"
 /etc/init.d/messagebus reload
-start_service --delay 300 --background ${NAME}
+start_service --background ${NAME}
 ln -svf ../init.d/cups /etc/rc.d/rc0.d/K00cups
 ln -svf ../init.d/cups /etc/rc.d/rc3.d/S25cups
 ln -svf ../init.d/cups /etc/rc.d/rc6.d/K00cups