if no label, reset partition info since readdisklabel changes it

SCCS-vsn: sys/hp300/dev/rd.c 8.2
SCCS-vsn: sys/hp300/dev/sd.c 8.5

diff --git a/usr/src/sys/hp300/dev/rd.c b/usr/src/sys/hp300/dev/rd.c
index 7be9ab1..d18f718 100644 (file)
--- a/usr/src/sys/hp300/dev/rd.c
+++ b/usr/src/sys/hp300/dev/rd.c
@@ -11,7 +11,7 @@
  *
  * from: Utah $Hdr: rd.c 1.44 92/12/26$
  *
  *
  * from: Utah $Hdr: rd.c 1.44 92/12/26$
  *

- *     @(#)rd.c        8.1 (Berkeley) %G%
+ *     @(#)rd.c        8.2 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -363,6 +363,9 @@ rdgetinfo(dev)
 #else
        printf("defining `c' partition as entire disk\n");
        pi[2].p_size = rdidentinfo[rs->sc_type].ri_nblocks;
 #else
        printf("defining `c' partition as entire disk\n");
        pi[2].p_size = rdidentinfo[rs->sc_type].ri_nblocks;

+       /* XXX reset other info since readdisklabel screws with it */
+       lp->d_npartitions = 3;
+       pi[0].p_size = 0;

 #endif
        return(0);
 }
 #endif
        return(0);
 }

diff --git a/usr/src/sys/hp300/dev/sd.c b/usr/src/sys/hp300/dev/sd.c
index 7d57bb3..3ab4236 100644 (file)
--- a/usr/src/sys/hp300/dev/sd.c
+++ b/usr/src/sys/hp300/dev/sd.c
@@ -7,7 +7,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)sd.c        8.4 (Berkeley) %G%
+ *     @(#)sd.c        8.5 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -460,6 +460,9 @@ sdgetinfo(dev)
 #endif
        printf("defining `c' partition as entire disk\n");
        pi[2].p_size = sc->sc_blks;
 #endif
        printf("defining `c' partition as entire disk\n");
        pi[2].p_size = sc->sc_blks;

+       /* XXX reset other info since readdisklabel screws with it */
+       lp->d_npartitions = 3;
+       pi[0].p_size = 0;

        return(0);
 }
 
        return(0);
 }