----Next_Part(Mon_Nov__3_09:52:53_1997)--
Content-Type: Text/Plain; charset=iso-8859-1
Content-Transfer-Encoding: quoted-printable

> > The snapshot is available from
> >
> >   ftp://ftp.ntnu.no/pub/NetBSD/i386-1.3_ALPHA/
>
> Just tried "upgrading" with this to no avail.
> Looks like any attempt to run fsck just gets a mount_ffs usage
> message.  fsck_ffs seems to work ok, so I tried
> sed 's/fsck/fsck_ffs/g' upgrade > ug
> and ran that.

OK.  This problem appears to be reported already with a suggested
fix, see PR 4384.  I've taken the proposed fix from that PR and
applied it locally to my source tree.  I've also done a minor fix
to the "upgrade" script, so that /sbin/fsck* is copied to the
mounted file system instead of only /sbin/fsck itself.  Based on
this code base I've created a new boot floppy and overwritten the
old image with the new one.  Please try the new one.

The diffs from the release branch as of Oct 30 and my source tree
are appended below.  It would be really nice if someone with CVS
commit privileges could commit this to the release branch, even
if the new sysinst program is going to supplant the old scripts
eventually.

Regards,

- H=E5vard

----Next_Part(Mon_Nov__3_09:52:53_1997)--
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

*** /usr/src/sbin/fsck/fsck.c.orig	Mon Oct 13 13:53:06 1997
--- /usr/src/sbin/fsck/fsck.c	Mon Nov  3 09:11:26 1997
***************
*** 240,244 ****
  	/* construct basename of executable and argv[0] simultaneously */
  	(void) snprintf(execbase, sizeof(execbase), "fsck_%s", vfstype);
! 	argv[0] = vfstype;
  
  	if (options) {
--- 240,244 ----
  	/* construct basename of executable and argv[0] simultaneously */
  	(void) snprintf(execbase, sizeof(execbase), "fsck_%s", vfstype);
! 	argv[0] = execbase;
  
  	if (options) {
*** /usr/src/sbin/mount/mount.c.orig	Wed Sep 17 13:13:53 1997
--- /usr/src/sbin/mount/mount.c	Mon Nov  3 09:13:11 1997
***************
*** 365,369 ****
--- 365,375 ----
  
  	argc = 0;
+ 
+ 	/* Skip assignment of argv[0] for now -- wait until below
+ 	   when we try the execs.
  	argv[argc++] = vfstype;
+ 	*/
+ 	argc++;
+ 
  	mangle(optbuf, &argc, argv);
  	argv[argc++] = spec;
***************
*** 390,393 ****
--- 396,400 ----
  			(void)snprintf(execname,
  			    sizeof(execname), "%s/mount_%s", *edir, vfstype);
+ 			argv[0] = execname;
  			execv(execname, (char * const *)argv);
  			if (errno != ENOENT)
*** /usr/src/distrib/i386/floppies/ramdisk/ramdiskbin.conf.old	Sat Oct 18 13:49:29 1997
--- /usr/src/distrib/i386/floppies/ramdisk/ramdiskbin.conf	Mon Nov  3 09:14:03 1997
***************
*** 22,30 ****
  ln sh -sh		# init invokes the shell this way
  ln test [
- ln mount_cd9660 cd9660
- ln mount_ffs ffs
- ln mount_msdos msdos
- ln mount_nfs nfs
- ln mount_kernfs kernfs
  ln reboot halt
  ln restore rrestore
--- 22,25 ----
*** /usr/src/distrib/i386/floppies/ramdisk/upgrade.tmpl.old	Wed Jun 18 13:07:43 1997
--- /usr/src/distrib/i386/floppies/ramdisk/upgrade.tmpl	Mon Nov  3 09:29:35 1997
***************
*** 172,180 ****
  
  echo	""
! echo -n	"Copying new fsck binary to your hard disk..."
  if [ ! -d /mnt/sbin ]; then
  	mkdir /mnt/sbin
  fi
! cp /sbin/fsck /mnt/sbin/fsck
  if [ $? != 0 ]; then
  	echo	"FATAL ERROR: COPY FAILED."
--- 172,180 ----
  
  echo	""
! echo -n	"Copying new fsck binaries to your hard disk..."
  if [ ! -d /mnt/sbin ]; then
  	mkdir /mnt/sbin
  fi
! $DONTDOIT cp /sbin/fsck* /mnt/sbin/
  if [ $? != 0 ]; then
  	echo	"FATAL ERROR: COPY FAILED."

----Next_Part(Mon_Nov__3_09:52:53_1997)----