diff options
| author | John Eckersberg <jeckersb@redhat.com> | 2009-10-29 13:46:05 -0400 |
|---|---|---|
| committer | John Eckersberg <jeckersb@redhat.com> | 2009-10-29 13:46:05 -0400 |
| commit | 72146649206e3c90162a10ee9d1d694c4f3f12c2 (patch) | |
| tree | a4b2d03bbc6a3ebb17e7b9dcb3a19f112cd7db33 | |
| parent | 34db8a7f5d1be4316f11575a49eccef7bacfab55 (diff) | |
| download | cobbler-72146649206e3c90162a10ee9d1d694c4f3f12c2.tar.gz cobbler-72146649206e3c90162a10ee9d1d694c4f3f12c2.tar.xz cobbler-72146649206e3c90162a10ee9d1d694c4f3f12c2.zip | |
Update the vlanpattern regex in the network_config snippet to allow a
colon to be used to separate the interface and vlan portion in
addition to a period. Thus this will match interfaces like "eth0:1"
in addition to the previous behavior of "eth0.100".
| -rw-r--r-- | snippets/network_config | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/snippets/network_config b/snippets/network_config index 0d86fb52..6f839dc5 100644 --- a/snippets/network_config +++ b/snippets/network_config @@ -20,7 +20,7 @@ %include /tmp/pre_install_network_config #else # Using "old" style networking config. Make sure all MAC-addresses are in cobbler to use the new-style config - #set $vlanpattern = $re.compile("[a-zA-Z0-9]+\.[0-9]+") + #set $vlanpattern = $re.compile("[a-zA-Z0-9]+(\.|:)[0-9]+") #for $iname in $ikeys #set $idata = $interfaces[$iname] #set $mac = $idata["mac_address"] |