Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.sbin/installboot Install the compatability symlink for s...



details:   https://anonhg.NetBSD.org/src/rev/10c8132ced0c
branches:  trunk
changeset: 525981:10c8132ced0c
user:      fredette <fredette%NetBSD.org@localhost>
date:      Mon Apr 22 21:11:45 2002 +0000

description:
Install the compatability symlink for sun2.
In the sun68k handler, add some sync()s to make sure we
get a coherent picture of the filesystem.  Maybe should
be in the MI filesystem code?

diffstat:

 usr.sbin/installboot/Makefile      |   4 ++--
 usr.sbin/installboot/arch/sun68k.c |  14 +++++++++++---
 2 files changed, 13 insertions(+), 5 deletions(-)

diffs (61 lines):

diff -r bbde91689688 -r 10c8132ced0c usr.sbin/installboot/Makefile
--- a/usr.sbin/installboot/Makefile     Mon Apr 22 21:10:55 2002 +0000
+++ b/usr.sbin/installboot/Makefile     Mon Apr 22 21:11:45 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.12 2002/04/22 17:17:35 lukem Exp $
+#      $NetBSD: Makefile,v 1.13 2002/04/22 21:11:45 fredette Exp $
 #
 
 PROG=  installboot
@@ -29,7 +29,7 @@
 # XXX: or /usr/mdec/installboot is replaced with a shell script that
 # XXX: tells the user to use /usr/sbin/installboot instead
 #
-COMPATLINKS?=  pmax
+COMPATLINKS?=  pmax sun2
 afterinstall:
 .for l in ${COMPATLINKS}
 .if (${MACHINE} == ${l})
diff -r bbde91689688 -r 10c8132ced0c usr.sbin/installboot/arch/sun68k.c
--- a/usr.sbin/installboot/arch/sun68k.c        Mon Apr 22 21:10:55 2002 +0000
+++ b/usr.sbin/installboot/arch/sun68k.c        Mon Apr 22 21:11:45 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sun68k.c,v 1.1 2002/04/22 17:17:36 lukem Exp $ */
+/*     $NetBSD: sun68k.c,v 1.2 2002/04/22 21:11:46 fredette Exp $ */
 
 /*-
  * Copyright (c) 1998, 2002 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
 
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: sun68k.c,v 1.1 2002/04/22 17:17:36 lukem Exp $");
+__RCSID("$NetBSD: sun68k.c,v 1.2 2002/04/22 21:11:46 fredette Exp $");
 #endif /* !__lint */
 
 #include <sys/param.h>
@@ -184,6 +184,9 @@
                goto done;
        }
 
+       /* Make sure the (probably new) secondary bootstrap is on disk. */
+       sync(); sleep(1); sync();
+
        /* Collect the blocks for the secondary bootstrap. */
        nblk = maxblk;
        if (! params->fstype->findstage2(params, &nblk, blocks))
@@ -237,8 +240,13 @@
        } else if (rv != SUN68K_BOOT_BLOCK_MAX_SIZE) {
                warnx("Writing `%s': short write", params->filesystem);
                goto done;
-       } else
+       } else {
+
+               /* Sync filesystems (to clean in-memory superblock?) */
+               sync();
+
                retval = 1;
+       }
 
  done:
        if (blocks != NULL)



Home | Main Index | Thread Index | Old Index