Changeset 2302

Timestamp:

11/27/19 20:03:02 (5 years ago)

Author:

nanardon

Message:

use deny booting to really lock unwant nethost

File:

• trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Task/Buildnet.pm (modified) (4 diffs)

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Task/Buildnet.pm

@@ -709 +709 @@
                        ? '# ' . $desc . "\n"
                         : '';
-                    my ($fixedparam, $label, $netLockIp) = $retainip =~ /^\d+(\.\d+){3}$/
-                        ? ('fixed-address', '', '127.0.0.1')
-                        : ('fixed-address6', '-6', '::1');
+                    my ($fixedparam, $label) = $retainip =~ /^\d+(\.\d+){3}$/
+                        ? ('fixed-address', '' )
+                        : ('fixed-address6', '-6' );
                     # If two ip are given for same protocol keep only first
                     $done{$fixedparam} and next;
@@ -719 +719 @@
                     $output .= sprintf("host %s-%s-%s%s {\n", $nethost, lc($fmac), $ZoneId, $label);
                     $output .= sprintf("    hardware ethernet %s;\n", $mac);
+                    $output .= sprintf("    $fixedparam %s;\n", $retainip)
+                            if ($retainip);
                     if ($obj->get_attributes('netLocked')) {
-                        $output .= sprintf("    $fixedparam %s;\n", $netLockIp);
-                    } else {
-                        $output .= sprintf("    $fixedparam %s;\n", $retainip)
-                            if ($retainip);
+                        $output .=     "    deny booting;"
                     }
                     $output .= "}\n\n";
@@ -804 +803 @@
                         $output .= sprintf("host %s-%s-%s {\n", $nethost, lc($fmac), $ZoneId);
                         $output .= sprintf("    hardware ethernet %s;\n", $mac);
-                        $output .= sprintf("    fixed-address 127.0.0.1;\n");
+                        $output .=         "    deny booting;"
                         $output .= "}\n\n";
                     }
@@ -810 +809 @@
                         $output .= sprintf("host %s-%s-%s {\n", $nethost, lc($fmac), $ZoneId);
                         $output .= sprintf("    hardware ethernet %s;\n", $mac);
-                        $output .= sprintf("    fixed-address6 ::1\n");
+                        $output .=         "    deny booting;"
                         $output .= "}\n\n";
                     }