Merge remote-tracking branch 'qubesos/pr/73'

* qubesos/pr/73:
  Fixed regexp for MAC address in qvm-prefs

Fixes QubesOS/qubes-issues#1270
This commit is contained in:
Marek Marczykowski-Górecki 2016-11-25 03:01:21 +01:00
commit 02d8f273f2
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724

View File

@ -196,7 +196,7 @@ def set_mac(vms, vm, args):
print >> sys.stderr, "Missing MAC argument!"
return False
if not re.match("[0-9a-fA-F]{2}(:[0-9a-fA-F]{2}){5}|auto", args[0]):
if not re.match("[0-9a-fA-F]{2}(:[0-9a-fA-F]{2}){5}$|auto$", args[0]):
print >> sys.stderr, "Invalid MAC argument!"
print >> sys.stderr, "Possible values:"
print >> sys.stderr, "1) auto"