From 2b14ec8a7101d9f6cd02d45fc4e6c211a381e669 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Tue, 13 Sep 2011 14:41:53 +0000
Subject: setup-alpine: dont display error message if disk is 'none'

---
 setup-alpine.in | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/setup-alpine.in b/setup-alpine.in
index 82f09bc..38113e3 100755
--- a/setup-alpine.in
+++ b/setup-alpine.in
@@ -158,7 +158,11 @@ $PREFIX/sbin/setup-ntp ${NTPOPTS}
 DEFAULT_DISK=none \
 	$PREFIX/sbin/setup-disk -q ${DISKOPTS}
 
-if [ "`cat /tmp/alpine-install-diskmode.out`" != "sys" ]; then
+diskmode=$(cat /tmp/alpine-install-diskmode.out 2>/dev/null)
+
+# setup lbu and apk cache unless installed sys on disk
+if [ "$diskmode" != "sys" ]; then
 	$PREFIX/sbin/setup-lbu ${LBUOPTS}
 	$PREFIX/sbin/setup-apkcache ${APKCACHEOPTS}
 fi
+
-- 
cgit v1.2.3