Skip to content

Commit

Permalink
Fixed building zfs modules in zmogrify
Browse files Browse the repository at this point in the history
  • Loading branch information
t0fik committed Aug 26, 2018
1 parent 288c3e1 commit 2e37adc
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 5 deletions.
8 changes: 4 additions & 4 deletions src/zmogrify
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ kver=$1

[[ -z "${kver}" ]] && kver=$(uname -r)

if dkms status --kernelver ${kver} | grep -q spl 2>/dev/null; then
if ! dkms status --kernelver ${kver} | grep -q spl 2>/dev/null; then
splver=$(ls -d /usr/src/spl*| xargs -I{} basename {}|sort -V|tail -n1|cut -d'-' -f2)
dkms install -m spl/$splver
dkms install -m spl/$splver --kernelver ${kver}
fi

if dkms status --kernelver ${kver} | grep -q zfs 2>/dev/null; then
if ! dkms status --kernelver ${kver} | grep -q zfs 2>/dev/null; then
zfsver=$(ls -d /usr/src/zfs*| xargs -I{} basename {}|sort -V|tail -n1|cut -d'-' -f2)
dkms install -m spl/$zfsver
dkms install -m spl/$zfsver --kernelver ${kver}
fi


Expand Down
5 changes: 4 additions & 1 deletion zfs-rootfs.spec
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Name: zfs-rootfs
Version: 1.3.2
Version: 1.3.3
Release: 1%{?dist}
Summary: Utils and configs for Linux on ZFS

Expand Down Expand Up @@ -40,6 +40,9 @@ done
%{_unitdir}/*/*.conf

%changelog
* Sun Aug 26 2018 Jerzy Drozdz <[email protected]> - 1.3.3-1
- Fixed building zfs modules in zmogrify

* Sat Aug 25 2018 Jerzy Drozdz <[email protected]> - 1.3.2-1
- Added checking if zfs modules are present in kernel

Expand Down

0 comments on commit 2e37adc

Please sign in to comment.