Subject: Installer fixes
To: port-mac68k Mailing List <port-mac68k@NetBSD.ORG>
From: Colin Wood <cwood@ichips.intel.com>
List: port-mac68k
Date: 10/03/1997 22:41:45
Attached are two patches to the Installer source.  the first should fix
the PR just filed noting that a Make Devices creates

/dev/ptyp[10-15]
/dev/ttyp[10-15]

instead of

/dev/ptyp[a-f]
/dev/ttyp[a-f]

I had thought it would be an sprintf, but it's simply a table with a
simply fix :-)

The second patch changes the 'fstab' command to output filesystems as type
'ffs' instead of the older type 'ufs'.  Another thoughtless fix.  Would
someone responsible for the Installer (Steve?) please take a look at these
and integrate them?

In a related note, is there any reason that the paging code for the
Minishell's 'more' and 'dir' commands has been disabled?  If this wasn't
causing a bug, could it be re-enabled?  I kinda miss this feature those
few times that I use the Installer.

Thanks.

-- 
Colin Wood                                 cwood@ichips.intel.com
Component Design Engineer - MD6                 Intel Corporation
-----------------------------------------------------------------
I speak only on my own behalf, not for my employer.

*** device_init.c.orig	Fri Oct  3 22:30:53 1997
--- device_init.c	Fri Oct  3 22:30:01 1997
***************
*** 176,193 ****
  { "./dev/ptyp8",	'c',  5,  8, 0666, root, wheel },
  { "./dev/ttyp9",	'c',  4,  9, 0666, root, wheel },
  { "./dev/ptyp9",	'c',  5,  9, 0666, root, wheel },
! { "./dev/ttyp10",	'c',  4, 10, 0666, root, wheel },
! { "./dev/ptyp10",	'c',  5, 10, 0666, root, wheel },
! { "./dev/ttyp11",	'c',  4, 11, 0666, root, wheel },
! { "./dev/ptyp11",	'c',  5, 11, 0666, root, wheel },
! { "./dev/ttyp12",	'c',  4, 12, 0666, root, wheel },
! { "./dev/ptyp12",	'c',  5, 12, 0666, root, wheel },
! { "./dev/ttyp13",	'c',  4, 13, 0666, root, wheel },
! { "./dev/ptyp13",	'c',  5, 13, 0666, root, wheel },
! { "./dev/ttyp14",	'c',  4, 14, 0666, root, wheel },
! { "./dev/ptyp14",	'c',  5, 14, 0666, root, wheel },
! { "./dev/ttyp15",	'c',  4, 15, 0666, root, wheel },
! { "./dev/ptyp15",	'c',  5, 15, 0666, root, wheel },
  { "./dev/grf0",		'c', 10,  0, 0666, root, wheel },
  { "./dev/grf1",		'c', 10,  1, 0666, root, wheel },
  { "./dev/adb",		'c', 23,  0, 0666, root, wheel },
--- 176,193 ----
  { "./dev/ptyp8",	'c',  5,  8, 0666, root, wheel },
  { "./dev/ttyp9",	'c',  4,  9, 0666, root, wheel },
  { "./dev/ptyp9",	'c',  5,  9, 0666, root, wheel },
! { "./dev/ttypa",	'c',  4, 10, 0666, root, wheel },
! { "./dev/ptypa",	'c',  5, 10, 0666, root, wheel },
! { "./dev/ttypb",	'c',  4, 11, 0666, root, wheel },
! { "./dev/ptypb",	'c',  5, 11, 0666, root, wheel },
! { "./dev/ttypc",	'c',  4, 12, 0666, root, wheel },
! { "./dev/ptypc",	'c',  5, 12, 0666, root, wheel },
! { "./dev/ttypd",	'c',  4, 13, 0666, root, wheel },
! { "./dev/ptypd",	'c',  5, 13, 0666, root, wheel },
! { "./dev/ttype",	'c',  4, 14, 0666, root, wheel },
! { "./dev/ptype",	'c',  5, 14, 0666, root, wheel },
! { "./dev/ttypf",	'c',  4, 15, 0666, root, wheel },
! { "./dev/ptypf",	'c',  5, 15, 0666, root, wheel },
  { "./dev/grf0",		'c', 10,  0, 0666, root, wheel },
  { "./dev/grf1",		'c', 10,  1, 0666, root, wheel },
  { "./dev/adb",		'c', 23,  0, 0666, root, wheel },

*** main.c.orig	Fri Oct  3 22:33:01 1997
--- main.c	Fri Oct  3 22:34:22 1997
***************
*** 593,599 ****
  	for (i=0 ; i<num_alice_mounts ; i++) {
  		/* Skip anything on /mnt... */
  		if (strncmp(alice_mounts[i].mount_point, "/mnt", 4) != 0) {
! 			sprintf(b, "%s\t%s\tufs\trw 1 %d\n", alice_mounts[i].dev,
  					alice_mounts[i].mount_point, order++);
  			if ( alice_write(fd, b, strlen(b)) != strlen(b) ) {
  				alice_perror("writing to etc/fstab.\n");
--- 593,599 ----
  	for (i=0 ; i<num_alice_mounts ; i++) {
  		/* Skip anything on /mnt... */
  		if (strncmp(alice_mounts[i].mount_point, "/mnt", 4) != 0) {
! 			sprintf(b, "%s\t%s\tffs\trw 1 %d\n", alice_mounts[i].dev,
  					alice_mounts[i].mount_point, order++);
  			if ( alice_write(fd, b, strlen(b)) != strlen(b) ) {
  				alice_perror("writing to etc/fstab.\n");