Skip to content

survive a failed kernel install and let callers see failed applies #106

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cclements wants to merge 1 commit into
base: master
Choose a base branch
from
Open

survive a failed kernel install and let callers see failed applies #106

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 30 additions & 4 deletions src/update/opnsense-update.sh.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -737,6 +737,9 @@ if [ "${DO_KERNEL}" = "-K" ]; then
WORKDIR=${PENDINGDIR}

rm -f "${PENDING_KERNEL}"

# marker is gone; any failure now is a botched apply
FAILURE=2
elif [ "${DO_BASE}" = "-B" ]; then
if [ ! -f "${PENDING_BASE}" ]; then
# must error out to prevent reboot
Expand All @@ -747,6 +750,9 @@ elif [ "${DO_BASE}" = "-B" ]; then
WORKDIR=${PENDINGDIR}

rm -f "${PENDING_BASE}"

# marker is gone; any failure now is a botched apply
FAILURE=2
elif [ "${DO_PKGS}" = "-P" ]; then
if [ ! -f "${PENDING_PKGS}" ]; then
# must error out to prevent reboot
Expand All @@ -761,6 +767,9 @@ elif [ "${DO_PKGS}" = "-P" ]; then
fi

rm -f "${PENDING_PKGS}" "${INSECURE_PKGS}"

# marker is gone; any failure now is a botched apply
FAILURE=2
elif [ -n "${DO_LOCAL}" ]; then
WORKDIR=${DO_LOCAL#"-l "}
fi
Expand Down Expand Up @@ -893,7 +902,10 @@ exit_msg()
echo "${1}"
fi

exit 1
# exits 2 instead when a consumed pending set could not
# be applied so that callers can tell a botched apply
# apart from "nothing to do"
exit ${FAILURE:-1}
}

fetch_set()
Expand Down Expand Up @@ -956,6 +968,18 @@ install_tests()
echo " done"
}

revert_kernel()
{
# a failed install must not leave a stub kernel that the
# loader would pick by default on the next boot
for DIR in ${KERNELDIR} ${DEBUGDIR}${KERNELDIR}; do
if [ -d ${DIR}.old ]; then
rm -rf ${DIR}
mv ${DIR}.old ${DIR}
fi
done
}

install_kernel()
{
echo -n "Installing ${KERNELSET}..."
Expand All @@ -975,12 +999,14 @@ install_kernel()
done

if ! tar -C / -xpf ${WORKDIR}/${KERNELSET} --exclude="^.abi_hint"; then
exit_msg " failed, tar error ${?}"
revert_kernel
exit_msg " failed, tar error, previous kernel restored"
fi

if [ -z "${DO_UPGRADE}" ]; then
if ! kldxref ${KERNELDIR}; then
exit_msg " failed, kldxref error ${?}"
revert_kernel
exit_msg " failed, kldxref error, previous kernel restored"
fi
fi

Expand Down Expand Up @@ -1204,7 +1230,7 @@ if [ -n "${DO_BASE}" -a -z "${DO_UPGRADE}" ]; then
# Clean all the pending updates, so that
# packages are not upgraded as well.
empty_cache
exit 1
exit ${FAILURE:-1}
fi
fi

Expand Down