From patchwork Wed May 10 17:17:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 6855 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 4QGhYk5YlWz3wlH for ; Wed, 10 May 2023 17:18:02 +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 4QGhYh2V8czNk; Wed, 10 May 2023 17:18:00 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4QGhYh1FQ0z2ylF; Wed, 10 May 2023 17:18:00 +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 4QGhYf5329z2xg1 for ; Wed, 10 May 2023 17:17:58 +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 4QGhYd6QYNzNk; Wed, 10 May 2023 17:17:57 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1683739078; 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=sTSmJqHF5g+B3ccsDOgHXCyT+iL7C79kztDThQAHri0=; b=6Rj1ygCaHh0oxZOawwdZsi5GhP0G3NC2+qM5jv2vp9yakMm7EAg1zyXjEJCUlN88mxeFP2 4wGpVqmAMF3t0fDQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1683739078; 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=sTSmJqHF5g+B3ccsDOgHXCyT+iL7C79kztDThQAHri0=; b=TRSz8RjuQHJvFYFQ+URkfowX7jb6rS0NuLswAOM0aCTs02/DO9k5W05ylXlFBQej8LiRuM SWdOoKu8t+05xhJfV2Bd1gPLFc8TKPR6OvEK4IQTatfni13GHhzx4rM7gmy4PTys2Lr42K hLlaUaeGAaEi69MYdEw96bKq6DXVPl9mw7X6byEjXyuWra6RxXiax/yTsgyOUj9AAZfJR3 BVC3lU+HkyOlCbHhPIM6czSesphvheQNw3nzEhk866nM1q5G38FTVzQM4JN4laQhobtkdk aGPDU9PK0ETynLhL6oFtQNTpcrmfKL7fJ21dmmzDi0HbwA/waHzaoNgFZ7n+aA== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH] initscripts: removal of lvmetad initscript Date: Wed, 10 May 2023 19:17:46 +0200 Message-Id: <20230510171746.1934751-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" - With the last update of lvm2 lvmetad was removed from lvm2. I did not recognise that lvmetad had been setup as an automatic initscript, so it no longer works as the binary is no longer provided. - This patch removes the lvmetad initscript, the reference to lvmetad in the initscript lfs file and the lvmetad initscript entries in the rootfile for each architecture. Signed-off-by: Adolf Belka Reviewed-by: Michael Tremer --- config/rootfiles/common/aarch64/initscripts | 2 - config/rootfiles/common/riscv64/initscripts | 2 - config/rootfiles/common/x86_64/initscripts | 2 - lfs/initscripts | 3 +- src/initscripts/system/lvmetad | 53 --------------------- 5 files changed, 1 insertion(+), 61 deletions(-) delete mode 100755 src/initscripts/system/lvmetad diff --git a/config/rootfiles/common/aarch64/initscripts b/config/rootfiles/common/aarch64/initscripts index dc6c0fd24..e2a8a11d5 100644 --- a/config/rootfiles/common/aarch64/initscripts +++ b/config/rootfiles/common/aarch64/initscripts @@ -29,7 +29,6 @@ etc/rc.d/init.d/functions etc/rc.d/init.d/halt etc/rc.d/init.d/ipsec etc/rc.d/init.d/leds -etc/rc.d/init.d/lvmetad etc/rc.d/init.d/localnet etc/rc.d/init.d/modules etc/rc.d/init.d/mountfs @@ -171,7 +170,6 @@ etc/rc.d/rc6.d/S99reboot etc/rc.d/rcsysinit.d/S00mountkernfs etc/rc.d/rcsysinit.d/S01sysctl etc/rc.d/rcsysinit.d/S05modules -etc/rc.d/rcsysinit.d/S09lvmetad etc/rc.d/rcsysinit.d/S10udev etc/rc.d/rcsysinit.d/S19waitdrives etc/rc.d/rcsysinit.d/S25partresize diff --git a/config/rootfiles/common/riscv64/initscripts b/config/rootfiles/common/riscv64/initscripts index 1848f8ebc..0c12af138 100644 --- a/config/rootfiles/common/riscv64/initscripts +++ b/config/rootfiles/common/riscv64/initscripts @@ -29,7 +29,6 @@ etc/rc.d/init.d/functions etc/rc.d/init.d/halt etc/rc.d/init.d/ipsec etc/rc.d/init.d/leds -etc/rc.d/init.d/lvmetad etc/rc.d/init.d/localnet etc/rc.d/init.d/modules etc/rc.d/init.d/mountfs @@ -170,7 +169,6 @@ etc/rc.d/rc6.d/S99reboot etc/rc.d/rcsysinit.d/S00mountkernfs etc/rc.d/rcsysinit.d/S01sysctl etc/rc.d/rcsysinit.d/S05modules -etc/rc.d/rcsysinit.d/S09lvmetad etc/rc.d/rcsysinit.d/S10udev etc/rc.d/rcsysinit.d/S19waitdrives etc/rc.d/rcsysinit.d/S25partresize diff --git a/config/rootfiles/common/x86_64/initscripts b/config/rootfiles/common/x86_64/initscripts index 1848f8ebc..0c12af138 100644 --- a/config/rootfiles/common/x86_64/initscripts +++ b/config/rootfiles/common/x86_64/initscripts @@ -29,7 +29,6 @@ etc/rc.d/init.d/functions etc/rc.d/init.d/halt etc/rc.d/init.d/ipsec etc/rc.d/init.d/leds -etc/rc.d/init.d/lvmetad etc/rc.d/init.d/localnet etc/rc.d/init.d/modules etc/rc.d/init.d/mountfs @@ -170,7 +169,6 @@ etc/rc.d/rc6.d/S99reboot etc/rc.d/rcsysinit.d/S00mountkernfs etc/rc.d/rcsysinit.d/S01sysctl etc/rc.d/rcsysinit.d/S05modules -etc/rc.d/rcsysinit.d/S09lvmetad etc/rc.d/rcsysinit.d/S10udev etc/rc.d/rcsysinit.d/S19waitdrives etc/rc.d/rcsysinit.d/S25partresize diff --git a/lfs/initscripts b/lfs/initscripts index 55f0066e5..0312d8ae4 100644 --- a/lfs/initscripts +++ b/lfs/initscripts @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2020 IPFire Team # +# Copyright (C) 2007-2023 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -155,7 +155,6 @@ $(TARGET) : ln -sf ../init.d/mountkernfs /etc/rc.d/rcsysinit.d/S00mountkernfs ln -sf ../init.d/sysctl /etc/rc.d/rcsysinit.d/S01sysctl ln -sf ../init.d/modules /etc/rc.d/rcsysinit.d/S05modules - ln -sf ../init.d/lvmetad /etc/rc.d/rcsysinit.d/S09lvmetad ln -sf ../init.d/udev /etc/rc.d/rcsysinit.d/S10udev ln -sf ../init.d/waitdrives /etc/rc.d/rcsysinit.d/S19waitdrives ln -sf ../init.d/partresize /etc/rc.d/rcsysinit.d/S25partresize diff --git a/src/initscripts/system/lvmetad b/src/initscripts/system/lvmetad deleted file mode 100755 index 87cf87d33..000000000 --- a/src/initscripts/system/lvmetad +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/sh -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2022 IPFire Team # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see . # -# # -############################################################################### - -. /etc/sysconfig/rc -. ${rc_functions} - -case "${1}" in - start) - # Create diretory for control socket - mkdir -p /run/lvm - - boot_mesg "Starting LVM2 Metadata Daemon..." - loadproc /usr/sbin/lvmetad - ;; - - stop) - boot_mesg "Stopping LVM2 Metadata Daemon..." - killproc /usr/sbin/lvmetad - ;; - - restart) - ${0} stop - sleep 1 - ${0} start - ;; - - status) - statusproc /usr/sbin/lvmetad - ;; - - *) - echo "Usage: ${0} {start|stop|restart|status}" - exit 1 - ;; -esac