summaryrefslogtreecommitdiffstats
path: root/loader
diff options
context:
space:
mode:
authorChris Lumens <clumens@redhat.com>2009-06-03 11:28:47 -0400
committerChris Lumens <clumens@redhat.com>2009-07-02 09:52:32 -0400
commit73ad4ceea135b59d6d509b721a6eb358694e672b (patch)
tree9ed1b1e70692efd85bfc722bdeb2bf56b4d2ae74 /loader
parentac59ddaeaa3f89774ffde2a6abe5db757d94ba45 (diff)
downloadanaconda-73ad4ceea135b59d6d509b721a6eb358694e672b.tar.gz
anaconda-73ad4ceea135b59d6d509b721a6eb358694e672b.tar.xz
anaconda-73ad4ceea135b59d6d509b721a6eb358694e672b.zip
Don't unconditionally skip the network config screen in kickstart.
This means you have to provide a network line in the kickstart file if you want the network to be automatically configured, therefore bringing the network command in line with how all the other kickstart commands work.
Diffstat (limited to 'loader')
-rw-r--r--loader/net.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/loader/net.c b/loader/net.c
index 4a58c60be..d4c63906e 100644
--- a/loader/net.c
+++ b/loader/net.c
@@ -618,18 +618,16 @@ int configureTCPIP(char * device, iface_t * iface,
* noipv4 noipv6
* ip=<val> noipv6
* ipv6=<val> noipv4
- * we also skip this form for anyone doing a kickstart install
*/
if ((FL_IP_PARAM(flags) && FL_IPV6_PARAM(flags)) ||
(FL_IP_PARAM(flags) && FL_NOIPV6(flags)) ||
(FL_IPV6_PARAM(flags) && FL_NOIPV4(flags)) ||
- (FL_NOIPV4(flags) && FL_NOIPV6(flags)) ||
- (FL_IS_KICKSTART(flags))) {
+ (FL_NOIPV4(flags) && FL_NOIPV6(flags))) {
skipForm = 1;
newtPopWindow();
}
#else
- if (FL_IP_PARAM(flags) || FL_NOIPV4(flags) || FL_IS_KICKSTART(flags)) {
+ if (FL_IP_PARAM(flags) || FL_NOIPV4(flags)) {
skipForm = 1;
newtPopWindow();
}