diff options
| author | Radek Vykydal <rvykydal@redhat.com> | 2011-02-17 11:24:21 +0100 |
|---|---|---|
| committer | Radek Vykydal <rvykydal@redhat.com> | 2011-03-02 13:21:43 +0100 |
| commit | f83d62276ff7ebbe78705cff040d2d77f59fd1ee (patch) | |
| tree | 29b6da002f5f37fe6f31bfb6f644b08b6f3967a5 /loader | |
| parent | 4c63f9622650051b9320d6c70ed0bde73145d9b8 (diff) | |
Always activate first kickstart network device
Port from rhel6-branch.
Resolves: rhbz#668395
No matter whether it has the new --activate flag set.
For network installs restores common rhel 5 and master behaviour.
For non-network installs it restores master's behaviour
which is to activate the device. Rhel 5 behaviour (don't
bring the device up for non-network installs) will be
restored by following patch.
Diffstat (limited to 'loader')
| -rw-r--r-- | loader/kickstart.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/loader/kickstart.c b/loader/kickstart.c index ff4dd6c6a..bb502b108 100644 --- a/loader/kickstart.c +++ b/loader/kickstart.c @@ -856,7 +856,8 @@ static void setKickstartNetwork(struct loaderData_s * loaderData, PyObject *hand } attr = getObject(ele, "activate", 0); - if (isTrue(attr)) { + /* Always activate first network command device (RHEL 5 behaviour) */ + if (isTrue(attr) || !i) { logMessage(INFO, "activating because --activate flag is set"); activateDevice(loaderData, &iface); } else { |