[IPCop-cvs] CVS: ipcop/src/install+setup/install main.c,1.6.2.10,1.6.2.11

[Eric s. J. <esj...@us...>]

Update of /cvsroot/ipcop/ipcop/src/install+setup/install
In directory usw-pr-cvs1:/tmp/cvs-serv11780/src/install+setup/install

Modified Files:
      Tag: IPCOP_v0_1
	main.c 
Log Message:
added Eric Oberlander's NTP interface, fixed typos and bugs in dynamic DNS
handling, fixed bug in installer code.  HTTP install did not release the floppy
in time to use it for restoring IPCop configurations.


Index: main.c
===================================================================
RCS file: /cvsroot/ipcop/ipcop/src/install+setup/install/Attic/main.c,v
retrieving revision 1.6.2.10
retrieving revision 1.6.2.11
diff -C2 -d -r1.6.2.10 -r1.6.2.11
*** main.c	23 Jun 2002 22:48:21 -0000	1.6.2.10
--- main.c	30 Jun 2002 20:20:10 -0000	1.6.2.11
***************
*** 316,319 ****
--- 316,328 ----
  	}
  
+ 	/* umount cdrom mountpoint early because http install
+ 	   mounts floppy as /cdrom */
+  
+ 	if (mysystem("/sbin/umount /cdrom"))
+ 	{
+ 		errorbox(ctr[TR_UNABLE_TO_UNMOUNT_CDROM]);
+ 		goto EXIT;
+ 	}
+ 
  	/*  
  	  Allow the user to restore their configuration from a floppy.
***************
*** 385,394 ****
  		goto EXIT;
  	}
! 	
! 	if (mysystem("/sbin/umount /cdrom"))
! 	{
! 		errorbox(ctr[TR_UNABLE_TO_UNMOUNT_CDROM]);
! 		goto EXIT;
! 	}
  
  	if (installtype == CDROM_INSTALL)
--- 394,398 ----
  		goto EXIT;
  	}
! 	/* Former cdrom umount site */
  
  	if (installtype == CDROM_INSTALL)