From patchwork Mon Jun 8 15:23:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael T Farnworth X-Patchwork-Id: 1305211 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) 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=turf.org Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20170209 header.b=QgJZB04e; 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 49gcV62szhz9sRR for ; Tue, 9 Jun 2020 01:23:57 +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-Type: Content-Transfer-Encoding:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:Subject:MIME-Version:Date:Message-ID:From:To: 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=u6jsqiBWyqhOhFhaMtyDvP3qhinw1MygHIK9PMLS96g=; b=QgJZB04eDvGsPBRXb/hbQZ/6cw HDRlGuUc501Z5k/nw98xK2GkLrEMCQxi29S1qKljvn8y3KZjNkxRq08R+IwX5OeQMZLgLf0qE/oP6 SxR14KluOliAk7LJNOsLoAqodU6WXt41zNNCwRrBr3uCRDx4HuU+m65HxUQz4HkpwpR7zzuyaKYfO I7hM0Ey1PurYKmKKQffxqviPoMS24QhhM12WNjw/RVuxyYVUxWTm3k3U1vbICKMxgUJsGZ+ktzo8d naJ6JzHFSU9s/zibo6FKFOpXcZyUZuvB9KVdTO7aL2Iyo/rKG29aafB5dWEi05+VaAXoQ/ycpBdmc dASkHlnA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jiJcv-0002b4-W1; Mon, 08 Jun 2020 15:23:53 +0000 Received: from email6.maximasystems.com ([109.70.45.196]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jiJcs-0002a1-Fj for openwrt-devel@lists.openwrt.org; Mon, 08 Jun 2020 15:23:52 +0000 Received: from Michaels-MBP.lan ([109.70.45.213]) (authenticated bits=0) by email6.maximasystems.com (8.14.4/8.14.4) with ESMTP id 058FNej3010993 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO); Mon, 8 Jun 2020 16:23:40 +0100 To: openwrt-devel@lists.openwrt.org From: Michael T Farnworth Message-ID: Date: Mon, 8 Jun 2020 16:23:40 +0100 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:68.0) Gecko/20100101 Thunderbird/68.9.0 MIME-Version: 1.0 Content-Language: en-GB X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED autolearn=ham autolearn_force=no version=3.4.1 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on email6.maximasystems.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200608_082350_801543_B1DBCFE1 X-CRM114-Status: GOOD ( 10.03 ) X-Spam-Score: 0.0 (/) X-Spam-Report: SpamAssassin version 3.4.4 on bombadil.infradead.org summary: Content analysis details: (0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record Subject: [OpenWrt-Devel] [PATCH] hostapd: wpad init script renamed 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: Michael T Farnworth Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org When hostapd is launched as /etc/init.d/wpad it appears in a different location under "ubus call service list" presenting problems with scripts /lib/netifd/hostapd.sh and /lib/netifd/wireless/mac80211.sh Either these scripts need to be patched to recognise the move, or the init.d script needs to be renamed to hostapd. This patch renames the init.d script as unidentified things may also depend upon the placement of entries within ubus output. This ubus change only came about on the 8 April 2020 and it is unlikely that very much code has been written or re-written to support the renaming. Problem is manifested in log files as "/usr/sbin/wpad does not match process path (/proc/exe)" Signed-off-by: Michael T Farnworth diff --git a/package/network/services/hostapd/Makefile b/package/network/services/hostapd/Makefile index 66560d5d41..b8b7c2b315 100644 --- a/package/network/services/hostapd/Makefile +++ b/package/network/services/hostapd/Makefile @@ -533,7 +533,7 @@ endef define Package/hostapd-common/install $(INSTALL_DIR) $(1)/lib/netifd $(1)/etc/rc.button $(1)/etc/hotplug.d/ieee80211 $(1)/etc/init.d $(INSTALL_DATA) ./files/hostapd.sh $(1)/lib/netifd/hostapd.sh - $(INSTALL_BIN) ./files/wpad.init $(1)/etc/init.d/wpad + $(INSTALL_BIN) ./files/hostapd.init $(1)/etc/init.d/hostapd $(INSTALL_BIN) ./files/wps-hotplug.sh $(1)/etc/rc.button/wps endef diff --git a/package/network/services/hostapd/files/wpad.init b/package/network/services/hostapd/files/hostapd.init similarity index 97% rename from package/network/services/hostapd/files/wpad.init rename to package/network/services/hostapd/files/hostapd.init index 3198e9801f..b9494b6bf5 100644 --- a/package/network/services/hostapd/files/wpad.init +++ b/package/network/services/hostapd/files/hostapd.init @@ -4,7 +4,7 @@ START=19 STOP=21 USE_PROCD=1 -NAME=wpad +NAME=hostapd start_service() { if [ -x "/usr/sbin/hostapd" ]; then