Re: [PATCH 1/1] Install files into UsrMerged layout

["Darrick J. Wong" <djwong@kernel.org>]

On Wed, Jun 12, 2024 at 07:35:05PM +0200, Bastian Germann wrote:
> From: Chris Hofstaedtler <zeha@debian.org>
> 
> Signed-off-by: Chris Hofstaedtler <zeha@debian.org>
> Signed-off-by: Bastian Germann <bage@debian.org>
> ---
>  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?  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.

--D

>  
>  AC_SUBST([root_sbindir])
>  AC_SUBST([root_libdir])
> diff --git a/debian/local/initramfs.hook b/debian/local/initramfs.hook
> index 5b24eaec..eac7e79e 100644
> --- a/debian/local/initramfs.hook
> +++ b/debian/local/initramfs.hook
> @@ -45,7 +45,7 @@ rootfs_type() {
>  . /usr/share/initramfs-tools/hook-functions
>  
>  if [ "$(rootfs_type)" = "xfs" ]; then
> -	copy_exec /sbin/xfs_repair
> +	copy_exec /usr/sbin/xfs_repair
>  	copy_exec /usr/sbin/xfs_db
>  	copy_exec /usr/sbin/xfs_metadump
>  fi
> -- 
> 2.45.2
> 
>