Changeset 993 for branches

Timestamp:

Dec 16, 2016, 5:59:30 PM (9 years ago)

Author:

Herwig Bauernfeind

Message:

b4smb: Fix Ticket #278

File:

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

branches/scripts/smb_init/b4smb.cmd

@@ -2 +2 @@
   Samba Server for eComStation (OS/2) tools
   
-  (c) 2007-2015 Herwig Bauernfeind for bww bitwise works GmbH.
+  (c) 2007-2016 Herwig Bauernfeind for bww bitwise works GmbH.
   Script:  B4SMB.CMD, requires REXX.
   Purpose: This script is executed before the Samba daemons are actually 
@@ -10 +10 @@
   Syntax:  No parameters.
  */
-
-ArchLogs =  1 /* Move previous logfiles to archive (by Yuri Dario) */
-DelLogs  =  0 /* Remove previous logfiles only */
-KeepGens = 10 /* Keep last 10 generations of log files, 0 = all */
-SaveCfg  =  1 /* Save a snapshot of the current Samba configuration */
-DelTDBs  =  1 /* Remove transient .tdb files */
-DHCPWait =  1 /* wait until an address was obtained by the DHCP server */
+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 */
+KeepGens = 10     /* Keep last 10 generations of log files, 0 = all */
+SaveCfg  =  1     /* Save a snapshot of the current Samba configuration */
+DelTDBs  =  1     /* Remove transient .tdb files */
+DHCPWait =  1     /* wait until an address was obtained by the DHCP server */
 
 /* Setup places */
@@ -25 +26 @@
 
 '@echo off'
+
+do while lines(SetupCMD) > 0 /* Check LANx interface for fixed IP address */
+    SL = translate(linein(SetupCMD))
+    if word(SL,1) = "IFCONFIG" & word(SL,2) = translate(LANx) then do
+        IP = word(SL,3)
+        address cmd '@ifconfig 'LANx' | rxqueue' 
+        if queued() = 2 then do
+            parse pull .
+            parse pull . IPIFC .
+            if IPIFC = IP then DHCPWait = 0
+        end
+    end 
+end
+ok = stream(SetupCMD,'c','close')
 
 if ArchLogs = 1 then do /* Creative logfile archive */
@@ -78 +93 @@
     ok = SysFileDelete(SMB_LOCK||'\wins.dat')
     /* Do not remove wins.tdb unless it is damaged */
-    ok = SysFileDelete(SMB_LOCK||'\wins.tdb')
+    /* ok = SysFileDelete(SMB_LOCK||'\wins.tdb') */
 end