From patchwork Tue Jul 23 13:37:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Petr_=C5=A0tetiar?= X-Patchwork-Id: 1135680 X-Patchwork-Delegate: ynezz@true.cz Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=true.cz Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="TgUHWtme"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45tKKk18PDz9sBF for ; Tue, 23 Jul 2019 23:37:46 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Subject:MIME-Version:Message-Id:Date:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=urvGu19Pz6Dd91zLljBQ3COFfmbVCnQl2Ej2uWeoD0A=; b=TgUHWtmeAuYFq7 oPHHgptXBBxzGeqvDJRBAwG9E6JdRTFbSciDnVYvkr8sqhkZCQ8+SBxbIEWHOIBmdSfJZ2xDRIFjC Q5MymDblL91gOjwq7V8rN4/Pv85go94AEV6SmL0jXjhSKhoM0TA9HUbVXLens8mj3o902D19fxr2c dN+iVF0vuWzC3YWhO46TAZWzGb5H0QR/zxEtLcgGtILCA+yAnqE49/7kkxSqxXnb5IpfB+qjRVA6q 9ZzxGdP9sCRDzMN9KR44IgYbDLbaeq1+53kVMpkpKG+2Iu/ccKyaJNglNYWy3aZZgFBDkvuajX9Qo RmTB+USB54aDTTCLzEvg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hpuyv-0004YK-0Y; Tue, 23 Jul 2019 13:37:29 +0000 Received: from smtp-out.xnet.cz ([178.217.244.18]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hpuyr-0004X4-Fj for openwrt-devel@lists.openwrt.org; Tue, 23 Jul 2019 13:37:27 +0000 Received: from meh.true.cz (meh.true.cz [108.61.167.218]) (Authenticated sender: petr@true.cz) by smtp-out.xnet.cz (Postfix) with ESMTPSA id 6197043B0; Tue, 23 Jul 2019 15:37:22 +0200 (CEST) Received: by meh.true.cz (OpenSMTPD) with ESMTP id 812628b2; Tue, 23 Jul 2019 15:37:14 +0200 (CEST) From: =?utf-8?q?Petr_=C5=A0tetiar?= To: openwrt-devel@lists.openwrt.org Date: Tue, 23 Jul 2019 15:37:16 +0200 Message-Id: <20190723133717.20010-1-ynezz@true.cz> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190723_063725_822865_726EFD24 X-CRM114-Status: UNSURE ( 6.81 ) X-CRM114-Notice: Please train this message. X-Spam-Score: 0.0 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [178.217.244.18 listed in list.dnswl.org] 0.0 SPF_NONE SPF: sender does not publish an SPF Record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record Subject: [OpenWrt-Devel] [PATCH 1/2] base-files: make USE_PROCD=1 default X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Petr_=C5=A0tetiar?= Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org Transition period for init script migration was long enough, let's make USE_PROCD=1 default now so there's enough time to convert the remaining services/init scripts for the next release. Signed-off-by: Petr Štetiar Acked-by: Stijn Tintel Acked-by: Hauke Mehrtens --- package/base-files/files/etc/rc.common | 113 ++++++++++--------------- 1 file changed, 47 insertions(+), 66 deletions(-) diff --git a/package/base-files/files/etc/rc.common b/package/base-files/files/etc/rc.common index 4fdf7485096c..b8dbe123ca18 100755 --- a/package/base-files/files/etc/rc.common +++ b/package/base-files/files/etc/rc.common @@ -1,25 +1,15 @@ #!/bin/sh # Copyright (C) 2006-2012 OpenWrt.org +initscript=$1 + . $IPKG_INSTROOT/lib/functions.sh . $IPKG_INSTROOT/lib/functions/service.sh +. $IPKG_INSTROOT/lib/functions/procd.sh -initscript=$1 action=${2:-help} shift 2 -start() { - return 0 -} - -stop() { - return 0 -} - -reload() { - restart -} - restart() { trap '' TERM stop "$@" @@ -73,11 +63,10 @@ Available commands: reload Reload configuration files (or restart if service does not implement reload) enable Enable service autostart disable Disable service autostart -$EXTRA_HELP + running Check if service is running EOF } -# for procd start_service() { return 0 } @@ -104,57 +93,49 @@ ${INIT_TRACE:+set -x} . "$initscript" -[ -n "$USE_PROCD" ] && { - EXTRA_COMMANDS="${EXTRA_COMMANDS} running trace" - EXTRA_HELP="\ - running Check if service is running - " - - . $IPKG_INSTROOT/lib/functions/procd.sh - basescript=$(readlink "$initscript") - rc_procd() { - local method="set" - [ -n "$2" ] && method="add" - procd_open_service "$(basename ${basescript:-$initscript})" "$initscript" - "$@" - procd_close_service "$method" - } - - start() { - rc_procd start_service "$@" - if eval "type service_started" 2>/dev/null >/dev/null; then - service_started - fi - } - - trace() { - TRACE_SYSCALLS=1 - start "$@" - } - - stop() { +basescript=$(readlink "$initscript") +rc_procd() { + local method="set" + [ -n "$2" ] && method="add" + procd_open_service "$(basename ${basescript:-$initscript})" "$initscript" + "$@" + procd_close_service "$method" +} + +start() { + rc_procd start_service "$@" + if eval "type service_started" 2>/dev/null >/dev/null; then + service_started + fi +} + +trace() { + TRACE_SYSCALLS=1 + start "$@" +} + +stop() { + procd_lock + stop_service "$@" + procd_kill "$(basename ${basescript:-$initscript})" "$1" + if eval "type service_stopped" 2>/dev/null >/dev/null; then + service_stopped + fi +} + +reload() { + if eval "type reload_service" 2>/dev/null >/dev/null; then procd_lock - stop_service "$@" - procd_kill "$(basename ${basescript:-$initscript})" "$1" - if eval "type service_stopped" 2>/dev/null >/dev/null; then - service_stopped - fi - } - - reload() { - if eval "type reload_service" 2>/dev/null >/dev/null; then - procd_lock - reload_service "$@" - else - start - fi - } - - running() { - service_running "$@" - } -} - -ALL_COMMANDS="start stop reload restart boot shutdown enable disable enabled depends ${EXTRA_COMMANDS}" + reload_service "$@" + else + start + fi +} + +running() { + service_running "$@" +} + +ALL_COMMANDS="start stop reload restart boot shutdown enable disable enabled depends running trace" list_contains ALL_COMMANDS "$action" || action=help $action "$@"