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