c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2024-11-17 10:01:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Install zgenhostid to sbindir

Browse Source 
zgenhostid(8) is used to modify or create /etc/hostid.  This
administrative tool is currently installed to bindir.  System utilities
are typically placed in sbin.

Modify the installation directory for zgenhostid.  Additionally, track
this change in its use in dracut and the rpm installation.

Authored-by: наб <nabijaczleweli@nabijaczleweli.xyz>
Authored-by: Antonio Russo <aerusso@aerusso.net>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Antonio Russo <aerusso@aerusso.net>
Closes #11485
This commit is contained in:
Antonio Russo 2021-01-21 13:58:24 -07:00 committed by GitHub
parent 2d8f72d76c
commit 0ae733c7a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/zgenhostid/Makefile.am
View File

@ -1,5 +1,5 @@
include $(top_srcdir)/config/Rules.am include $(top_srcdir)/config/Rules.am
bin_PROGRAMS = zgenhostid sbin_PROGRAMS = zgenhostid
zgenhostid_SOURCES = zgenhostid.c zgenhostid_SOURCES = zgenhostid.c

4
contrib/dracut/90zfs/module-setup.sh.in
View File

@ -5,7 +5,7 @@ check() {
[ "${1}" = "-d" ] && return 0 [ "${1}" = "-d" ] && return 0
# Verify the zfs tool chain # Verify the zfs tool chain
for tool in "@bindir@/zgenhostid" "@sbindir@/zpool" "@sbindir@/zfs" "@mounthelperdir@/mount.zfs" ; do for tool in "@sbindir@/zgenhostid" "@sbindir@/zpool" "@sbindir@/zfs" "@mounthelperdir@/mount.zfs" ; do
test -x "$tool" || return 1 test -x "$tool" || return 1
done done
# Verify grep exists # Verify grep exists
@ -38,7 +38,7 @@ install() {
inst_rules @udevruledir@/60-zvol.rules inst_rules @udevruledir@/60-zvol.rules
dracut_install hostid dracut_install hostid
dracut_install grep dracut_install grep
dracut_install @bindir@/zgenhostid dracut_install @sbindir@/zgenhostid
dracut_install @sbindir@/zfs dracut_install @sbindir@/zfs
dracut_install @sbindir@/zpool dracut_install @sbindir@/zpool
# Workaround for https://github.com/openzfs/zfs/issues/4749 by # Workaround for https://github.com/openzfs/zfs/issues/4749 by

2
rpm/generic/zfs.spec.in
View File

@ -442,7 +442,7 @@ systemctl --system daemon-reload >/dev/null || true
# Core utilities # Core utilities
%{_sbindir}/* %{_sbindir}/*
%{_bindir}/raidz_test %{_bindir}/raidz_test
%{_bindir}/zgenhostid %{_sbindir}/zgenhostid
%{_bindir}/zvol_wait %{_bindir}/zvol_wait
# Optional Python 2/3 scripts # Optional Python 2/3 scripts
%{_bindir}/arc_summary %{_bindir}/arc_summary