Changeset 2299 for trunk/LATMOS-Accounts/lib/LATMOS
- Timestamp:
- 11/26/19 16:21:33 (5 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Task/Buildnet.pm
r2186 r2299 645 645 my $output = ''; 646 646 647 my $ZoneId = sprintf('%04x', $outzone->get_attributes('ikey')); 648 647 649 my @net; 648 650 if ($outzone->get_attributes('net')) { … … 715 717 my $fmac = $mac; 716 718 $fmac =~ s/://g; 717 $output .= sprintf("host %s-%s %s {\n", $nethost, lc($fmac), $label);719 $output .= sprintf("host %s-%s-%s%s {\n", $nethost, lc($fmac), $ZoneId, $label); 718 720 $output .= sprintf(" hardware ethernet %s;\n", $mac); 719 721 if ($obj->get_attributes('netLocked')) { … … 800 802 801 803 if ($ipv4) { 802 $output .= sprintf("host %s-%s {\n", $nethost, lc($fmac));804 $output .= sprintf("host %s-%s-%s {\n", $nethost, lc($fmac), $ZoneId); 803 805 $output .= sprintf(" hardware ethernet %s;\n", $mac); 804 806 $output .= sprintf(" fixed-address 127.0.0.1;\n"); … … 806 808 } 807 809 if ($ipv6) { 808 $output .= sprintf("host %s-%s {\n", $nethost, lc($fmac));810 $output .= sprintf("host %s-%s-%s {\n", $nethost, lc($fmac), $ZoneId); 809 811 $output .= sprintf(" hardware ethernet %s;\n", $mac); 810 812 $output .= sprintf(" fixed-address6 ::1\n"); … … 812 814 } 813 815 } else { 814 $output .= sprintf("host %s-%s {\n", $nethost, lc($fmac));816 $output .= sprintf("host %s-%s-%s {\n", $nethost, lc($fmac), $ZoneId); 815 817 $output .= sprintf(" hardware ethernet %s;\n", $mac); 816 818 $output .= "}\n\n";
Note: See TracChangeset
for help on using the changeset viewer.