diff options
| author | Christian Poessinger <christian@poessinger.com> | 2019-08-07 11:56:37 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2019-08-07 11:58:17 +0200 |
| commit | 5d9f2b33059bf314cb3e400139066e2024200c31 (patch) | |
| tree | 4ec2be88b3fdce4710168659bafaec5070c92f10 | |
| parent | 445c615c4919e2b042c9f2f1b9b4a10194c23dd7 (diff) | |
| download | vyos-1x-5d9f2b33059bf314cb3e400139066e2024200c31.tar.gz vyos-1x-5d9f2b33059bf314cb3e400139066e2024200c31.zip | |
Validator: rename cidr -> ip-cidr to match existing patterns
| -rw-r--r-- | interface-definitions/interfaces-bridge.xml | 2 | ||||
| -rw-r--r-- | interface-definitions/interfaces-wireguard.xml | 2 | ||||
| -rwxr-xr-x | src/validators/cidr | 3 | ||||
| -rwxr-xr-x | src/validators/ip-cidr | 3 |
4 files changed, 5 insertions, 5 deletions
diff --git a/interface-definitions/interfaces-bridge.xml b/interface-definitions/interfaces-bridge.xml index 93f374c80..d20582849 100644 --- a/interface-definitions/interfaces-bridge.xml +++ b/interface-definitions/interfaces-bridge.xml @@ -39,7 +39,7 @@ <description>Dynamic Host Configuration Protocol for IPv6</description> </valueHelp> <constraint> - <validator name="cidr"/> + <validator name="ip-cidr"/> <regex>(dhcp|dhcpv6)</regex> </constraint> <multi/> diff --git a/interface-definitions/interfaces-wireguard.xml b/interface-definitions/interfaces-wireguard.xml index c0102ea54..284a2e643 100644 --- a/interface-definitions/interfaces-wireguard.xml +++ b/interface-definitions/interfaces-wireguard.xml @@ -20,7 +20,7 @@ <properties> <help>IP address</help> <constraint> - <validator name="cidr"/> + <validator name="ip-cidr"/> </constraint> <valueHelp> <format>ipv4net</format> diff --git a/src/validators/cidr b/src/validators/cidr deleted file mode 100755 index 815aa8ba1..000000000 --- a/src/validators/cidr +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -ipaddrcheck --is-any-cidr $1 diff --git a/src/validators/ip-cidr b/src/validators/ip-cidr new file mode 100755 index 000000000..987bf84ca --- /dev/null +++ b/src/validators/ip-cidr @@ -0,0 +1,3 @@ +#!/bin/sh + +ipaddrcheck --is-any-cidr $1 |