RepoMirrors
/
kpatch
mirror of https://github.com/dynup/kpatch
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1418 from joe-lawrence/shellcheck-oct-2024 

tree: fix latest shellcheck complaints
This commit is contained in:
Joe Lawrence 2024-10-10 17:33:06 -04:00 committed by GitHub
parent 3dd3e58848 c799fde067
commit 5787dcd8f2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
kpatch-build/kpatch-build
View File

@ -1173,7 +1173,7 @@ if [[ -n "$CONFIG_LIVEPATCH" ]] && (kernel_is_rhel || kernel_version_gte 4.9.0);
if use_klp_arch; then if use_klp_arch; then
USE_KLP_ARCH=1 USE_KLP_ARCH=1
KPATCH_LDFLAGS="--unique=.parainstructions --unique=.altinstructions" KPATCH_LDFLAGS="--unique=.parainstructions --unique=.altinstructions"
CDO_FLAGS="--klp-arch" CDO_FLAGS+=("--klp-arch")
fi fi
if [[ "$KLP_REPLACE" -eq 1 ]] ; then if [[ "$KLP_REPLACE" -eq 1 ]] ; then
@ -1427,7 +1427,7 @@ for i in $FILES; do
# create-diff-object orig.o patched.o parent-name parent-symtab # create-diff-object orig.o patched.o parent-name parent-symtab
# Module.symvers patch-mod-name output.o # Module.symvers patch-mod-name output.o
"$TOOLSDIR"/create-diff-object $CDO_FLAGS "orig/$i" "patched/$i" "$KOBJFILE_NAME" \ "$TOOLSDIR"/create-diff-object "${CDO_FLAGS[@]}" "orig/$i" "patched/$i" "$KOBJFILE_NAME" \
"$SYMTAB" "$SYMVERS_FILE" "${MODNAME//-/_}" \ "$SYMTAB" "$SYMVERS_FILE" "${MODNAME//-/_}" \
"output/$i" 2>&1 | logger 1 "output/$i" 2>&1 | logger 1
check_pipe_status create-diff-object check_pipe_status create-diff-object
@ -1497,7 +1497,7 @@ cd "$TEMPDIR/patch" || die
# We no longer need kpatch-cc # We no longer need kpatch-cc
for ((idx=0; idx<${#MAKEVARS[@]}; idx++)); do for ((idx=0; idx<${#MAKEVARS[@]}; idx++)); do
MAKEVARS[$idx]=${MAKEVARS[$idx]/${KPATCH_CC_PREFIX}/} MAKEVARS[idx]=${MAKEVARS[idx]/${KPATCH_CC_PREFIX}/}
done done
export KPATCH_BUILD="$KERNEL_SRCDIR" KPATCH_NAME="$MODNAME" \ export KPATCH_BUILD="$KERNEL_SRCDIR" KPATCH_NAME="$MODNAME" \
@ -1510,10 +1510,10 @@ make "${MAKEVARS[@]}" 2>&1 | logger || die
if [[ "$USE_KLP" -eq 1 ]]; then if [[ "$USE_KLP" -eq 1 ]]; then
if [[ "$USE_KLP_ARCH" -eq 0 ]]; then if [[ "$USE_KLP_ARCH" -eq 0 ]]; then
extra_flags="--no-klp-arch-sections" extra_flags+=("--no-klp-arch-sections")
fi fi
cp -f "$TEMPDIR/patch/$MODNAME.ko" "$TEMPDIR/patch/tmp.ko" || die cp -f "$TEMPDIR/patch/$MODNAME.ko" "$TEMPDIR/patch/tmp.ko" || die
"$TOOLSDIR"/create-klp-module $extra_flags "$TEMPDIR/patch/tmp.ko" "$TEMPDIR/patch/$MODNAME.ko" 2>&1 | logger 1 "$TOOLSDIR"/create-klp-module "${extra_flags[@]}" "$TEMPDIR/patch/tmp.ko" "$TEMPDIR/patch/$MODNAME.ko" 2>&1 | logger 1
check_pipe_status create-klp-module check_pipe_status create-klp-module
[[ "$rc" -ne 0 ]] && die "create-klp-module: exited with return code: $rc" [[ "$rc" -ne 0 ]] && die "create-klp-module: exited with return code: $rc"
fi fi

1
kpatch/kpatch
View File

@ -355,7 +355,6 @@ load_module () {
i=$((i+1)) i=$((i+1))
if [[ $i -eq $MAX_LOAD_ATTEMPTS ]]; then if [[ $i -eq $MAX_LOAD_ATTEMPTS ]]; then
die "failed to load module $module" die "failed to load module $module"
break
else else
warn "retrying..." warn "retrying..."
sleep $RETRY_INTERVAL sleep $RETRY_INTERVAL

2
test/integration/lib.sh
View File

@ -116,7 +116,7 @@ kpatch_photon_dependencies()
if [[ -z "$flavor" ]]; then if [[ -z "$flavor" ]]; then
tdnf install -y linux-debuginfo tdnf install -y linux-debuginfo
else else
tdnf install -y linux-$flavor-debuginfo tdnf install -y linux-"$flavor"-debuginfo
fi fi
} }