* setup.c (main): Create an empty /var/run/utmp.

diff --git a/ChangeLog b/ChangeLog
index 800abe2269c3776615359985c49f16a69b1fface..edda44fa913994a94ac88af0238e1dba1c2c5c08 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Apr 19 13:34:44 2000  Christopher Faylor <cgf@cygnus.com>
+
+       * setup.c (main): Create an empty /var/run/utmp.
+
 Tue Apr 18 19:16:56 2000  Christopher Faylor <cgf@cygnus.com>
 
        * Makefile.in: Add umount to list of files to include in setup.exe.

diff --git a/setup.c b/setup.c
index 2cb8dd2ba27b3ebd8220a515d54baf0999a504ae..4535bf24927c2e4bb4b43f11d0a2f06b1c0ad34e 100644 (file)
--- a/setup.c
+++ b/setup.c
@@ -1163,7 +1163,8 @@ those as the basis for your installation.\n\n"
          root = prompt ("Root directory", defroot);
          if (strcmpi (root, wd) == 0)
            {
-             printf ("Please do not use the current directory as the root directory.\nYou should run setup.exe from a temporary directory.\n");
+             printf ("Please do not use the current directory as the root directory.\n"
+                     "You should run setup.exe from a temporary directory.\n");
              continue;
            }
          if (strchr (root, ' '))
@@ -1210,13 +1211,23 @@ those as the basis for your installation.\n\n"
        }
       else
        {
+         FILE *fp;
+
          _chdrive (toupper (*root) - 'A' + 1);
 
          xumount (wd, "/usr");
+         xumount (wd, "/var");
+         
          /* Make /bin point to /usr/bin and /lib point to /usr/lib. */
          mkmount (wd, root, "bin", "/usr/bin", 1);
          mkmount (wd, root, "lib", "/usr/lib", 1);
 
+         mkdirp ("var\\run");
+         /* Create /var/run/utmp */
+         fp = fopen ("var\\run\\utmp", "wb");
+         if (fp)
+           fclose (fp);
+
          files.count = NFILE_LIST;
          files.array = calloc (sizeof (char *), NFILE_LIST + NFILE_SLOP);
          files.index = -1;