diff options
Diffstat (limited to 'ogcp')
| -rw-r--r-- | ogcp/views.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ogcp/views.py b/ogcp/views.py index 1c3ede7..316a817 100644 --- a/ogcp/views.py +++ b/ogcp/views.py @@ -937,15 +937,15 @@ def action_clients_import_get(): scopes=scopes) -OG_REGEX_DHCPD_CONF = (r'(?: *host *)' +OG_REGEX_DHCPD_CONF = (r'(?:\s*host\s*)' r'([\w.-]*)' - r'(?:[ \n\r]*{[ \n\r]*)' - r'(?:[ \t]*hardware *ethernet *)' + r'(?:\s*{[ \n\r]*)' + r'(?:\s*hardware *ethernet *)' r'((?:[0-9A-Fa-f]{2}[:-]){5}(?:[0-9A-Fa-f]{2}))' - r'(?: *;)' - r'(?:[ \t\n\r]*fixed-address *)' + r'(?:\s*;)' + r'(?:\s*fixed-address *)' r'(\d+\.\d+\.\d+\.\d+)' - r'(?: *;)(?:[ \r\n]*[^}]*})') + r'(?:\s*;)(?:\s*[^}]*})') OG_CLIENT_DEFAULT_BOOT = "pxe" OG_CLIENT_DEFAULT_LIVEDIR = "ogLive" OG_CLIENT_DEFAULT_MAINTENANCE = False |