Merge pull request #981 from joe-lawrence/kpatch-service-load-all

kpatch script: don't fail if module already loaded+enabled
This commit is contained in:
Joe Lawrence 2019-06-23 20:36:13 -04:00 committed by GitHub
commit 8e3daab9f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 22 deletions

View File

@ -314,10 +314,9 @@ load_module () {
die "error: cannot re-enable patch module $modname, cannot verify checksum match"
fi
else
die "error: module named $modname already loaded and enabled"
echo "module named $modname already loaded and enabled"
fi
fi
else
echo "loading patch module: $module"
local i=0
while true; do
@ -338,6 +337,7 @@ load_module () {
sleep $RETRY_INTERVAL
fi
done
fi
if ! wait_for_patch_transition "$modname" ; then
echo "module $modname did not complete its transition, unloading..."