On Wed, Jun 12, 2024 at 08:58:55PM +0200, Chris Hofstaedtler wrote: > * Darrick J. Wong <djwong@xxxxxxxxxx> [240612 20:08]: > > On Wed, Jun 12, 2024 at 07:35:05PM +0200, Bastian Germann wrote: > > > From: Chris Hofstaedtler <zeha@xxxxxxxxxx> > > > > > > Signed-off-by: Chris Hofstaedtler <zeha@xxxxxxxxxx> > > > Signed-off-by: Bastian Germann <bage@xxxxxxxxxx> > > > --- > > > configure.ac | 19 ++----------------- > > > debian/local/initramfs.hook | 2 +- > > > 2 files changed, 3 insertions(+), 18 deletions(-) > > > > > > diff --git a/configure.ac b/configure.ac > > > index da30fc5c..a532d90d 100644 > > > --- a/configure.ac > > > +++ b/configure.ac > > > @@ -113,23 +113,8 @@ esac > > > # > > > test -n "$multiarch" && enable_lib64=no > > > > > > -# > > > -# Some important tools should be installed into the root partitions. > > > -# > > > -# Check whether exec_prefix=/usr: and install them to /sbin in that > > > -# case. If the user chooses a different prefix assume they just want > > > -# a local install for testing and not a system install. > > > -# > > > -case $exec_prefix:$prefix in > > > -NONE:NONE | NONE:/usr | /usr:*) > > > - root_sbindir='/sbin' > > > - root_libdir="/${base_libdir}" > > > - ;; > > > -*) > > > - root_sbindir="${sbindir}" > > > - root_libdir="${libdir}" > > > - ;; > > > -esac > > > +root_sbindir="${sbindir}" > > > +root_libdir="${libdir}" > > > > Should we get rid of $root_sbindir, $root_libdir, PKG_ROOT_LIB_DIR, and > > PKG_ROOT_SBIN_DIR while we're at it? > > Will do. > > > That will break anyone who hasn't > > done the /usr merge yet, but how many distros still want > > /sbin/xfs_repair? opensuse and the rhel variants seem to have moved > > that to /usr/sbin/ years ago. > > I think nobody supports split-/usr nowadays? Oh I bet there are *some* people still running separate / and /usr without an initramfs or a livecd who still need to be able to mount / so they can repair /usr. Buuuut. As none of the major distros (suse/rhel/debian/anything with systemd) support separate /usr anymore, it's probably no great loss. --D > Chris > >