[src/trunk]: src/usr.sbin/sysinst We may call md_pre_mount() multiple times f...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/712f11549519
branches:  trunk
changeset: 1000201:712f11549519
user:      martin <martin%NetBSD.org@localhost>
date:      Sat Jul 13 17:13:36 2019 +0000

description:
We may call md_pre_mount() multiple times for the same install set,
so pass an additional index argument so MD code knows which part
of the install will be mounted next.

diffstat:

 usr.sbin/sysinst/arch/acorn32/md.c      |  4 ++--
 usr.sbin/sysinst/arch/alpha/md.c        |  4 ++--
 usr.sbin/sysinst/arch/amiga/md.c        |  4 ++--
 usr.sbin/sysinst/arch/arc/md.c          |  4 ++--
 usr.sbin/sysinst/arch/atari/md.c        |  4 ++--
 usr.sbin/sysinst/arch/bebox/md.c        |  4 ++--
 usr.sbin/sysinst/arch/cats/md.c         |  4 ++--
 usr.sbin/sysinst/arch/cobalt/md.c       |  4 ++--
 usr.sbin/sysinst/arch/dummy/md.c        |  4 ++--
 usr.sbin/sysinst/arch/emips/md.c        |  4 ++--
 usr.sbin/sysinst/arch/evbarm/md.c       |  4 ++--
 usr.sbin/sysinst/arch/evbmips/md.c      |  4 ++--
 usr.sbin/sysinst/arch/evbppc/md.c       |  4 ++--
 usr.sbin/sysinst/arch/evbsh3/md.c       |  4 ++--
 usr.sbin/sysinst/arch/ews4800mips/md.c  |  4 ++--
 usr.sbin/sysinst/arch/hp300/md.c        |  4 ++--
 usr.sbin/sysinst/arch/hpcarm/md.c       |  4 ++--
 usr.sbin/sysinst/arch/hpcmips/md.c      |  4 ++--
 usr.sbin/sysinst/arch/hpcsh/md.c        |  4 ++--
 usr.sbin/sysinst/arch/hppa/md.c         |  4 ++--
 usr.sbin/sysinst/arch/i386/md.c         |  4 ++--
 usr.sbin/sysinst/arch/landisk/md.c      |  4 ++--
 usr.sbin/sysinst/arch/luna68k/md.c      |  4 ++--
 usr.sbin/sysinst/arch/mac68k/md.c       |  4 ++--
 usr.sbin/sysinst/arch/macppc/md.c       |  4 ++--
 usr.sbin/sysinst/arch/mipsco/md.c       |  4 ++--
 usr.sbin/sysinst/arch/mvme68k/md.c      |  4 ++--
 usr.sbin/sysinst/arch/news68k/md.c      |  4 ++--
 usr.sbin/sysinst/arch/newsmips/md.c     |  4 ++--
 usr.sbin/sysinst/arch/ofppc/md.c        |  4 ++--
 usr.sbin/sysinst/arch/playstation2/md.c |  4 ++--
 usr.sbin/sysinst/arch/pmax/md.c         |  4 ++--
 usr.sbin/sysinst/arch/prep/md.c         |  4 ++--
 usr.sbin/sysinst/arch/sandpoint/md.c    |  4 ++--
 usr.sbin/sysinst/arch/sgimips/md.c      |  4 ++--
 usr.sbin/sysinst/arch/shark/md.c        |  4 ++--
 usr.sbin/sysinst/arch/sparc/md.c        |  4 ++--
 usr.sbin/sysinst/arch/sparc64/md.c      |  7 ++++---
 usr.sbin/sysinst/arch/vax/md.c          |  4 ++--
 usr.sbin/sysinst/arch/x68k/md.c         |  4 ++--
 usr.sbin/sysinst/arch/zaurus/md.c       |  4 ++--
 usr.sbin/sysinst/defs.h                 |  4 ++--
 usr.sbin/sysinst/disks.c                |  8 ++++----
 usr.sbin/sysinst/partman.c              |  4 ++--
 44 files changed, 92 insertions(+), 91 deletions(-)

diffs (truncated from 814 to 300 lines):

diff -r 3f86dad370c6 -r 712f11549519 usr.sbin/sysinst/arch/acorn32/md.c
--- a/usr.sbin/sysinst/arch/acorn32/md.c        Sat Jul 13 17:06:00 2019 +0000
+++ b/usr.sbin/sysinst/arch/acorn32/md.c        Sat Jul 13 17:13:36 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: md.c,v 1.4 2019/06/12 06:20:18 martin Exp $ */
+/*     $NetBSD: md.c,v 1.5 2019/07/13 17:13:36 martin Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -346,7 +346,7 @@
 }
 
 int
-md_pre_mount(struct install_partition_desc *install)
+md_pre_mount(struct install_partition_desc *install, size_t ndx)
 {
        return 0;
 }
diff -r 3f86dad370c6 -r 712f11549519 usr.sbin/sysinst/arch/alpha/md.c
--- a/usr.sbin/sysinst/arch/alpha/md.c  Sat Jul 13 17:06:00 2019 +0000
+++ b/usr.sbin/sysinst/arch/alpha/md.c  Sat Jul 13 17:13:36 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: md.c,v 1.5 2019/06/20 00:43:55 christos Exp $ */
+/*     $NetBSD: md.c,v 1.6 2019/07/13 17:13:36 martin Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -198,7 +198,7 @@
 }
 
 int
-md_pre_mount(struct install_partition_desc *install)
+md_pre_mount(struct install_partition_desc *install, size_t ndx)
 {
        return 0;
 }
diff -r 3f86dad370c6 -r 712f11549519 usr.sbin/sysinst/arch/amiga/md.c
--- a/usr.sbin/sysinst/arch/amiga/md.c  Sat Jul 13 17:06:00 2019 +0000
+++ b/usr.sbin/sysinst/arch/amiga/md.c  Sat Jul 13 17:13:36 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: md.c,v 1.4 2019/06/20 00:43:55 christos Exp $ */
+/*     $NetBSD: md.c,v 1.5 2019/07/13 17:13:36 martin Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -143,7 +143,7 @@
 }
 
 int
-md_pre_mount(struct install_partition_desc *install)
+md_pre_mount(struct install_partition_desc *install, size_t ndx)
 {
        return 0;
 }
diff -r 3f86dad370c6 -r 712f11549519 usr.sbin/sysinst/arch/arc/md.c
--- a/usr.sbin/sysinst/arch/arc/md.c    Sat Jul 13 17:06:00 2019 +0000
+++ b/usr.sbin/sysinst/arch/arc/md.c    Sat Jul 13 17:13:36 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: md.c,v 1.7 2019/06/20 00:43:55 christos Exp $ */
+/*     $NetBSD: md.c,v 1.8 2019/07/13 17:13:36 martin Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -277,7 +277,7 @@
 }
 
 int
-md_pre_mount(struct install_partition_desc *install)
+md_pre_mount(struct install_partition_desc *install, size_t ndx)
 {
        return 0;
 }
diff -r 3f86dad370c6 -r 712f11549519 usr.sbin/sysinst/arch/atari/md.c
--- a/usr.sbin/sysinst/arch/atari/md.c  Sat Jul 13 17:06:00 2019 +0000
+++ b/usr.sbin/sysinst/arch/atari/md.c  Sat Jul 13 17:13:36 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: md.c,v 1.5 2019/06/20 00:43:55 christos Exp $ */
+/*     $NetBSD: md.c,v 1.6 2019/07/13 17:13:36 martin Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -172,7 +172,7 @@
 }
 
 int
-md_pre_mount(struct install_partition_desc *install)
+md_pre_mount(struct install_partition_desc *install, size_t ndx)
 {
        return 0;
 }
diff -r 3f86dad370c6 -r 712f11549519 usr.sbin/sysinst/arch/bebox/md.c
--- a/usr.sbin/sysinst/arch/bebox/md.c  Sat Jul 13 17:06:00 2019 +0000
+++ b/usr.sbin/sysinst/arch/bebox/md.c  Sat Jul 13 17:13:36 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: md.c,v 1.4 2019/06/13 09:36:54 martin Exp $ */
+/*     $NetBSD: md.c,v 1.5 2019/07/13 17:13:36 martin Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -190,7 +190,7 @@
 }
 
 int
-md_pre_mount(struct install_partition_desc *install)
+md_pre_mount(struct install_partition_desc *install, size_t ndx)
 {
        return 0;
 }
diff -r 3f86dad370c6 -r 712f11549519 usr.sbin/sysinst/arch/cats/md.c
--- a/usr.sbin/sysinst/arch/cats/md.c   Sat Jul 13 17:06:00 2019 +0000
+++ b/usr.sbin/sysinst/arch/cats/md.c   Sat Jul 13 17:13:36 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: md.c,v 1.3 2019/06/12 06:20:19 martin Exp $ */
+/*     $NetBSD: md.c,v 1.4 2019/07/13 17:13:36 martin Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -198,7 +198,7 @@
 }
 
 int
-md_pre_mount(struct install_partition_desc *install)
+md_pre_mount(struct install_partition_desc *install, size_t ndx)
 {
        return 0;
 }
diff -r 3f86dad370c6 -r 712f11549519 usr.sbin/sysinst/arch/cobalt/md.c
--- a/usr.sbin/sysinst/arch/cobalt/md.c Sat Jul 13 17:06:00 2019 +0000
+++ b/usr.sbin/sysinst/arch/cobalt/md.c Sat Jul 13 17:13:36 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: md.c,v 1.7 2019/06/20 00:43:55 christos Exp $ */
+/*     $NetBSD: md.c,v 1.8 2019/07/13 17:13:36 martin Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -292,7 +292,7 @@
 }
 
 int
-md_pre_mount(struct install_partition_desc *install)
+md_pre_mount(struct install_partition_desc *install, size_t ndx)
 {
        return 0;
 }
diff -r 3f86dad370c6 -r 712f11549519 usr.sbin/sysinst/arch/dummy/md.c
--- a/usr.sbin/sysinst/arch/dummy/md.c  Sat Jul 13 17:06:00 2019 +0000
+++ b/usr.sbin/sysinst/arch/dummy/md.c  Sat Jul 13 17:13:36 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: md.c,v 1.4 2019/06/13 03:07:24 mrg Exp $       */
+/*     $NetBSD: md.c,v 1.5 2019/07/13 17:13:37 martin Exp $    */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -82,7 +82,7 @@
 }
 
 int
-md_pre_mount(struct install_partition_desc *install)
+md_pre_mount(struct install_partition_desc *install, size_t ndx)
 {
        return 0;
 }
diff -r 3f86dad370c6 -r 712f11549519 usr.sbin/sysinst/arch/emips/md.c
--- a/usr.sbin/sysinst/arch/emips/md.c  Sat Jul 13 17:06:00 2019 +0000
+++ b/usr.sbin/sysinst/arch/emips/md.c  Sat Jul 13 17:13:36 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: md.c,v 1.6 2019/06/20 00:43:56 christos Exp $  */
+/*     $NetBSD: md.c,v 1.7 2019/07/13 17:13:37 martin Exp $    */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -203,7 +203,7 @@
 }
 
 int
-md_pre_mount(struct install_partition_desc *install)
+md_pre_mount(struct install_partition_desc *install, size_t ndx)
 {
        return 0;
 }
diff -r 3f86dad370c6 -r 712f11549519 usr.sbin/sysinst/arch/evbarm/md.c
--- a/usr.sbin/sysinst/arch/evbarm/md.c Sat Jul 13 17:06:00 2019 +0000
+++ b/usr.sbin/sysinst/arch/evbarm/md.c Sat Jul 13 17:13:36 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: md.c,v 1.7 2019/06/13 09:36:54 martin Exp $ */
+/*     $NetBSD: md.c,v 1.8 2019/07/13 17:13:37 martin Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -224,7 +224,7 @@
 }
 
 int
-md_pre_mount(struct install_partition_desc *install)
+md_pre_mount(struct install_partition_desc *install, size_t ndx)
 {
        return 0;
 }
diff -r 3f86dad370c6 -r 712f11549519 usr.sbin/sysinst/arch/evbmips/md.c
--- a/usr.sbin/sysinst/arch/evbmips/md.c        Sat Jul 13 17:06:00 2019 +0000
+++ b/usr.sbin/sysinst/arch/evbmips/md.c        Sat Jul 13 17:13:36 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.4 2019/06/13 09:36:55 martin Exp $ */
+/* $NetBSD: md.c,v 1.5 2019/07/13 17:13:37 martin Exp $ */
 
 /*
  * Copyright 1997,2002 Piermont Information Systems Inc.
@@ -190,7 +190,7 @@
 }
 
 int
-md_pre_mount(struct install_partition_desc *install)
+md_pre_mount(struct install_partition_desc *install, size_t ndx)
 {
        return 0;
 }
diff -r 3f86dad370c6 -r 712f11549519 usr.sbin/sysinst/arch/evbppc/md.c
--- a/usr.sbin/sysinst/arch/evbppc/md.c Sat Jul 13 17:06:00 2019 +0000
+++ b/usr.sbin/sysinst/arch/evbppc/md.c Sat Jul 13 17:13:36 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: md.c,v 1.4 2019/06/13 09:36:55 martin Exp $ */
+/*     $NetBSD: md.c,v 1.5 2019/07/13 17:13:37 martin Exp $ */
 
 /*
  * Copyright 1997,2002 Piermont Information Systems Inc.
@@ -191,7 +191,7 @@
 }
 
 int
-md_pre_mount(struct install_partition_desc *install)
+md_pre_mount(struct install_partition_desc *install, size_t ndx)
 {
        return 0;
 }
diff -r 3f86dad370c6 -r 712f11549519 usr.sbin/sysinst/arch/evbsh3/md.c
--- a/usr.sbin/sysinst/arch/evbsh3/md.c Sat Jul 13 17:06:00 2019 +0000
+++ b/usr.sbin/sysinst/arch/evbsh3/md.c Sat Jul 13 17:13:36 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: md.c,v 1.4 2019/06/12 06:20:20 martin Exp $    */
+/*     $NetBSD: md.c,v 1.5 2019/07/13 17:13:37 martin Exp $    */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -188,7 +188,7 @@
 }
 
 int
-md_pre_mount(struct install_partition_desc *install)
+md_pre_mount(struct install_partition_desc *install, size_t ndx)
 {
        return 0;
 }
diff -r 3f86dad370c6 -r 712f11549519 usr.sbin/sysinst/arch/ews4800mips/md.c
--- a/usr.sbin/sysinst/arch/ews4800mips/md.c    Sat Jul 13 17:06:00 2019 +0000
+++ b/usr.sbin/sysinst/arch/ews4800mips/md.c    Sat Jul 13 17:13:36 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: md.c,v 1.3 2019/06/12 06:20:20 martin Exp $    */
+/*     $NetBSD: md.c,v 1.4 2019/07/13 17:13:37 martin Exp $    */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -245,7 +245,7 @@
 }
 
 int
-md_pre_mount(struct install_partition_desc *install)
+md_pre_mount(struct install_partition_desc *install, size_t ndx)
 {
        return 0;
 }
diff -r 3f86dad370c6 -r 712f11549519 usr.sbin/sysinst/arch/hp300/md.c
--- a/usr.sbin/sysinst/arch/hp300/md.c  Sat Jul 13 17:06:00 2019 +0000
+++ b/usr.sbin/sysinst/arch/hp300/md.c  Sat Jul 13 17:13:36 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: md.c,v 1.7 2019/06/20 00:43:56 christos Exp $ */
+/*     $NetBSD: md.c,v 1.8 2019/07/13 17:13:37 martin Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -234,7 +234,7 @@
 }
 
 int
-md_pre_mount(struct install_partition_desc *install)
+md_pre_mount(struct install_partition_desc *install, size_t ndx)
 {
        return 0;
 }
diff -r 3f86dad370c6 -r 712f11549519 usr.sbin/sysinst/arch/hpcarm/md.c
--- a/usr.sbin/sysinst/arch/hpcarm/md.c Sat Jul 13 17:06:00 2019 +0000
+++ b/usr.sbin/sysinst/arch/hpcarm/md.c Sat Jul 13 17:13:36 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: md.c,v 1.4 2019/06/13 09:36:55 martin Exp $ */
+/*     $NetBSD: md.c,v 1.5 2019/07/13 17:13:38 martin Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -260,7 +260,7 @@
 }