From baeba3f73a336b6a0e1eb9f52d518ea5b08139fb Mon Sep 17 00:00:00 2001
From: Jeff Bilyk <jbilyk@gmail.com>
Date: Sun, 31 Jul 2011 17:42:49 -0400
Subject: setup-alpine: only run setup-apklub if sys disk mode wasnt selected

---
 setup-alpine.in | 4 +++-
 setup-disk.in   | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/setup-alpine.in b/setup-alpine.in
index 075ca07..0b76d5a 100644
--- 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
diff --git a/setup-disk.in b/setup-disk.in
index 026e32a..5454adb 100644
--- 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
-- 
cgit v1.2.3