diff options
| author | Brian Behlendorf <[email protected]> | 2013-02-22 10:16:16 -0800 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2013-03-06 15:46:41 -0800 |
| commit | ffb21118add1a2e6cec2ce401c333b4a4e76d9a3 (patch) | |
| tree | 25a5b7b784e037786445bc860bf3f61311013661 | |
| parent | d09f98a9a688905a06a4bd2a92752bebe0f28e63 (diff) | |
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 <[email protected]>
| -rw-r--r-- | config/user-dracut.m4 | 8 | ||||
| -rw-r--r-- | config/user.m4 | 1 | ||||
| -rw-r--r-- | dracut/90zfs/Makefile.am | 2 | ||||
| -rw-r--r-- | zfs.spec.in | 8 |
4 files changed, 16 insertions, 3 deletions
diff --git a/config/user-dracut.m4 b/config/user-dracut.m4 new file mode 100644 index 000000000..6d96edc27 --- /dev/null +++ b/config/user-dracut.m4 @@ -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) +]) diff --git a/config/user.m4 b/config/user.m4 index 109ebd5f9..6925e56f4 100644 --- a/config/user.m4 +++ b/config/user.m4 @@ -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 diff --git a/dracut/90zfs/Makefile.am b/dracut/90zfs/Makefile.am index 411206178..759aae81d 100644 --- a/dracut/90zfs/Makefile.am +++ b/dracut/90zfs/Makefile.am @@ -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 \ diff --git a/zfs.spec.in b/zfs.spec.in index 179ef7cfc..7c469642c 100644 --- a/zfs.spec.in +++ b/zfs.spec.in @@ -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 |