diff options
| author | Michael DeHaan <mdehaan@redhat.com> | 2008-07-22 12:08:54 -0400 |
|---|---|---|
| committer | Michael DeHaan <mdehaan@redhat.com> | 2008-07-22 12:08:54 -0400 |
| commit | d7f1f47302fff68f2651aa3491176a3fa572e03c (patch) | |
| tree | 1d8bc0ba2e4b69421e293d10a85aca36cdbd3d0e | |
| parent | 738e9624c60631ed2f0068f48ab42c96a3887a57 (diff) | |
| download | cobbler-d7f1f47302fff68f2651aa3491176a3fa572e03c.tar.gz cobbler-d7f1f47302fff68f2651aa3491176a3fa572e03c.tar.xz cobbler-d7f1f47302fff68f2651aa3491176a3fa572e03c.zip | |
Merge findks fix from master
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | cobbler/services.py | 4 |
2 files changed, 3 insertions, 2 deletions
@@ -11,6 +11,7 @@ Patches and other contributions from: David Brown <dmlb2000@gmail.com> James Bowes <jbowes@redhat.com> James Cammarata <jimi@sgnx.net> + Carsten Clasohm <cclasohm@redhat.com> C. Daniel Chase <dan@cdchase.com> Dave Hatton <dave@davehatton.it> Máirín Duffy <duffy@redhat.com> diff --git a/cobbler/services.py b/cobbler/services.py index 5d428cc9..bd787559 100644 --- a/cobbler/services.py +++ b/cobbler/services.py @@ -102,7 +102,7 @@ class CobblerSvc(object): # FIXME: will not key off other NICs, problem? mac = macinput.split()[1].strip() else: - macinput = "None" + mac = "None" ip = rest["REMOTE_ADDR"] @@ -110,7 +110,7 @@ class CobblerSvc(object): for x in systems: for y in x["interfaces"]: - if x["interfaces"][y]["mac_address"].lower() == macinput.lower(): + if x["interfaces"][y]["mac_address"].lower() == mac.lower(): candidates.append(x) if len(candidates) == 0: |