FAQ Search Today's Posts Mark Forums Read
» Video Reviews

» Linux Archive

Linux-archive is a website aiming to archive linux email lists and to make them easily accessible for linux users/developers.


» Sponsor

» Partners

» Sponsor

Go Back   Linux Archive > Ubuntu > Ubuntu User

 
 
LinkBack Thread Tools
 
Old 08-09-2011, 11:11 AM
Radek Vykydal
 
Default Set value of device also for ks=bootif, missing BOOTIF case (#681803).

Related: rhbz#681803

Bad port from master. I can't believe how many mistakes I can make
in such a trivial patch.

---
kickstart.py | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/kickstart.py b/kickstart.py
index bac256f..080eae9 100644
--- a/kickstart.py
+++ b/kickstart.py
@@ -603,8 +603,7 @@ class NetworkData(commands.network.RHEL6_NetworkData):
else:
if self.device.lower() == "ibft":
return
- if self.device.lower() == "bootif":
- if "BOOTIF" in flags.cmdline:
+ 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("-",":")
--
1.7.4

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@redhat.com
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
 
Old 08-09-2011, 11:22 AM
Radek Vykydal
 
Default Set value of device also for ks=bootif, missing BOOTIF case (#681803).

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@redhat.com>
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@redhat.com
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
 
Old 08-09-2011, 11:24 AM
Martin Gracik
 
Default Set value of device also for ks=bootif, missing BOOTIF case (#681803).

ack

On Tue, 2011-08-09 at 13:22 +0200, Radek Vykydal wrote:
> 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:
>
> _______________________________________________
> Anaconda-devel-list mailing list
> Anaconda-devel-list@redhat.com
> https://www.redhat.com/mailman/listinfo/anaconda-devel-list

--
Martin Gracik <mgracik@redhat.com>

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

Thread Tools




All times are GMT. The time now is 02:43 AM.

VBulletin, Copyright ©2000 - 2014, Jelsoft Enterprises Ltd.
Content Relevant URLs by vBSEO ©2007, Crawlability, Inc.
Copyright 2007 - 2008, www.linux-archive.org