bin/66984: patch: teach sysinstall about larger disks

[Michael Haro]

The following reply was made to PR bin/66984; it has been noted by GNATS.

From: Michael Haro <mharo at bitsurf.net>
To: freebsd-gnats-submit at FreeBSD.org, edwin at mavetju.org
Cc:  
Subject: Re: bin/66984: patch: teach sysinstall about larger disks
Date: Tue, 24 Aug 2004 14:49:49 -0700

 It appears that most of this patch has already been implemented in -CURRENT.
 
 Attached is a diff to -CURRENT to correct a display problem I'm seeing with
 sysinstall on my system.  I'm not sure how correct it is so it definately
 needs to be reviewed by someone.
 
 Michael
 
 Index: disks.c
 ===================================================================
 RCS file: /home/ncvs/src/usr.sbin/sysinstall/disks.c,v
 retrieving revision 1.152
 diff -u -r1.152 disks.c
 --- disks.c	2 Aug 2004 23:18:48 -0000	1.152
 +++ disks.c	24 Aug 2004 21:37:59 -0000
 @@ -121,7 +121,7 @@
  #ifdef PC98
      if (d->bios_cyl >= 65536 || d->bios_hd > 16 || d->bios_sect >= 256) {
  #else
 -    if (d->bios_cyl > 65536 || d->bios_hd > 256 || d->bios_sect >= 64) {
 +    if (d->bios_cyl > 262144 || d->bios_hd > 256 || d->bios_sect >= 64) {
  #endif
  	dialog_clear_norefresh();
  	msgConfirm("WARNING:  A geometry of %lu/%lu/%lu for %s is incorrect.  Using\n"
 @@ -167,8 +167,8 @@
  	}
  	if (i == current_chunk)
  	    attrset(ATTR_SELECTED);
 -	mvprintw(row, 0, "%10jd %10jd %10jd %8s %6d %10s %8d\t%-6s",
 -		 (intmax_t)chunk_info[i]->offset, (intmax_t)sz,
 +	mvprintw(row, 0, "%10lu %10jd %10jd %8s %6d %10s %8d\t%-6s",
 +		 chunk_info[i]->offset, (intmax_t)sz,
  		 (intmax_t)chunk_info[i]->end, chunk_info[i]->name,
  		 chunk_info[i]->type, 
  		 slice_type_name(chunk_info[i]->type, chunk_info[i]->subtype),