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

Re: [PATCH 5/5] Simplify HWADDR removal check on s390x (#546005)



Ack.

That's perfect, thanks!

On 04/14/2010 07:02 PM, David Cantrell wrote:
> We do not want to write out HWADDR for any network device type on s390x.
> ---
>  network.py |    3 +--
>  1 files changed, 1 insertions(+), 2 deletions(-)
> 
> diff --git a/network.py b/network.py
> index 0507b0d..f1bf128 100644
> --- a/network.py
> +++ b/network.py
> @@ -244,8 +244,7 @@ class NetworkDevice(SimpleConfigFile):
>              keys.remove("DESC")
>          if "KEY" in keys:
>              keys.remove("KEY")
> -        if iutil.isS390() and ("OPTIONS" in keys) and ("HWADDR" in keys) and \
> -           (self.info["OPTIONS"].find("layer2=1") != -1):
> +        if iutil.isS390() and ("HWADDR" in keys):
>              keys.remove("HWADDR")
> 
>          for key in keys:

Steffen

Linux on System z Development

IBM Deutschland Research & Development GmbH
Vorsitzender des Aufsichtsrats: Martin Jetter
Geschäftsführung: Dirk Wittkopp
Sitz der Gesellschaft: Böblingen
Registergericht: Amtsgericht Stuttgart, HRB 243294



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