diff options
| author | Jeff Bilyk <jbilyk@gmail.com> | 2011-07-31 17:42:49 -0400 |
|---|---|---|
| committer | Jeff Bilyk <jbilyk@gmail.com> | 2011-07-31 17:42:49 -0400 |
| commit | baeba3f73a336b6a0e1eb9f52d518ea5b08139fb (patch) | |
| tree | 21a1a48ebc81c432099231fa0cbb71f58bfdcd5f | |
| parent | 8a611e2b78683436c13df3b3fd4115efed643918 (diff) | |
| download | alpine-conf-baeba3f73a336b6a0e1eb9f52d518ea5b08139fb.zip | |
setup-alpine: only run setup-apklub if sys disk mode wasnt selected
| -rw-r--r-- | setup-alpine.in | 4 | ||||
| -rw-r--r-- | setup-disk.in | 1 |
2 files changed, 4 insertions, 1 deletions
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 |