Changeset 994

Timestamp:

Dec 17, 2016, 11:35:37 AM (9 years ago)

Author:

Herwig Bauernfeind

Message:

b4smb: Automatically detect fixed and DHCP controlled interfaces

File:

• branches/scripts/smb_init/b4smb.cmd (modified) (2 diffs)

branches/scripts/smb_init/b4smb.cmd

@@ -11 +11 @@
  */
 setupCMD = SysBootDrive()'\MPTN\BIN\Setup.CMD'
-LANx     = 'lan0' /* Check this interface for a fixed IP */
 ArchLogs =  1     /* Move previous logfiles to archive (by Yuri Dario) */
 DelLogs  =  0     /* Remove previous logfiles only */
@@ -27 +26 @@
 '@echo off'
 
-do while lines(SetupCMD) > 0 /* Check LANx interface for fixed IP address */
+do while lines(SetupCMD) > 0 /* Check interfaces for fixed IP address */
     SL = translate(linein(SetupCMD))
-    if word(SL,1) = "IFCONFIG" & word(SL,2) = translate(LANx) then do
+    if word(SL,1) = "IFCONFIG" & word(SL,2) <> "LO" then do
+        IF = word(SL,2)
         IP = word(SL,3)
-        address cmd '@ifconfig 'LANx' | rxqueue' 
-        if queued() = 2 then do
+        address cmd '@ifconfig 'IF' | rxqueue' 
+        if queued() > 1 then do
             parse pull .
-            parse pull . IPIFC .
-            if IPIFC = IP then DHCPWait = 0
+            parse pull ipline ipc rest
+            if ipc = IP then do
+                DHCPWait = 0
+                say IF': Fixed IP 'IP', valid.'
+            end
         end
+        else say IF': Fixed IP 'IP', invalid.'
     end 
+    if word(SL,1) = "DHCPSTRT" then do
+        say "DHCP for "word(SL,3)' not recommended for Samba, waiting...'
+        DHCPWait = 1
+    end
 end
 ok = stream(SetupCMD,'c','close')
+
+do while queued() > 0 
+    parse pull .
+end
 
 if ArchLogs = 1 then do /* Creative logfile archive */