diff options
| author | John Eckersberg <jeckersb@redhat.com> | 2009-10-29 14:19:26 -0400 |
|---|---|---|
| committer | John Eckersberg <jeckersb@redhat.com> | 2009-10-29 14:19:26 -0400 |
| commit | ded672ce449eb903e792de5be0fba0a3ff0c3791 (patch) | |
| tree | 2c4d50263fa1d5d1e7a60a01ecda2fda8b9d6ca7 | |
| parent | 72146649206e3c90162a10ee9d1d694c4f3f12c2 (diff) | |
| download | cobbler-ded672ce449eb903e792de5be0fba0a3ff0c3791.tar.gz cobbler-ded672ce449eb903e792de5be0fba0a3ff0c3791.tar.xz cobbler-ded672ce449eb903e792de5be0fba0a3ff0c3791.zip | |
vlanpattern exists in a few more places... fix all occurences
| -rw-r--r-- | snippets/network_config | 4 | ||||
| -rw-r--r-- | snippets/post_install_network_config | 2 | ||||
| -rw-r--r-- | snippets/pre_install_network_config | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/snippets/network_config b/snippets/network_config index 6f839dc5..7d8d31fc 100644 --- a/snippets/network_config +++ b/snippets/network_config @@ -2,7 +2,7 @@ #if $getVar("system_name","") != "" #set ikeys = $interfaces.keys() #import re - #set $vlanpattern = $re.compile("[a-zA-Z0-9]+\.[0-9]+") + #set $vlanpattern = $re.compile("[a-zA-Z0-9]+[\.:][0-9]+") ## ## Determine if we should use the MAC address to configure the interfaces first ## Only physical interfaces are required to have a MAC address @@ -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"] diff --git a/snippets/post_install_network_config b/snippets/post_install_network_config index 2970666c..0f349941 100644 --- a/snippets/post_install_network_config +++ b/snippets/post_install_network_config @@ -6,7 +6,7 @@ #set ikeys = $interfaces.keys() #set osversion = $getVar("os_version","") #import re - #set $vlanpattern = $re.compile("[a-zA-Z0-9]+\.[0-9]+") + #set $vlanpattern = $re.compile("[a-zA-Z0-9]+[\.:][0-9]+") ## Determine if we should use the MAC address to configure the interfaces first ## Only physical interfaces are required to have a MAC address ## Also determine the number of bonding devices we have, so we can set the diff --git a/snippets/pre_install_network_config b/snippets/pre_install_network_config index 5f720d38..6ffb26e7 100644 --- a/snippets/pre_install_network_config +++ b/snippets/pre_install_network_config @@ -2,7 +2,7 @@ # Start pre_install_network_config generated code #set ikeys = $interfaces.keys() #import re - #set $vlanpattern = $re.compile("[a-zA-Z0-9]+\.[0-9]+") + #set $vlanpattern = $re.compile("[a-zA-Z0-9]+[\.:][0-9]+") ## ## Determine if we should use the MAC address to configure the interfaces first ## Only physical interfaces are required to have a MAC address |