diff options
| author | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2016-12-23 14:37:41 +0200 |
|---|---|---|
| committer | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2016-12-23 14:38:51 +0200 |
| commit | f2d14370666c42ed28095e562b6dd9109bbd2a3e (patch) | |
| tree | de43551e8166fe21ce83995a3a5123a064e69ee5 | |
| parent | f133bfa2ddf73b07e4ecf92d724ed7c416f4ff81 (diff) | |
| download | alpine-conf-f2d14370666c42ed28095e562b6dd9109bbd2a3e.tar.bz2 alpine-conf-f2d14370666c42ed28095e562b6dd9109bbd2a3e.tar.xz | |
setup-disk: exit with proper code on failure
fixes #2876
| -rw-r--r-- | setup-alpine.in | 2 | ||||
| -rw-r--r-- | setup-disk.in | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/setup-alpine.in b/setup-alpine.in index 8b1d947..7840300 100644 --- a/setup-alpine.in +++ b/setup-alpine.in @@ -199,7 +199,7 @@ if [ "$rc_sys" = "LXC" ]; then fi 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) diff --git a/setup-disk.in b/setup-disk.in index ab785fb..d5ffc4b 100644 --- a/setup-disk.in +++ b/setup-disk.in @@ -1068,4 +1068,6 @@ none) exit 0;; *) echo "Not a valid install mode: $DISK_MODE" >&2; exit 1;; esac +RC=$? echo "$DISK_MODE" > /tmp/alpine-install-diskmode.out +exit $RC |