diff options
| author | Dieter Plaetinck <dieter@plaetinck.be> | 2009-08-01 21:32:02 +0200 |
|---|---|---|
| committer | Dieter Plaetinck <dieter@plaetinck.be> | 2009-08-01 21:32:02 +0200 |
| commit | 985105effdc8c7d80ad9592cf13ff245e71ef826 (patch) | |
| tree | 8bac18025a471535529d148d7b402169fee2d985 /src/core/procedures/base | |
| parent | c70a4c92c554ccca13edcb60b15e12af56d13f60 (diff) | |
ask to export network settings to target system just before configuring system, also track network settings possibly done in a separate process and misc cleanups/fixes
Diffstat (limited to 'src/core/procedures/base')
| -rw-r--r-- | src/core/procedures/base | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/core/procedures/base b/src/core/procedures/base index 47ebd8a..362afa1 100644 --- a/src/core/procedures/base +++ b/src/core/procedures/base @@ -164,8 +164,10 @@ worker_auto_fstab () worker_auto_network () { - [ "$S_DHCP" = 1 ] && target_configure_network dhcp "$PROXY_HTTP" "$PROXY_FTP" - [ "$S_DHCP" != 1 ] && target_configure_network fixed "$PROXY_HTTP" "$PROXY_FTP" + [ "$S_DHCP" = 1 ] && target_configure_network dhcp "$PROXY_HTTP" "$PROXY_FTP" && return 0 + [ "$S_DHCP" = 0 ] && target_configure_network fixed "$PROXY_HTTP" "$PROXY_FTP" && return 0 + [ "$S_DHCP" != 1 -a "$S_DHCP" != 0 ] && return 0 + return 1 } |