korekcija canonical ifconfig(8) sintakse; maknuo FreeBSD komentare za smanjenje nepot...

diff --git a/linux/host.tcl b/linux/host.tcl
index 1116688f2b0f96d5ba56b1122e9afedea9151f80..df276a7fce45232cd3dc191ad1d2044e82433aeb 100755 (executable)
--- a/linux/host.tcl
+++ b/linux/host.tcl
@@ -86,11 +86,11 @@ proc $MODULE.cfggen { node } {
     foreach ifc [ifcList $node] {
        set addr [getIfcIPv4addr $node $ifc]
            if { $addr != "" } {
-               lappend cfg "ifconfig $ifc inet $addr"
+               lappend cfg "ifconfig $ifc inet add $addr"
            }
            set addr [getIfcIPv6addr $node $ifc]
            if { $addr != "" } {
-               lappend cfg "ifconfig $ifc add $addr"
+               lappend cfg "ifconfig $ifc inet6 add $addr"
            }
     }
 
@@ -104,24 +104,11 @@ proc $MODULE.cfggen { node } {
            lappend cfg "ip -6 route add [lindex $statrte 0] via [lindex $statrte 1]"
     }
 
-    # Temporary fix to enable multiple inetd and rpcbind processes 
+    # FreeBSD needs a temporary fix to enable multiple inetd and rpcbind processes 
     # (in different vimages). Sholud be removed if each vimage is running
     # in separate file system.
-
     # In Linux/OpenVZ each node is indeed running in a separate file system.
 
-    #
-    # Before startup ...
-#    lappend cfg "rm -f /var/run/inetd.pid" 
-#    lappend cfg "rm -f /var/run/rpcbind.lock" 
-
-#    lappend cfg "rpcbind"
-#    lappend cfg "inetd"
-
-    # ... and after startup.
-#    lappend cfg "rm -f /var/run/inetd.pid" 
-#    lappend cfg "rm -f /var/run/rpcbind.lock" 
-
     return $cfg
 }
 

diff --git a/linux/pc.tcl b/linux/pc.tcl
index 6bd210cf455b74431cfd38c1494a1af2af9a93d5..3d123e9f190691cb7c38e7f6ce2f4e38ff41953a 100755 (executable)
--- a/linux/pc.tcl
+++ b/linux/pc.tcl
@@ -83,11 +83,11 @@ proc $MODULE.cfggen { node } {
     foreach ifc [ifcList $node] {
        set addr [getIfcIPv4addr $node $ifc]
            if { $addr != "" } {
-               lappend cfg "ifconfig $ifc inet $addr"
+               lappend cfg "ifconfig $ifc inet add $addr"
            }
            set addr [getIfcIPv6addr $node $ifc]
            if { $addr != "" } {
-               lappend cfg "ifconfig $ifc add $addr"
+               lappend cfg "ifconfig $ifc inet6 add $addr"
            }
     }