Commit f2d14370 authored by Kaarle Ritvanen's avatar Kaarle Ritvanen
Browse files

setup-disk: exit with proper code on failure

fixes #2876
parent f133bfa2
...@@ -199,7 +199,7 @@ if [ "$rc_sys" = "LXC" ]; then ...@@ -199,7 +199,7 @@ if [ "$rc_sys" = "LXC" ]; then
fi fi
DEFAULT_DISK=none \ DEFAULT_DISK=none \
$PREFIX/sbin/setup-disk -q ${DISKOPTS} $PREFIX/sbin/setup-disk -q ${DISKOPTS} || exit
diskmode=$(cat /tmp/alpine-install-diskmode.out 2>/dev/null) diskmode=$(cat /tmp/alpine-install-diskmode.out 2>/dev/null)
......
...@@ -1068,4 +1068,6 @@ none) exit 0;; ...@@ -1068,4 +1068,6 @@ none) exit 0;;
*) echo "Not a valid install mode: $DISK_MODE" >&2; exit 1;; *) echo "Not a valid install mode: $DISK_MODE" >&2; exit 1;;
esac esac
RC=$?
echo "$DISK_MODE" > /tmp/alpine-install-diskmode.out echo "$DISK_MODE" > /tmp/alpine-install-diskmode.out
exit $RC
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment