From a2df534c109fadf0dd5a78929534b75d97f0b7af Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 30 Nov 2016 15:54:53 +0000 Subject: proper fix for dkms autobuild --- libvasile | 21 +++++++++++---------- vasile | 3 +++ 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/libvasile b/libvasile index 2eb92e5..f4f4035 100755 --- a/libvasile +++ b/libvasile @@ -38,6 +38,7 @@ export local chrootsrcmode="vasile --srcmode" export local isouser="root" export local isomainarch="x86_64" export local isobinmode="vasile --binmode" +export local isodkms="vasile --dkms" export local isokernelname="kernel-genkernel-"$isomainarch"-"$kernelver"" export local isoramfsname="initramfs-genkernel-"$isomainarch"-"$kernelver"" export local isoramfscmd="dracut -N -a dmsquash-live -a pollcdrom --force" @@ -115,6 +116,15 @@ chrootchecksum () { done } +dkmsmod () { + # build and install any 3rd party kernel modules using DKMS + if [[ -x $(which dkms) ]] ; then + for i in $(dkms status | cut -d " " -f1,2 | sed -e 's/,//g' | sed -e 's/ /\//g' | sed -e 's/://g') ; do + dkms install $i + done + fi +} + # build functions chrootprepare () { @@ -247,18 +257,9 @@ isoservices () { done } -isodkms () { - # prepare any 3rd party kernel modules using DKMS (virtualbox-guest in our case) - if [[ -x $(which dkms) ]] ; then - for i in $(dkms status | cut -d " " -f1,2 | sed -e 's/,//g' | sed -e 's/ /\//g' | sed -e 's/://g') ; do - dkms install $i - done - fi -} - isomodules () { # build and install any 3rd party kernel modules using DKMS (virtualbox-guest in our case) - chroot "$isosynctarget" su - "$isouser" -c isodkms + chroot "$isosynctarget" su - "$isouser" -c "$isodkms" } isochroot () { diff --git a/vasile b/vasile index 62dc685..d64b617 100755 --- a/vasile +++ b/vasile @@ -34,6 +34,9 @@ case $1 in --srcmode) srcmode ;; + --dkms) + dkmsmod + ;; --help) showhelp ;; -- cgit v1.2.3