Re: [PATCH] Do not raise UI dialog in stage2 if network is set in ks (#487503).

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



> diff --git a/kickstart.py b/kickstart.py
> index 3088666..60a138f 100644
> --- a/kickstart.py
> +++ b/kickstart.py
> @@ -578,6 +578,14 @@ class Network(commands.network.F8_Network):
>          if nd.gateway != "":
>              self.handler.id.network.setGateway(nd.gateway, device)
>  
> +        needs_net = (self.handler.anaconda.methodstr.startswith("http:") or
> +                     self.handler.anaconda.methodstr.startswith("ftp:") or
> +                     self.handler.anaconda.methodstr.startswith("nfs:"))
> +        if needs_net and not network.hasActiveNetDev():
> +            log.info("Bringing up network in stage2 kickstart ...")
> +            rc = self.handler.anaconda.id.network.bringUp()
> +            log.info("Network setup %s" % (rc and 'succeeded' or 'failed',))
> +
>          return nd
>  
>  class MultiPath(commands.multipath.FC6_MultiPath):

One minor nitpick - there are a couple reasons where you can end up with
methodstr = None, so your needs_net test should first check for "if
self.handler.anaconda.methodstr and ...".

- Chris

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list

[Index of Archives]     [Kickstart]     [Fedora Users]     [Fedora Legacy List]     [Fedora Maintainers]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [Yosemite Photos]     [KDE Users]     [Fedora Tools]
  Powered by Linux