diff options
| author | bfox <bfox> | 2001-08-02 16:41:00 +0000 |
|---|---|---|
| committer | bfox <bfox> | 2001-08-02 16:41:00 +0000 |
| commit | 8ffcd020e3724390400e13fd26dc8a1cc79474e4 (patch) | |
| tree | 6a82aa56dbc192c8e28fd424d865320ec5bb6f48 | |
| parent | 1f8224e105c5b39540f46a97c78ab9bba67e774c (diff) | |
| download | anaconda-8ffcd020e3724390400e13fd26dc8a1cc79474e4.tar.gz anaconda-8ffcd020e3724390400e13fd26dc8a1cc79474e4.tar.xz anaconda-8ffcd020e3724390400e13fd26dc8a1cc79474e4.zip | |
added an invisible step to allow the network screen to be skipped if no network devices are present
| -rw-r--r-- | dispatch.py | 2 | ||||
| -rw-r--r-- | installclass.py | 1 | ||||
| -rw-r--r-- | network.py | 6 |
3 files changed, 9 insertions, 0 deletions
diff --git a/dispatch.py b/dispatch.py index 919445442..de18dfc9b 100644 --- a/dispatch.py +++ b/dispatch.py @@ -31,6 +31,7 @@ from flags import flags from upgrade import upgradeFindPackages, upgradeMountFilesystems from upgrade import upgradeSwapSuggestion, upgradeMigrateFind from upgrade import findRootParts +from network import networkDeviceCheck # These are all of the install steps, in order. Note that upgrade and # install steps are the same thing! Upgrades skip install steps, while @@ -82,6 +83,7 @@ installSteps = [ "dir")), ("bootloader", ("dispatch", "id.bootloader", "id.fsset", "id.diskset")), ("bootloaderpassword", ("id.bootloader", "intf")), + ("networkdevicecheck", networkDeviceCheck, ("id.network", "dispatch")), ("network", ("id.network",)), ("firewall", ("id.network", "id.firewall")), ("languagesupport", ("id.langSupport",)), diff --git a/installclass.py b/installclass.py index ea0f13537..2ef84246d 100644 --- a/installclass.py +++ b/installclass.py @@ -80,6 +80,7 @@ class BaseInstallClass: "bootloadersetup", "bootloader", "bootloaderpassword", + "networkdevicecheck", "network", "firewall", "languagesupport", diff --git a/network.py b/network.py index 6d4253a47..9562b4c44 100644 --- a/network.py +++ b/network.py @@ -4,6 +4,7 @@ # Matt Wilson <ewt@redhat.com> # Erik Troan <ewt@redhat.com> # Mike Fulbright <msf@redhat.com> +# Brent Fox <bfox@redhat.com> # # Copyright 2001 Red Hat, Inc. # @@ -22,6 +23,11 @@ import socket import os from log import log +def networkDeviceCheck(network, dispatch): + devs = network.available() + if not devs: + dispatch.skipStep("network") + class NetworkDevice(SimpleConfigFile): def __str__(self): s = "" |