summaryrefslogtreecommitdiff
path: root/setup-alpine.in
diff options
context:
space:
mode:
Diffstat (limited to 'setup-alpine.in')
-rw-r--r--setup-alpine.in7
1 files changed, 5 insertions, 2 deletions
diff --git a/setup-alpine.in b/setup-alpine.in
index 2308f88..aea9d3f 100644
--- a/setup-alpine.in
+++ b/setup-alpine.in
@@ -158,14 +158,17 @@ fi
[ -z "$SSH_CONNECTION" ] && rst_if=1
if [ -n "$INTERFACESOPTS" ]; then
- printf "$INTERFACESOPTS" | setup-interfaces -i ${rst_if:+-r}
+ if [ "$INTERFACESOPTS" != none ]; then
+ printf "$INTERFACESOPTS" | setup-interfaces -i ${rst_if:+-r}
+ fi
else
setup-interfaces ${quick:+-a} ${rst_if:+-r}
fi
# setup up dns if no dhcp was configured
-grep '^iface.*dhcp' $ROOT/etc/network/interfaces > /dev/null ||\
+if [ -f "$ROOT"/etc/network/interfaces ] && ! grep -q '^iface.*dhcp' "$ROOT"/etc/network/interfaces; then
setup-dns ${DNSOPTS}
+fi
# set root password
if [ -z "$empty_root_password" ]; then