looks good
On Wed, 2011-10-05 at 13:14 +0200, Radek Vykydal wrote:
> NM assumes this default but network service (initscripts) won't start
> the device without the BOOTPROTO value set.
> ---
> loader/net.c | 2 ++
> pyanaconda/gui.py | 2 --
> pyanaconda/network.py | 5 -----
> 3 files changed, 2 insertions(+), 7 deletions(-)
>
> diff --git a/loader/net.c b/loader/net.c
> index db564ce..f8843c5 100644
> --- a/loader/net.c
> +++ b/loader/net.c
> @@ -1200,6 +1200,8 @@ int writeDisabledIfcfgFile(char *device) {
> fprintf(fp, "HWADDR=%s\n", iface_mac2str(device));
> fprintf(fp, "ONBOOT=no\n");
> fprintf(fp, "NM_CONTROLLED=no\n");
> + /* default for network service, NM assumes it */
> + fprintf(fp, "BOOTPROTO=dhcp\n");
>
> if (fclose(fp) == EOF) {
> return 3;
> diff --git a/pyanaconda/gui.py b/pyanaconda/gui.py
> index a8c28bd..a1d8613 100755
> --- a/pyanaconda/gui.py
> +++ b/pyanaconda/gui.py
> @@ -925,8 +925,6 @@ class InstallInterface(InstallInterfaceBase):
>
> # update ifcfg files for nm-c-e
> self.anaconda.network.setNMControlledDevices(nm_controlled_devices)
> - if not just_setup:
> - self.anaconda.network.presetDefaultConfiguration([install_device])
>
> # we might want to do this only once
> if self.anaconda.network.hasWirelessDev():
> diff --git a/pyanaconda/network.py b/pyanaconda/network.py
> index 5f3a225..581ea72 100644
> --- a/pyanaconda/network.py
> +++ b/pyanaconda/network.py
> @@ -565,11 +565,6 @@ class Network:
> else:
> device.set(('ONBOOT', 'yes'))
>
> - def presetDefaultConfiguration(self, devices=None):
> - for devname, device in self.netdevices.items():
> - if not devices or devname in devices:
> - device.set(('BOOTPROTO', 'dhcp'))
> -
> def getOnbootControlledIfaces(self):
> ifaces = []
> for iface, device in self.netdevices.items():
--
Martin Gracik <mgracik@xxxxxxxxxx>
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
