aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2011-09-13 14:41:53 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2011-09-13 14:54:54 +0000
commit2b14ec8a7101d9f6cd02d45fc4e6c211a381e669 (patch)
tree16042663dc2abb3b77cc289f27b01bb8803eb868
parentedc1ac1a289eab0c5ab5f0a540a00e66c01bb422 (diff)
downloadalpine-conf-2b14ec8a7101d9f6cd02d45fc4e6c211a381e669.tar.bz2
alpine-conf-2b14ec8a7101d9f6cd02d45fc4e6c211a381e669.tar.xz
setup-alpine: dont display error message if disk is 'none'
-rwxr-xr-xsetup-alpine.in6
1 files changed, 5 insertions, 1 deletions
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
+