check/print unit other than 0

SCCS-vsn: sys/vax/vax/swapgeneric.c 7.9
SCCS-vsn: sys/tahoe/tahoe/swapgeneric.c 7.6

diff --git a/usr/src/sys/tahoe/tahoe/swapgeneric.c b/usr/src/sys/tahoe/tahoe/swapgeneric.c
index b2a74b1..25bf027 100644 (file)
--- a/usr/src/sys/tahoe/tahoe/swapgeneric.c
+++ b/usr/src/sys/tahoe/tahoe/swapgeneric.c
@@ -3,7 +3,7 @@
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *

- *     @(#)swapgeneric.c       7.5 (Berkeley) %G%
+ *     @(#)swapgeneric.c       7.6 (Berkeley) %G%

  */
 
 #include "param.h"
  */
 
 #include "param.h"


@@ -86,10 +86,10 @@ gotit:
                for (ui = vbdinit; ui->ui_driver; ui++) {
                        if (ui->ui_alive == 0)
                                continue;
                for (ui = vbdinit; ui->ui_driver; ui++) {
                        if (ui->ui_alive == 0)
                                continue;

-                       if (ui->ui_unit == 0 && ui->ui_driver ==
+                       if (ui->ui_unit == unit && ui->ui_driver ==

                            (struct vba_driver *)gc->gc_driver) {
                            (struct vba_driver *)gc->gc_driver) {

-                               printf("root on %s0\n",
-                                   ui->ui_driver->ud_dname);
+                               printf("root on %s%d\n",
+                                   ui->ui_driver->ud_dname, unit);

                                goto found;
                        }
                }
                                goto found;
                        }
                }

diff --git a/usr/src/sys/vax/vax/swapgeneric.c b/usr/src/sys/vax/vax/swapgeneric.c
index 8a6392a..7f5896a 100644 (file)
--- a/usr/src/sys/vax/vax/swapgeneric.c
+++ b/usr/src/sys/vax/vax/swapgeneric.c
@@ -3,7 +3,7 @@
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *

- *     @(#)swapgeneric.c       7.8 (Berkeley) %G%
+ *     @(#)swapgeneric.c       7.9 (Berkeley) %G%

  */
 
 #include "mba.h"
  */
 
 #include "mba.h"


@@ -103,10 +103,10 @@ gotit:
                for (mi = mbdinit; mi->mi_driver; mi++) {
                        if (mi->mi_alive == 0)
                                continue;
                for (mi = mbdinit; mi->mi_driver; mi++) {
                        if (mi->mi_alive == 0)
                                continue;

-                       if (mi->mi_unit == 0 && mi->mi_driver ==
+                       if (mi->mi_unit == unit && mi->mi_driver ==

                            (struct mba_driver *)gc->gc_driver) {
                            (struct mba_driver *)gc->gc_driver) {

-                               printf("root on %s0\n",
-                                   mi->mi_driver->md_dname);
+                               printf("root on %s%d\n",
+                                   mi->mi_driver->md_dname, unit);

                                goto found;
                        }
                }
                                goto found;
                        }
                }


@@ -114,10 +114,10 @@ gotit:
                for (ui = ubdinit; ui->ui_driver; ui++) {
                        if (ui->ui_alive == 0)
                                continue;
                for (ui = ubdinit; ui->ui_driver; ui++) {
                        if (ui->ui_alive == 0)
                                continue;

-                       if (ui->ui_unit == 0 && ui->ui_driver ==
+                       if (ui->ui_unit == unit && ui->ui_driver ==

                            (struct uba_driver *)gc->gc_driver) {
                            (struct uba_driver *)gc->gc_driver) {

-                               printf("root on %s0\n",
-                                   ui->ui_driver->ud_dname);
+                               printf("root on %s%d\n",
+                                   ui->ui_driver->ud_dname, unit);

                                goto found;
                        }
                }
                                goto found;
                        }
                }