mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2024-12-26 03:09:34 +03:00
Add --with-dracutdir configure option
The standard dracut directory has moved from /usr/share/dracut to /usr/lib/dracut. To ensure the dracut modules get installed in the correct location provide a --with-dracutdir configure option to set the path. The default install location has been updated to /usr/lib/dracut which is used by more current versions of Fedora. However, this default is overriden by the RPM packaging for consistency. Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
This commit is contained in:
parent
d09f98a9a6
commit
ffb21118ad
8
config/user-dracut.m4
Normal file
8
config/user-dracut.m4
Normal file
@ -0,0 +1,8 @@
|
||||
AC_DEFUN([ZFS_AC_CONFIG_USER_DRACUT], [
|
||||
AC_ARG_WITH(dracutdir,
|
||||
AC_HELP_STRING([--with-dracutdir=DIR],
|
||||
[install dracut helpers [[EPREFIX/lib/dracut]]]),
|
||||
dracutdir=$withval, dracutdir='${exec_prefix}/lib/dracut')
|
||||
|
||||
AC_SUBST(dracutdir)
|
||||
])
|
@ -3,6 +3,7 @@ dnl # Default ZFS user configuration
|
||||
dnl #
|
||||
AC_DEFUN([ZFS_AC_CONFIG_USER], [
|
||||
ZFS_AC_CONFIG_USER_UDEV
|
||||
ZFS_AC_CONFIG_USER_DRACUT
|
||||
ZFS_AC_CONFIG_USER_ARCH
|
||||
ZFS_AC_CONFIG_USER_IOCTL
|
||||
ZFS_AC_CONFIG_USER_ZLIB
|
||||
|
@ -1,4 +1,4 @@
|
||||
pkgdracutdir = $(datadir)/dracut/modules.d/90zfs
|
||||
pkgdracutdir = $(dracutdir)/modules.d/90zfs
|
||||
pkgdracut_SCRIPTS = \
|
||||
$(top_srcdir)/dracut/90zfs/module-setup.sh \
|
||||
$(top_srcdir)/dracut/90zfs/mount-zfs.sh \
|
||||
|
@ -5,6 +5,7 @@
|
||||
%define _sbindir /sbin
|
||||
%define _libdir /%{_lib}
|
||||
%define _udevdir /lib/udev
|
||||
%define _dracutdir %{_datadir}/dracut
|
||||
|
||||
Summary: ZFS Library and Utils
|
||||
Group: Utilities/System
|
||||
@ -60,7 +61,10 @@ which are ZFS aware.
|
||||
%prep
|
||||
%setup
|
||||
%build
|
||||
%configure --with-config=user --without-blkid --with-udevdir=%{_udevdir}
|
||||
%configure --with-config=user \
|
||||
--without-blkid \
|
||||
--with-udevdir=%{_udevdir} \
|
||||
--with-dracutdir=%{_dracutdir}
|
||||
make
|
||||
|
||||
%install
|
||||
@ -94,7 +98,7 @@ rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%files dracut
|
||||
%defattr(-,root,root)
|
||||
%{_datadir}/dracut/*
|
||||
%{_dracutdir}/*
|
||||
|
||||
%post
|
||||
[ -x /sbin/chkconfig ] && /sbin/chkconfig --add zfs
|
||||
|
Loading…
Reference in New Issue
Block a user