setup-alpine: only run setup-apklub if sys disk mode wasnt selected

baeba3f7 · Jeff Bilyk · 8a611e2b · baeba3f7 · baeba3f7
Commit baeba3f7 authored Jul 31, 2011 by Jeff Bilyk
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

setup-alpine.in setup-alpine.in +3 -1

setup-disk.in setup-disk.in +1 -0

No files found.
--- a/setup-alpine.in
+++ b/setup-alpine.in
@@ -80,4 +80,6 @@ $PREFIX/sbin/setup-ntp
 DEFAULT_DISK=none \
 	$PREFIX/sbin/setup-disk -q

-$PREFIX/sbin/setup-apklbu -i
+if ![ "`cat /tmp/alpine-install-diskmode.out`" = "sys" ]; then
+	$PREFIX/sbin/setup-apklbu -i
+fi
--- a/setup-disk.in
+++ b/setup-disk.in
@@ -941,3 +941,4 @@ none) exit 0;;
 *) echo "Not a valid install mode: $DISK_MODE" >&2; exit 1;;
 esac

+echo "$DISK_MODE" > /tmp/alpine-install-diskmode.out