diff options
| author | Christian Breunig <christian@breunig.cc> | 2023-09-02 19:02:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-02 19:02:55 +0200 |
| commit | e74b38c4d862feed7a401723c1f0b1c9d9a03324 (patch) | |
| tree | 3b7e21cb3462ce3d026b32de6e73c54faad7d98b /interface-definitions | |
| parent | 0ba723bcdbf608ba73bedbba74a8aa9be1d7df7b (diff) | |
| parent | f7473c735ab2d5b74718012cbd27a6ca38e5dfa1 (diff) | |
| download | vyos-1x-e74b38c4d862feed7a401723c1f0b1c9d9a03324.tar.gz vyos-1x-e74b38c4d862feed7a401723c1f0b1c9d9a03324.zip | |
Merge pull request #2191 from c-po/equuleus
T5428: fix DHCP client running in VRF context
Diffstat (limited to 'interface-definitions')
| -rw-r--r-- | interface-definitions/container.xml.in | 8 | ||||
| -rw-r--r-- | interface-definitions/include/interface/dhcp-options.xml.i | 1 |
2 files changed, 5 insertions, 4 deletions
diff --git a/interface-definitions/container.xml.in b/interface-definitions/container.xml.in index f092ad9bb..ec22693c9 100644 --- a/interface-definitions/container.xml.in +++ b/interface-definitions/container.xml.in @@ -110,7 +110,7 @@ <constraint> <regex>[ !#-%&(-~]+</regex> </constraint> - <constraintErrorMessage>Entrypoint must be ascii characters, use &quot; and &apos for double and single quotes respectively</constraintErrorMessage> + <constraintErrorMessage>Entrypoint must be ASCII characters, use &quot; and &apos for double and single quotes respectively</constraintErrorMessage> </properties> </leafNode> <leafNode name="host-name"> @@ -133,16 +133,16 @@ <constraint> <regex>[ !#-%&(-~]+</regex> </constraint> - <constraintErrorMessage>Command must be ascii characters, use &quot; and &apos for double and single quotes respectively</constraintErrorMessage> + <constraintErrorMessage>Command must be ASCII characters, use &quot; and &apos for double and single quotes respectively</constraintErrorMessage> </properties> </leafNode> <leafNode name="arguments"> <properties> - <help>The command's arguments for this container</help> + <help>Command arguments for this container</help> <constraint> <regex>[ !#-%&(-~]+</regex> </constraint> - <constraintErrorMessage>The command's arguments must be ascii characters, use &quot; and &apos for double and single quotes respectively</constraintErrorMessage> + <constraintErrorMessage>The command arguments must be ASCII characters, use &quot; and &apos for double and single quotes respectively</constraintErrorMessage> </properties> </leafNode> <leafNode name="memory"> diff --git a/interface-definitions/include/interface/dhcp-options.xml.i b/interface-definitions/include/interface/dhcp-options.xml.i index 5b30ca08b..b96e73497 100644 --- a/interface-definitions/include/interface/dhcp-options.xml.i +++ b/interface-definitions/include/interface/dhcp-options.xml.i @@ -42,6 +42,7 @@ <validator name="numeric" argument="--range 1-255"/> </constraint> </properties> + <defaultValue>210</defaultValue> </leafNode> <leafNode name="reject"> <properties> |