Index: dos.c =================================================================== RCS file: /home/ncvs/src/release/sysinstall/Attic/dos.c,v retrieving revision 1.23 diff -u -r1.23 dos.c --- dos.c 28 Aug 1999 01:34:12 -0000 1.23 +++ dos.c 14 Jul 2002 14:00:39 -0000 @@ -50,7 +50,6 @@ #undef MSDOSFS static Boolean DOSMounted; -static char mountpoint[] = "/dist"; Boolean mediaInitDOS(Device *dev) Index: floppy.c =================================================================== RCS file: /home/ncvs/src/release/sysinstall/Attic/floppy.c,v retrieving revision 1.34.2.1 diff -u -r1.34.2.1 floppy.c --- floppy.c 4 Jul 2000 12:33:56 -0000 1.34.2.1 +++ floppy.c 14 Jul 2002 14:00:39 -0000 @@ -56,7 +56,6 @@ static Boolean floppyMounted; char *distWanted; -static char mountpoint[] = "/dist"; Boolean mediaInitFloppy(Device *dev) Index: globals.c =================================================================== RCS file: /home/ncvs/src/release/sysinstall/Attic/globals.c,v retrieving revision 1.24.2.2 diff -u -r1.24.2.2 globals.c --- globals.c 26 Oct 2001 08:26:34 -0000 1.24.2.2 +++ globals.c 14 Jul 2002 14:00:39 -0000 @@ -35,12 +35,14 @@ */ #include "sysinstall.h" +#include /* * Various global variables and an initialization hook to set them to * whatever values we feel are appropriate. */ +char mountpoint[MAXPATHLEN]; /* Where the dist set is mounted */ int DebugFD; /* Where diagnostic output goes */ Boolean Fake; /* Only pretend to be useful */ Boolean RunningAsInit; /* Are we running as init? */ @@ -70,4 +72,5 @@ VarHead = NULL; mediaDevice = NULL; RunningAsInit = FALSE; + strlcpy(mountpoint, "/dist", 6); } Index: main.c =================================================================== RCS file: /home/ncvs/src/release/sysinstall/Attic/main.c,v retrieving revision 1.57.2.8 diff -u -r1.57.2.8 main.c --- main.c 17 Jan 2002 21:43:35 -0000 1.57.2.8 +++ main.c 14 Jul 2002 14:01:08 -0000 @@ -37,6 +37,8 @@ #include "sysinstall.h" #include #include +#include +#include const char *StartName; /* Initial contents of argv[0] */ @@ -152,6 +154,7 @@ while (1) { choice = scroll = curr = max = 0; dmenuOpen(&MenuInitial, &choice, &scroll, &curr, &max, TRUE); + unmount(mountpoint, MNT_FORCE); if (getpid() != 1 #ifdef __alpha__ || !msgNoYes("Are you sure you wish to exit? The system will halt.") Index: nfs.c =================================================================== RCS file: /home/ncvs/src/release/sysinstall/Attic/nfs.c,v retrieving revision 1.21.2.1 diff -u -r1.21.2.1 nfs.c --- nfs.c 22 Jul 2001 13:50:20 -0000 1.21.2.1 +++ nfs.c 14 Jul 2002 14:00:39 -0000 @@ -42,7 +42,6 @@ #include Boolean NFSMounted; -static char mountpoint[] = "/dist"; Boolean mediaInitNFS(Device *dev) Index: sysinstall.h =================================================================== RCS file: /home/ncvs/src/release/sysinstall/Attic/sysinstall.h,v retrieving revision 1.186.2.28 diff -u -r1.186.2.28 sysinstall.h --- sysinstall.h 2 Jun 2002 13:26:36 -0000 1.186.2.28 +++ sysinstall.h 14 Jul 2002 14:00:39 -0000 @@ -37,6 +37,7 @@ #ifndef _SYSINSTALL_H_INCLUDE #define _SYSINSTALL_H_INCLUDE +#include #include #include #include @@ -354,6 +355,7 @@ /*** Externs ***/ +extern char mountpoint[MAXPATHLEN]; /* Where the dist media is mounted */ extern jmp_buf BailOut; /* Used to get the heck out */ extern int DebugFD; /* Where diagnostic output goes */ extern Boolean Fake; /* Don't actually modify anything - testing */