Reviewed-by: Michael Tremer > On 10 May 2023, at 18:17, Adolf Belka wrote: > > - 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 > --- > 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 > -- > 2.40.1 >