From patchwork Tue Jul 4 19:17:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 6968 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4QwXcX0glDz3wjw for ; Tue, 4 Jul 2023 19:17:48 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4QwXcW0PQ7zc7; Tue, 4 Jul 2023 19:17:47 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4QwXcV6S1mz2yWP; Tue, 4 Jul 2023 19:17:46 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4QwXcT70S5z2xPL for ; Tue, 4 Jul 2023 19:17:45 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4QwXcS4H3Bzc7; Tue, 4 Jul 2023 19:17:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1688498264; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=fB+jhme/SCOvNQZSvzTwYe+z3D2WkxVh0x6IFNqq4s8=; b=fD9zLb4n7ITEAE48dy2RQ5tA8bMLHmCjAq//U7+t4i3/vT+ARQc5G6KAz1SFriatzkyoGl /jLQrSCFFkb+G+bz0Bdt42ellax0ZY5MBqHXEb0WX5EX/oCFW05ssl5KxUASIJ7mqGGp1T i9Q9AiheMH2s4Ihwbne0AnjtwbRePMJ8GjKK7BEd0fXWyavqibS4QDlc/OhkvherjYjLTM /iSy0UkqubLV7SJobWsGqZMjvO18O+ESPEQOFDRqeczkKOusP0FMpM3ysCIyMnTSfPHz03 4dPhTWKLGFqlOt7rtj8JIA3nAEDvRrLZc+H3Wbtth8dL/ar7WqxYvr+Y9CSAAw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1688498264; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=fB+jhme/SCOvNQZSvzTwYe+z3D2WkxVh0x6IFNqq4s8=; b=RaFGXpNXiUE17bzFvd2FkHI7MqFA+B5wAQunFhBkFrud20v7+1l/pgpkbjNdmDe6pFxyef +5tnzjP9+EVgJ+Dw== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH] cups: Remove 5 minutes delay in start_service line in install.sh paks file Date: Tue, 4 Jul 2023 21:17:33 +0200 Message-ID: <20230704191733.1290026-1-adolf.belka@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" - 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 Reviewed-by: Peter Müller --- 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