From: Josip Rodin <joy@CNZGRIJRL.carpriv.carnet.hr>
Date: Sat, 31 Oct 2009 17:05:24 +0000 (+0100)
Subject: korekcija canonical ifconfig(8) sintakse; maknuo FreeBSD komentare za smanjenje nepot... 
X-Git-Url: https://git.entuzijast.net/?a=commitdiff_plain;h=c840c42e2b2cd9062ec261421fee4afb92ba8bb1;p=imunes.git

korekcija canonical ifconfig(8) sintakse; maknuo FreeBSD komentare za smanjenje nepotrebnog diffa s originalom
---

diff --git a/linux/host.tcl b/linux/host.tcl
index 1116688..df276a7 100755
--- 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 6bd210c..3d123e9 100755
--- 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"
 	    }
     }