[PATCH 1/2] network: remove redundant image install guard
Vratislav Podzimek
vpodzime at redhat.com
Mon May 26 06:25:09 UTC 2014
On Fri, 2014-05-23 at 13:15 +0200, Radek Vykydal wrote:
> This is guarded at higher level in doConfiguration.
> ---
> pyanaconda/network.py | 9 +++------
> 1 file changed, 3 insertions(+), 6 deletions(-)
>
> diff --git a/pyanaconda/network.py b/pyanaconda/network.py
> index 2e473e8..4f3f140 100644
> --- a/pyanaconda/network.py
> +++ b/pyanaconda/network.py
> @@ -1029,12 +1029,9 @@ def write_network_config(storage, ksdata, instClass, rootpath):
> set_hostname(ksdata.network.hostname)
> write_sysconfig_network(rootpath, overwrite=flags.livecdInstall)
> disableIPV6(rootpath)
> - if not flags.imageInstall:
> - copyIfcfgFiles(rootpath)
> - copyDhclientConfFiles(rootpath)
> - copyFileToPath("/etc/resolv.conf", rootpath, overwrite=flags.livecdInstall)
> - # TODO the default for ONBOOT needs to be lay down
> - # before newui we didn't set it for kickstart installs
> + copyIfcfgFiles(rootpath)
> + copyDhclientConfFiles(rootpath)
> + copyFileToPath("/etc/resolv.conf", rootpath, overwrite=flags.livecdInstall)
> instClass.setNetworkOnbootDefault(ksdata)
> # NM_CONTROLLED is not mirrored in ksdata
> disableNMForStorageDevices(rootpath, storage)
These both look good to me.
--
Vratislav Podzimek
Anaconda Rider | RHCE | Red Hat, Inc. | Brno - Czech Republic
More information about the anaconda-patches
mailing list