Message ID | 20221003152720.13140-1-robin.roevens@disroot.org |
---|---|
Headers |
Return-Path: <development-bounces@lists.ipfire.org> 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) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4Mh6BT2B6Cz3wg5 for <patchwork@web04.haj.ipfire.org>; Mon, 3 Oct 2022 16:44:49 +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) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4Mh6BR6qgBz1Ls; Mon, 3 Oct 2022 16:44:47 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4Mh6BR66qtz2yK4; Mon, 3 Oct 2022 16:44:47 +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) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4Mh6BQ2Bchz2xRw for <development@lists.ipfire.org>; Mon, 3 Oct 2022 16:44:46 +0000 (UTC) Received: from knopi.disroot.org (knopi.disroot.org [178.21.23.139]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPS id 4Mh6BQ1Gz1z1Pk for <development@lists.ipfire.org>; Mon, 3 Oct 2022 16:44:46 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 9C6524C701 for <development@lists.ipfire.org>; Mon, 3 Oct 2022 18:44:45 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Qo0jXArug4_G for <development@lists.ipfire.org>; Mon, 3 Oct 2022 18:44:44 +0200 (CEST) Received: from chojin.sicho.home (amaterasu.sicho.home [192.168.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (no client certificate requested) (Authenticated sender) by hachiman (MailScanner Milter) with SMTP id 4AC4A71E1C; Mon, 3 Oct 2022 17:27:44 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1664815481; bh=bVhllAFMVE+BHF/kj4fPqssG294U6/i8jUSv6HyRmJY=; h=From:To:Cc:Subject:Date; b=fQZmr4dy5nhw2NzZ8F/T1V2RtWHFNHbGoGUUI1h0XBR5X/eIH1wiWxMQcdwnlqX6e PeJXDRfaYR/wsIxFSLI+/ozWSZqb8mgKyxf0Y2hKubx8fvv53Dy+sXaZ07KXPimUAB aGDxuDvFPAELLWlISXWYEceGWzf/C3vwR30qe9n5NqV9SZ9C5Z+HZpPe0ravNz4p0R Aq8+D8ZFXv6t+RYdNf9lt6DWKToWVQB0qNvAiD86fn+dEwA/ZUNkm8brd79bkruOK3 11DFL54PVaCtTkQylq+Kw/z6+5PfnNgPWLSNAZQVtKJEculgRWJ9M5BUAlxVMQ7Yto GNMszZ8rTYDBQ== From: Robin Roevens <robin.roevens@disroot.org> To: development@lists.ipfire.org Subject: [PATCH 0/2] Fix Bug#12935 - status info broken on services.cgi for some addons Date: Mon, 3 Oct 2022 17:27:17 +0200 Message-Id: <20221003152720.13140-1-robin.roevens@disroot.org> Mime-Version: 1.0 GIT: Lines beginning in "GIT:" will be removed. GIT: Consider including an overall diffstat or table of contents GIT: for the patch you are writing. GIT: Clear the body content if you don't wish to send a summary. Content-Transfer-Encoding: 8bit X-sicho-MailScanner-ID: 4AC4A71E1C.A8A80 X-sicho-MailScanner: Found to be clean X-sicho-MailScanner-From: robin.roevens@disroot.org X-sicho-MailScanner-Watermark: 1665415664.42042@ToF34ty7kP7oC6o3MeZC6g ARC-Seal: i=1; s=202003rsa; d=lists.ipfire.org; t=1664815486; a=rsa-sha256; cv=none; b=lkcA0CeJ/QGZD2v243udT/Q510jbtkD3Eg8IWHyZ3DPu+MCortAl6rvdO8vxUBJQpr5OFp QXSo6TDsJiXqs2j/2FcXcF875a9s1LjIVT9Us+U/JRcZZvncHg9odgkn5EBZkEvDJQdIls Jpy3ekOrI6uvyKp6otdyUwyMKxaDYKbtYrm+XmOH0tn0HhSHdY1Ek/xePRIq7K+Uz1Bu/5 HCsrd30Ff9eQDRTy+GYxSymBPLjyuhAjY6NBk4lsHeE7M+62FuCwwoYAqYyNOHQFNKmyq3 ZkgZuTqrkSbRWzAjb53moyBi7tSedzJKYheIhTXrkfuLZZtIyGcpLagUR9PsnA== ARC-Authentication-Results: i=1; mail01.ipfire.org; dkim=pass header.d=disroot.org header.s=mail header.b=fQZmr4dy; spf=pass (mail01.ipfire.org: domain of robin.roevens@disroot.org designates 178.21.23.139 as permitted sender) smtp.mailfrom=robin.roevens@disroot.org; dmarc=pass (policy=quarantine) header.from=disroot.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=lists.ipfire.org; s=202003rsa; t=1664815486; 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:dkim-signature; bh=KPNv7ayuqOBziN5gjk6XK5BOQ9QoRf5g4iptHRlxvfI=; b=AGFkGSYCS5CJLo8LcSMFsjWJEoCXVwP49DzLaZtKdICPHjflUUlGJOvxiMOKYRs+eJd8V2 v/xZjBvYWDq7hvloy5WsMa0FX7dqgFVD90ikxtdNmtZuvEc2p2SG5dDrucKF8C40/zc9xN RAj6DLbyTFelN8TAAMo2irM8BQLQdtPWOmKzqanA3ihl8A4VmIEvlqf88ghRmg/H1JxGPc zc5lWUZkZy6i2n5UpDbA9vE4Wo0MgwQ2BQXMPhleSYL1Sad/NEmNupOQN2/cTlpkC7xljy 74T13d5X0YPI03VK99fpHmRb7rTBiQJ5Vi3+eQsJRnjezhbQ0V6BL1WKhYT71A== Authentication-Results: mail01.ipfire.org; dkim=pass header.d=disroot.org header.s=mail header.b=fQZmr4dy; spf=pass (mail01.ipfire.org: domain of robin.roevens@disroot.org designates 178.21.23.139 as permitted sender) smtp.mailfrom=robin.roevens@disroot.org; dmarc=pass (policy=quarantine) header.from=disroot.org X-Rspamd-Server: mail01.haj.ipfire.org X-Spamd-Result: default: False [-2.58 / 11.00]; IP_REPUTATION_HAM(-1.07)[asn: 50673(-0.30), country: NL(-0.01), ip: 178.21.23.139(-0.76)]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM(-1.00)[-1.000]; DKIM_REPUTATION(-0.77)[-0.76738087718902]; SPF_REPUTATION_HAM(-0.67)[-0.66696038429689]; BAYES_HAM(-0.53)[80.52%]; R_MISSING_CHARSET(0.50)[]; MV_CASE(0.50)[]; DMARC_POLICY_ALLOW(-0.50)[disroot.org,quarantine]; R_DKIM_ALLOW(0.26)[disroot.org:s=mail]; R_SPF_ALLOW(-0.20)[+a:c]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[development@lists.ipfire.org]; FROM_HAS_DN(0.00)[]; ARC_NA(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCVD_TLS_LAST(0.00)[]; RCVD_COUNT_THREE(0.00)[4]; ARC_SIGNED(0.00)[lists.ipfire.org:s=202003rsa:i=1]; ASN(0.00)[asn:50673, ipnet:178.21.23.0/24, country:NL]; DKIM_TRACE(0.00)[disroot.org:+]; MIME_TRACE(0.00)[0:+]; RCPT_COUNT_TWO(0.00)[2]; TO_DN_SOME(0.00)[] X-Rspamd-Queue-Id: 4Mh6BQ1Gz1z1Pk X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk <development.lists.ipfire.org> List-Unsubscribe: <https://lists.ipfire.org/mailman/options/development>, <mailto:development-request@lists.ipfire.org?subject=unsubscribe> List-Archive: <http://lists.ipfire.org/pipermail/development/> List-Post: <mailto:development@lists.ipfire.org> List-Help: <mailto:development-request@lists.ipfire.org?subject=help> List-Subscribe: <https://lists.ipfire.org/mailman/listinfo/development>, <mailto:development-request@lists.ipfire.org?subject=subscribe> Errors-To: development-bounces@lists.ipfire.org Sender: "Development" <development-bounces@lists.ipfire.org> |
Series |
Fix Bug#12935 - status info broken on services.cgi for some addons
|
|
Message
Robin Roevens
Oct. 3, 2022, 3:27 p.m. UTC
Hi all This patchset fixes Bug#12935 (https://bugzilla.ipfire.org/show_bug.cgi?id=12935) Summary: Addons where the initscript does not match the addon-name and addons with multiple initscripts are now listed on services.cgi since CU170. But addonctrl still expected addon name to be equal to initscript name; Hence starting/stopping/enabling/disabling of such addons was not possible. This has always been like that, but that problem was hidden as services.cgi also did not display those addon services. After discussing this with Adolf on the Bug report, we concluded that we should adapt addonctrl to work with the new addon metadata Services-field instead. I basically rewrote addonctrl to not only use the new services metadata but also to have better errorchecking and added the posibility to check if a service is currently enabled or disabled. As a result services.cgi no longer has to go checking the precense of runlevel initscripts, but can just ask addonctrl. I also added a warning to services.cgi if a runlevel initscript does not exists, to prevent the user from wondering why he can't enable a specific service. (Adolf pointed out some services don't install runlevel initscripts by default) More details in the bugreport and in the commit-messages of the patches. Regards Robin GIT: [PATCH 1/2] misc-progs: addonctrl: Add support for 'Services' GIT: [PATCH 2/2] services.cgi: Fix status/actions on services with name !=