diff options
| author | Michael DeHaan <mdehaan@redhat.com> | 2009-03-05 14:16:16 -0500 |
|---|---|---|
| committer | Michael DeHaan <mdehaan@redhat.com> | 2009-03-05 14:16:16 -0500 |
| commit | bb022613cd7cd9fc26bd94f017dde3300fb12448 (patch) | |
| tree | a862d04bc94baee96c02faad8d549f33b63fa21b | |
| parent | 84160a5aaa157b520cbc9de2db6852dfd1d6c736 (diff) | |
| parent | 5b6b587c98fa18a78a8e58ffeba5c0c75c34bada (diff) | |
| download | cobbler-bb022613cd7cd9fc26bd94f017dde3300fb12448.tar.gz cobbler-bb022613cd7cd9fc26bd94f017dde3300fb12448.tar.xz cobbler-bb022613cd7cd9fc26bd94f017dde3300fb12448.zip | |
Merge commit 'jcapel/devel-bugs' into devel
| -rw-r--r-- | snippets/post_install_network_config | 6 | ||||
| -rw-r--r-- | snippets/pre_install_network_config | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/snippets/post_install_network_config b/snippets/post_install_network_config index 8715e778..e6839f77 100644 --- a/snippets/post_install_network_config +++ b/snippets/post_install_network_config @@ -116,7 +116,7 @@ echo "MASTER=$bonding_master" >> $devfile ## see Red Hat bugzilla 442339 echo "HOTPLUG=no" >> $devfile #end if - #if $static.lower() == "true" or $bonding.lower() == "slave" + #if $static or $bonding.lower() == "slave" ## for static or slave interfaces #if $ip != "" and $bonding.lower() != "slave" ## Only configure static networking if an IP-address is @@ -152,7 +152,7 @@ BONDING_OPTS="$bonding_opts" EOF #end if echo "ONPARENT=yes" >> $devfile - #if $static.lower() == "true" + #if $static ## for static non-physical interfaces... #if $ip != "" ## Only configure static networking if an IP-address is @@ -186,7 +186,7 @@ echo "MASTER=$bonding_master" >> $devfile ## see Red Hat bugzilla 442339 echo "HOTPLUG=no" >> $devfile #end if - #if $static.lower() == "true" or $bonding.lower() == "slave" + #if $static or $bonding.lower() == "slave" ## for static or slave interfaces #if $ip != "" and $bonding.lower() != "slave" ## Only configure static networking if an IP-address is diff --git a/snippets/pre_install_network_config b/snippets/pre_install_network_config index daba6709..59d1cd3c 100644 --- a/snippets/pre_install_network_config +++ b/snippets/pre_install_network_config @@ -51,7 +51,7 @@ #end if #end for #end if - #if $static.lower() == "true" and $ip != "" + #if $static and $ip != "" #if $netmask == "" ## Netmask not provided, default to /24. #set $netmask = "255.255.255.0" @@ -60,7 +60,7 @@ #if $gateway != "" #set $netinfo = "%s --gateway=%s" % ($netinfo, $gateway) #end if - #else if $static.lower() == "false" + #else if not $static #set $netinfo = "--bootproto=dhcp" #else ## Skip this interface, it's set as static, but without |