ahill/nilfs-utils
1
0
Fork 0
mirror of https://github.com/nilfs-dev/nilfs-utils.git synced 2026-01-26 05:37:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: avoid overwriting binaries on merged-/usr

Browse Source 
commit 00adeaa0e9e19ecb3746666f1b28d0c76ef3a4f0 upstream.

Recent distributions, such as Fedora Rawhide, have fully merged /sbin
and /usr/sbin into /usr/bin.  In this configuration, /usr/sbin is a
symbolic link to bin.

In this environment, if nilfs-utils is configured to install binaries
into /usr/bin, the current logic to create compatibility symlinks in
/usr/sbin causes a critical issue: it overwrites the actual installed
binaries with symbolic links to themselves (e.g., /usr/sbin/nilfs-clean
points to ../bin/nilfs-clean, which are the same file).

Fix this by detecting if /usr/sbin and /usr/bin identify the same
directory.  If they are the same, disable the creation of compatibility
symlinks to avoid this overwrite.

Also, update the README file to clarify that compatibility symbolic
links are created only if /usr/sbin is distinct from /usr/bin.

Fixes: 160ab60d4959 ("build: support UsrMerge and Bin-Sbin merge with automatic detection")
Signed-off-by: Ryusuke Konishi <konishi.ryusuke@gmail.com>
This commit is contained in:
Ryusuke Konishi 2026-01-24 08:18:09 +09:00
parent 44592b6082
commit 22f7ad89cb
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README
View File

@ -76,8 +76,8 @@ hierarchy and adjusts the installation paths for core binaries
- Bin-Sbin merge (e.g., Fedora Rawhide): Installs to /usr/bin
When installing to /usr/bin, the build system also attempts to create
compatibility symbolic links in /usr/sbin if that directory exists on
the target system.
compatibility symbolic links in /usr/sbin if that directory exists and
is different from /usr/bin.
You can manually override this detection using the following options:

7
configure.ac
View File

@ -195,7 +195,12 @@ AS_CASE(["x$enable_usrmerge"],
core_sbindir='${exec_prefix}/bin'
sbindir='${exec_prefix}/bin'
badblocksdir='/usr/bin'
create_compat_sbin_link=yes
# If /usr/sbin is effectively /usr/bin,
# we must not create compat symlinks because they would overwrite
# the actual binaries installed in /usr/bin.
AS_IF([test "/usr/sbin" -ef "/usr/bin"],
[create_compat_sbin_link=no],
[create_compat_sbin_link=yes])
],
[xsbin|xyes], [
core_sbindir='${exec_prefix}/sbin'