From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 Received: from alyss.skarnet.org (alyss.skarnet.org [95.142.172.232]) by inbox.vuxu.org (Postfix) with SMTP id 59FD023860 for ; Sun, 9 Jun 2024 14:02:02 +0200 (CEST) Received: (qmail 24891 invoked by uid 89); 9 Jun 2024 12:02:28 -0000 Mailing-List: contact supervision-help@list.skarnet.org; run by ezmlm Sender: Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Received: (qmail 24884 invoked from network); 9 Jun 2024 12:02:27 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1717934517; bh=fQQUgc1P5v79Bzt2tAOAaxzHg5GQUrXX9aKNyTrTIgY=; h=Mime-Version:Content-Transfer-Encoding:Content-Type:Date: Message-Id:Subject:From:To:From; b=cqdwLyOQZTkW3mcJSNzMIqoM7taTaBKccdbNocTujtsSXq5DUl6N8I0dBuGRGoK/5 XWTqZHfq5R6qXH08AzS8v1H12WKMvVlxQxjZ5HXXreVB4EUsk7WnEYPETc+WieXT1p lbxqHpP/gk82yEpd+W5+oHXmWAK7qgKFp98FAHERyb1KOqWArg1Pdv8zFc022Pwgmt /odAOdcX/Ykt9XS+qQ+OhV9U+dlx/cfIeOwbK0LRlJlKmC9x+7HvtZ3uhvHRH6b1CC x5H/xf6s9SuKSsNMws6dfGFCHmBSaO0IVhOL3v2A4kB004ZQhMuAtFsxfN56Rn7TUD 9T94GEHa5s/Fw== Mime-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=UTF-8 Date: Sun, 09 Jun 2024 12:01:56 +0000 Message-Id: Subject: =?utf-8?q?[PATCH=C2=B7s6-linux-init]_Remove_error_message_when_rc.shutdow?= =?utf-8?q?n.final_script_is_not_found?= From: "Sertonix" To: Signed-off-by: Sertonix --- src/shutdown/s6-linux-init-shutdownd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/shutdown/s6-linux-init-shutdownd.c b/src/shutdown/s6-linux= -init-shutdownd.c index 5a17625..dc0503e 100644 --- a/src/shutdown/s6-linux-init-shutdownd.c +++ b/src/shutdown/s6-linux-init-shutdownd.c @@ -191,10 +191,10 @@ static inline void prepare_stage4 (char const *basedi= r, char what) EXECLINE_SHEBANGPREFIX "execlineb -P\n\n" EXECLINE_EXTBINPREFIX "foreground { " S6_LINUX_INIT_BINPREFIX "s6-linux-init-umountall }\n" - EXECLINE_EXTBINPREFIX "foreground { ") < 0 + EXECLINE_EXTBINPREFIX "foreground { tryexec {") < 0 || !string_quote(&satmp, basedir, strlen(basedir)) || buffer_put(&b, satmp.s + sabase, satmp.len - sabase) < 0 - || buffer_puts(&b, "/scripts/" STAGE4 " }\n" + || buffer_puts(&b, "/scripts/" STAGE4 " } }\n" S6_LINUX_INIT_BINPREFIX "s6-linux-init-hpr -f -") < 0 || buffer_put(&b, &what, 1) < 0 || buffer_putsflush(&b, "\n") < 0) --=20 2.45.2