Thanks, applied as 810d065ef81df6b54c096074288fd88aa40dba9f. Michael
[sent from post-receive hook] On Fri, 14 Aug 2026 17:38:32 +0200, Sven Püschel <[email protected]> wrote: > Move lvmdump and the fsadm command into a separate option, as both > commands are bash scripts and therefore need bash as a dependency. > As these commands may not be used, we don't add bash as a dependency to > the much bigger LVM2_LVM_TOOLS option but instead add distinct options > for these commands. > > The new options are guarded by the existing `if LVM2_LVM_TOOLS` to > prevent them from being enabled when the other tools are not enabled. > As this isn't necessary for the lvm2.make file, it doesn't nest the if > conditions to avoid complexity. > > Signed-off-by: Sven Püschel <[email protected]> > Message-Id: <[email protected]> > Signed-off-by: Michael Olbrich <[email protected]> > > diff --git a/rules/lvm2.in b/rules/lvm2.in > index 3213d9c315d1..bb95799e684e 100644 > --- a/rules/lvm2.in > +++ b/rules/lvm2.in > @@ -8,6 +8,7 @@ menuconfig LVM2 > select READLINE > select NCURSES > select SYSTEMD if LVM2_SYSTEMD > + select BASH if (LVM2_FSADM || LVM2_LVMDUMP) && > RUNTIME > prompt "lvm2 " > help > LVM2 refers to a new userspace toolset that provide logical volume > management > @@ -32,6 +33,13 @@ config LVM2_STARTSCRIPT > depends on INITMETHOD_BBINIT > prompt "install /etc/init.d/lvm2" > > +config LVM2_FSADM > + bool > + prompt "install the fsadm command" > + > +config LVM2_LVMDUMP > + bool > + prompt "install the lvmdump command" > endif > > config LVM2_LIBDEVMAPPER_EVENT > diff --git a/rules/lvm2.make b/rules/lvm2.make > index 57773a1f7149..b5aea987347e 100644 > --- a/rules/lvm2.make > +++ b/rules/lvm2.make > @@ -110,10 +110,15 @@ $(STATEDIR)/lvm2.targetinstall: > > @$(call install_copy, lvm2, 0, 0, 0755, -, /usr/sbin/dmsetup) > > -ifdef PTXCONF_LVM2_LVM_TOOLS > +ifdef PTXCONF_LVM2_FSADM > @$(call install_copy, lvm2, 0, 0, 0755, -, /usr/sbin/fsadm) > +endif > + > +ifdef PTXCONF_LVM2_LVMDUMP > @$(call install_copy, lvm2, 0, 0, 0755, -, /usr/sbin/lvmdump) > +endif > > +ifdef PTXCONF_LVM2_LVM_TOOLS > @$(call install_copy, lvm2, 0, 0, 0755, -, /usr/sbin/lvm) > @$(call install_link, lvm2, lvm, /usr/sbin/lvchange) > @$(call install_link, lvm2, lvm, /usr/sbin/lvconvert)
