On 08/09/2011 01:11 PM, Radek Vykydal wrote:
Related: rhbz#681803
Bad port from master. I can't believe how many mistakes I can make
in such a trivial patch.
Surely one more, at least non-fatal ugly indentation this time.
Fixed version attached:
>From f9129a84873854392bfcbbb54707e13328dcc233 Mon Sep 17 00:00:00 2001
From: Radek Vykydal <rvykydal@xxxxxxxxxx>
Date: Tue, 9 Aug 2011 12:48:54 +0200
Subject: [PATCH rhel6-branch] Set value of device also for ks=bootif, missing BOOTIF case (#681803).
Related: rhbz#681803
---
kickstart.py | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/kickstart.py b/kickstart.py
index bac256f..b473178 100644
--- a/kickstart.py
+++ b/kickstart.py
@@ -603,12 +603,12 @@ class NetworkData(commands.network.RHEL6_NetworkData):
else:
if self.device.lower() == "ibft":
return
- if self.device.lower() == "bootif":
- if "BOOTIF" in flags.cmdline:
- # MAC address like 01-aa-bb-cc-dd-ee-ff
- device = flags.cmdline["BOOTIF"][3:]
- device = device.replace("-",":")
- else: device = self.device
+ if self.device.lower() == "bootif" and "BOOTIF" in flags.cmdline:
+ # MAC address like 01-aa-bb-cc-dd-ee-ff
+ device = flags.cmdline["BOOTIF"][3:]
+ device = device.replace("-",":")
+ else:
+ device = self.device
# If we were given a network device name, grab the device object.
# If we were given a MAC address, resolve that to a device name
--
1.7.4
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
