Created
          December 5, 2012 23:33 
        
      - 
      
- 
        Save robinbowes/4220508 to your computer and use it in GitHub Desktop. 
  
    
      This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
      Learn more about bidirectional Unicode characters
    
  
  
    
  | --- pre_install_network_config.orig 2012-12-06 00:05:26.934919988 +0000 | |
| +++ pre_install_network_config 2012-12-06 00:02:07.705104070 +0000 | |
| @@ -84,7 +84,8 @@ | |
| #end if | |
| #end for | |
| #end if | |
| - #if $static and $ip != "" | |
| + #if $static == "True" | |
| + #if $ip != "" | |
| #if $netmask == "" | |
| ## Netmask not provided, default to /24. | |
| #set $netmask = "255.255.255.0" | |
| @@ -96,14 +97,16 @@ | |
| #if $len($name_servers) > 0 | |
| #set $netinfo = "%s --nameserver=%s" % ($netinfo, $name_servers[0]) | |
| #end if | |
| - #else if not $static | |
| - #set $netinfo = "--bootproto=dhcp" | |
| #else | |
| ## Skip this interface, it's set as static, but without | |
| ## networking info. | |
| # Skipping (no configuration)... | |
| #continue | |
| #end if | |
| + #else | |
| + ## use DHCP | |
| + #set $netinfo = "--bootproto=dhcp" | |
| + #end if | |
| #if $hostname != "" | |
| #set $netinfo = "%s --hostname=%s" % ($netinfo, $hostname) | |
| #end if | 
  
    Sign up for free
    to join this conversation on GitHub.
    Already have an account?
    Sign in to comment