Module Name: src
Committed By: martin
Date: Sat Jul 13 17:13:40 UTC 2019
Modified Files:
src/usr.sbin/sysinst: defs.h disks.c partman.c
src/usr.sbin/sysinst/arch/acorn32: md.c
src/usr.sbin/sysinst/arch/alpha: md.c
src/usr.sbin/sysinst/arch/amiga: md.c
src/usr.sbin/sysinst/arch/arc: md.c
src/usr.sbin/sysinst/arch/atari: md.c
src/usr.sbin/sysinst/arch/bebox: md.c
src/usr.sbin/sysinst/arch/cats: md.c
src/usr.sbin/sysinst/arch/cobalt: md.c
src/usr.sbin/sysinst/arch/dummy: md.c
src/usr.sbin/sysinst/arch/emips: md.c
src/usr.sbin/sysinst/arch/evbarm: md.c
src/usr.sbin/sysinst/arch/evbmips: md.c
src/usr.sbin/sysinst/arch/evbppc: md.c
src/usr.sbin/sysinst/arch/evbsh3: md.c
src/usr.sbin/sysinst/arch/ews4800mips: md.c
src/usr.sbin/sysinst/arch/hp300: md.c
src/usr.sbin/sysinst/arch/hpcarm: md.c
src/usr.sbin/sysinst/arch/hpcmips: md.c
src/usr.sbin/sysinst/arch/hpcsh: md.c
src/usr.sbin/sysinst/arch/hppa: md.c
src/usr.sbin/sysinst/arch/i386: md.c
src/usr.sbin/sysinst/arch/landisk: md.c
src/usr.sbin/sysinst/arch/luna68k: md.c
src/usr.sbin/sysinst/arch/mac68k: md.c
src/usr.sbin/sysinst/arch/macppc: md.c
src/usr.sbin/sysinst/arch/mipsco: md.c
src/usr.sbin/sysinst/arch/mvme68k: md.c
src/usr.sbin/sysinst/arch/news68k: md.c
src/usr.sbin/sysinst/arch/newsmips: md.c
src/usr.sbin/sysinst/arch/ofppc: md.c
src/usr.sbin/sysinst/arch/playstation2: md.c
src/usr.sbin/sysinst/arch/pmax: md.c
src/usr.sbin/sysinst/arch/prep: md.c
src/usr.sbin/sysinst/arch/sandpoint: md.c
src/usr.sbin/sysinst/arch/sgimips: md.c
src/usr.sbin/sysinst/arch/shark: md.c
src/usr.sbin/sysinst/arch/sparc: md.c
src/usr.sbin/sysinst/arch/sparc64: md.c
src/usr.sbin/sysinst/arch/vax: md.c
src/usr.sbin/sysinst/arch/x68k: md.c
src/usr.sbin/sysinst/arch/zaurus: md.c
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/usr.sbin/sysinst/defs.h
cvs rdiff -u -r1.36 -r1.37 src/usr.sbin/sysinst/disks.c
cvs rdiff -u -r1.35 -r1.36 src/usr.sbin/sysinst/partman.c
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/sysinst/arch/acorn32/md.c
cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/sysinst/arch/alpha/md.c
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/sysinst/arch/amiga/md.c
cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/sysinst/arch/arc/md.c
cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/sysinst/arch/atari/md.c
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/sysinst/arch/bebox/md.c
cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/sysinst/arch/cats/md.c
cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/sysinst/arch/cobalt/md.c
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/sysinst/arch/dummy/md.c
cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/sysinst/arch/emips/md.c
cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/sysinst/arch/evbarm/md.c
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/sysinst/arch/evbmips/md.c
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/sysinst/arch/evbppc/md.c
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/sysinst/arch/evbsh3/md.c
cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/sysinst/arch/ews4800mips/md.c
cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/sysinst/arch/hp300/md.c
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/sysinst/arch/hpcarm/md.c
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/sysinst/arch/hpcmips/md.c
cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/sysinst/arch/hpcsh/md.c
cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/sysinst/arch/hppa/md.c
cvs rdiff -u -r1.18 -r1.19 src/usr.sbin/sysinst/arch/i386/md.c
cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/sysinst/arch/landisk/md.c
cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/sysinst/arch/luna68k/md.c
cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/sysinst/arch/mac68k/md.c
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/sysinst/arch/macppc/md.c
cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/sysinst/arch/mipsco/md.c
cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/sysinst/arch/mvme68k/md.c
cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/sysinst/arch/news68k/md.c
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/sysinst/arch/newsmips/md.c
cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/sysinst/arch/ofppc/md.c
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/sysinst/arch/playstation2/md.c
cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/sysinst/arch/pmax/md.c
cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/sysinst/arch/prep/md.c
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/sysinst/arch/sandpoint/md.c
cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/sysinst/arch/sgimips/md.c
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/sysinst/arch/shark/md.c
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/sysinst/arch/sparc/md.c
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/sysinst/arch/sparc64/md.c
cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/sysinst/arch/vax/md.c
cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/sysinst/arch/x68k/md.c
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/sysinst/arch/zaurus/md.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sysinst/defs.h
diff -u src/usr.sbin/sysinst/defs.h:1.37 src/usr.sbin/sysinst/defs.h:1.38
--- src/usr.sbin/sysinst/defs.h:1.37 Fri Jul 12 18:28:08 2019
+++ src/usr.sbin/sysinst/defs.h Sat Jul 13 17:13:36 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: defs.h,v 1.37 2019/07/12 18:28:08 martin Exp $ */
+/* $NetBSD: defs.h,v 1.38 2019/07/13 17:13:36 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -577,7 +577,7 @@ bool md_gpt_post_write(struct disk_parti
*/
bool md_pre_disklabel(struct install_partition_desc*, struct disk_partitions*);
bool md_post_disklabel(struct install_partition_desc*, struct disk_partitions*);
-int md_pre_mount(struct install_partition_desc*);
+int md_pre_mount(struct install_partition_desc*, size_t);
int md_post_newfs(struct install_partition_desc*);
int md_post_extract(struct install_partition_desc*);
void md_cleanup_install(struct install_partition_desc*);
Index: src/usr.sbin/sysinst/disks.c
diff -u src/usr.sbin/sysinst/disks.c:1.36 src/usr.sbin/sysinst/disks.c:1.37
--- src/usr.sbin/sysinst/disks.c:1.36 Sat Jun 22 20:46:07 2019
+++ src/usr.sbin/sysinst/disks.c Sat Jul 13 17:13:36 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: disks.c,v 1.36 2019/06/22 20:46:07 christos Exp $ */
+/* $NetBSD: disks.c,v 1.37 2019/07/13 17:13:36 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -1031,7 +1031,7 @@ make_filesystems(struct install_partitio
"/sbin/newfs -V2 -O2 %s", rdev);
}
- md_pre_mount(install);
+ md_pre_mount(install, 0);
make_target_dir("/");
@@ -1147,7 +1147,7 @@ make_filesystems(struct install_partitio
return error;
ptn->instflags &= ~PUIINST_NEWFS;
- md_pre_mount(install);
+ md_pre_mount(install, i);
if (partman_go == 0 && (ptn->instflags & PUIINST_MOUNT) &&
mnt_opts != NULL) {
@@ -1493,7 +1493,7 @@ mount_root(const char *devdev, struct in
if (error != 0)
return error;
- md_pre_mount(install);
+ md_pre_mount(install, 0);
/* Mount devdev on target's "".
* If we pass "" as mount-on, Prefixing will DTRT.
Index: src/usr.sbin/sysinst/partman.c
diff -u src/usr.sbin/sysinst/partman.c:1.35 src/usr.sbin/sysinst/partman.c:1.36
--- src/usr.sbin/sysinst/partman.c:1.35 Sat Jun 22 20:46:07 2019
+++ src/usr.sbin/sysinst/partman.c Sat Jul 13 17:13:36 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: partman.c,v 1.35 2019/06/22 20:46:07 christos Exp $ */
+/* $NetBSD: partman.c,v 1.36 2019/07/13 17:13:36 martin Exp $ */
/*
* Copyright 2012 Eugene Lozovoy
@@ -2273,7 +2273,7 @@ pm_mountall(void)
ok = 1;
}
if (ok)
- md_pre_mount();
+ md_pre_mount(NULL, 0);
}
if (strlen(localfs_dev) < 1) {
hit_enter_to_continue(MSG_noroot, NULL);
Index: src/usr.sbin/sysinst/arch/acorn32/md.c
diff -u src/usr.sbin/sysinst/arch/acorn32/md.c:1.4 src/usr.sbin/sysinst/arch/acorn32/md.c:1.5
--- src/usr.sbin/sysinst/arch/acorn32/md.c:1.4 Wed Jun 12 06:20:18 2019
+++ src/usr.sbin/sysinst/arch/acorn32/md.c Sat Jul 13 17:13:36 2019
@@ -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 @@ filecore_checksum(u_char *bootblock)
}
int
-md_pre_mount(struct install_partition_desc *install)
+md_pre_mount(struct install_partition_desc *install, size_t ndx)
{
return 0;
}
Index: src/usr.sbin/sysinst/arch/alpha/md.c
diff -u src/usr.sbin/sysinst/arch/alpha/md.c:1.5 src/usr.sbin/sysinst/arch/alpha/md.c:1.6
--- src/usr.sbin/sysinst/arch/alpha/md.c:1.5 Thu Jun 20 00:43:55 2019
+++ src/usr.sbin/sysinst/arch/alpha/md.c Sat Jul 13 17:13:36 2019
@@ -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 @@ md_update(struct install_partition_desc
}
int
-md_pre_mount(struct install_partition_desc *install)
+md_pre_mount(struct install_partition_desc *install, size_t ndx)
{
return 0;
}
Index: src/usr.sbin/sysinst/arch/amiga/md.c
diff -u src/usr.sbin/sysinst/arch/amiga/md.c:1.4 src/usr.sbin/sysinst/arch/amiga/md.c:1.5
--- src/usr.sbin/sysinst/arch/amiga/md.c:1.4 Thu Jun 20 00:43:55 2019
+++ src/usr.sbin/sysinst/arch/amiga/md.c Sat Jul 13 17:13:36 2019
@@ -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 @@ md_update(struct install_partition_desc
}
int
-md_pre_mount(struct install_partition_desc *install)
+md_pre_mount(struct install_partition_desc *install, size_t ndx)
{
return 0;
}
Index: src/usr.sbin/sysinst/arch/arc/md.c
diff -u src/usr.sbin/sysinst/arch/arc/md.c:1.7 src/usr.sbin/sysinst/arch/arc/md.c:1.8
--- src/usr.sbin/sysinst/arch/arc/md.c:1.7 Thu Jun 20 00:43:55 2019
+++ src/usr.sbin/sysinst/arch/arc/md.c Sat Jul 13 17:13:36 2019
@@ -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 @@ md_parts_use_wholedisk(struct disk_parti
}
int
-md_pre_mount(struct install_partition_desc *install)
+md_pre_mount(struct install_partition_desc *install, size_t ndx)
{
return 0;
}
Index: src/usr.sbin/sysinst/arch/atari/md.c
diff -u src/usr.sbin/sysinst/arch/atari/md.c:1.5 src/usr.sbin/sysinst/arch/atari/md.c:1.6
--- src/usr.sbin/sysinst/arch/atari/md.c:1.5 Thu Jun 20 00:43:55 2019
+++ src/usr.sbin/sysinst/arch/atari/md.c Sat Jul 13 17:13:36 2019
@@ -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 @@ md_update(struct install_partition_desc
}
int
-md_pre_mount(struct install_partition_desc *install)
+md_pre_mount(struct install_partition_desc *install, size_t ndx)
{
return 0;
}
Index: src/usr.sbin/sysinst/arch/bebox/md.c
diff -u src/usr.sbin/sysinst/arch/bebox/md.c:1.4 src/usr.sbin/sysinst/arch/bebox/md.c:1.5
--- src/usr.sbin/sysinst/arch/bebox/md.c:1.4 Thu Jun 13 09:36:54 2019
+++ src/usr.sbin/sysinst/arch/bebox/md.c Sat Jul 13 17:13:36 2019
@@ -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 @@ md_parts_use_wholedisk(struct disk_parti
}
int
-md_pre_mount(struct install_partition_desc *install)
+md_pre_mount(struct install_partition_desc *install, size_t ndx)
{
return 0;
}
Index: src/usr.sbin/sysinst/arch/cats/md.c
diff -u src/usr.sbin/sysinst/arch/cats/md.c:1.3 src/usr.sbin/sysinst/arch/cats/md.c:1.4
--- src/usr.sbin/sysinst/arch/cats/md.c:1.3 Wed Jun 12 06:20:19 2019
+++ src/usr.sbin/sysinst/arch/cats/md.c Sat Jul 13 17:13:36 2019
@@ -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 @@ md_update(struct install_partition_desc
}
int
-md_pre_mount(struct install_partition_desc *install)
+md_pre_mount(struct install_partition_desc *install, size_t ndx)
{
return 0;
}
Index: src/usr.sbin/sysinst/arch/cobalt/md.c
diff -u src/usr.sbin/sysinst/arch/cobalt/md.c:1.7 src/usr.sbin/sysinst/arch/cobalt/md.c:1.8
--- src/usr.sbin/sysinst/arch/cobalt/md.c:1.7 Thu Jun 20 00:43:55 2019
+++ src/usr.sbin/sysinst/arch/cobalt/md.c Sat Jul 13 17:13:36 2019
@@ -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 @@ md_parts_use_wholedisk(struct disk_parti
}
int
-md_pre_mount(struct install_partition_desc *install)
+md_pre_mount(struct install_partition_desc *install, size_t ndx)
{
return 0;
}
Index: src/usr.sbin/sysinst/arch/dummy/md.c
diff -u src/usr.sbin/sysinst/arch/dummy/md.c:1.4 src/usr.sbin/sysinst/arch/dummy/md.c:1.5
--- src/usr.sbin/sysinst/arch/dummy/md.c:1.4 Thu Jun 13 03:07:24 2019
+++ src/usr.sbin/sysinst/arch/dummy/md.c Sat Jul 13 17:13:37 2019
@@ -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 @@ md_post_disklabel(struct install_partiti
}
int
-md_pre_mount(struct install_partition_desc *install)
+md_pre_mount(struct install_partition_desc *install, size_t ndx)
{
return 0;
}
Index: src/usr.sbin/sysinst/arch/emips/md.c
diff -u src/usr.sbin/sysinst/arch/emips/md.c:1.6 src/usr.sbin/sysinst/arch/emips/md.c:1.7
--- src/usr.sbin/sysinst/arch/emips/md.c:1.6 Thu Jun 20 00:43:56 2019
+++ src/usr.sbin/sysinst/arch/emips/md.c Sat Jul 13 17:13:37 2019
@@ -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 @@ md_update(struct install_partition_desc
}
int
-md_pre_mount(struct install_partition_desc *install)
+md_pre_mount(struct install_partition_desc *install, size_t ndx)
{
return 0;
}
Index: src/usr.sbin/sysinst/arch/evbarm/md.c
diff -u src/usr.sbin/sysinst/arch/evbarm/md.c:1.7 src/usr.sbin/sysinst/arch/evbarm/md.c:1.8
--- src/usr.sbin/sysinst/arch/evbarm/md.c:1.7 Thu Jun 13 09:36:54 2019
+++ src/usr.sbin/sysinst/arch/evbarm/md.c Sat Jul 13 17:13:37 2019
@@ -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 @@ md_update(struct install_partition_desc
}
int
-md_pre_mount(struct install_partition_desc *install)
+md_pre_mount(struct install_partition_desc *install, size_t ndx)
{
return 0;
}
Index: src/usr.sbin/sysinst/arch/evbmips/md.c
diff -u src/usr.sbin/sysinst/arch/evbmips/md.c:1.4 src/usr.sbin/sysinst/arch/evbmips/md.c:1.5
--- src/usr.sbin/sysinst/arch/evbmips/md.c:1.4 Thu Jun 13 09:36:55 2019
+++ src/usr.sbin/sysinst/arch/evbmips/md.c Sat Jul 13 17:13:37 2019
@@ -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 @@ md_parts_use_wholedisk(struct disk_parti
}
int
-md_pre_mount(struct install_partition_desc *install)
+md_pre_mount(struct install_partition_desc *install, size_t ndx)
{
return 0;
}
Index: src/usr.sbin/sysinst/arch/evbppc/md.c
diff -u src/usr.sbin/sysinst/arch/evbppc/md.c:1.4 src/usr.sbin/sysinst/arch/evbppc/md.c:1.5
--- src/usr.sbin/sysinst/arch/evbppc/md.c:1.4 Thu Jun 13 09:36:55 2019
+++ src/usr.sbin/sysinst/arch/evbppc/md.c Sat Jul 13 17:13:37 2019
@@ -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 @@ md_parts_use_wholedisk(struct disk_parti
}
int
-md_pre_mount(struct install_partition_desc *install)
+md_pre_mount(struct install_partition_desc *install, size_t ndx)
{
return 0;
}
Index: src/usr.sbin/sysinst/arch/evbsh3/md.c
diff -u src/usr.sbin/sysinst/arch/evbsh3/md.c:1.4 src/usr.sbin/sysinst/arch/evbsh3/md.c:1.5
--- src/usr.sbin/sysinst/arch/evbsh3/md.c:1.4 Wed Jun 12 06:20:20 2019
+++ src/usr.sbin/sysinst/arch/evbsh3/md.c Sat Jul 13 17:13:37 2019
@@ -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 @@ md_post_extract(struct install_partition
}
int
-md_pre_mount(struct install_partition_desc *install)
+md_pre_mount(struct install_partition_desc *install, size_t ndx)
{
return 0;
}
Index: src/usr.sbin/sysinst/arch/ews4800mips/md.c
diff -u src/usr.sbin/sysinst/arch/ews4800mips/md.c:1.3 src/usr.sbin/sysinst/arch/ews4800mips/md.c:1.4
--- src/usr.sbin/sysinst/arch/ews4800mips/md.c:1.3 Wed Jun 12 06:20:20 2019
+++ src/usr.sbin/sysinst/arch/ews4800mips/md.c Sat Jul 13 17:13:37 2019
@@ -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 @@ ews4800mips_sysvbfs_size(void)
}
int
-md_pre_mount(struct install_partition_desc *install)
+md_pre_mount(struct install_partition_desc *install, size_t ndx)
{
return 0;
}
Index: src/usr.sbin/sysinst/arch/hp300/md.c
diff -u src/usr.sbin/sysinst/arch/hp300/md.c:1.7 src/usr.sbin/sysinst/arch/hp300/md.c:1.8
--- src/usr.sbin/sysinst/arch/hp300/md.c:1.7 Thu Jun 20 00:43:56 2019
+++ src/usr.sbin/sysinst/arch/hp300/md.c Sat Jul 13 17:13:37 2019
@@ -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 @@ hp300_boot_size(void)
}
int
-md_pre_mount(struct install_partition_desc *install)
+md_pre_mount(struct install_partition_desc *install, size_t ndx)
{
return 0;
}
Index: src/usr.sbin/sysinst/arch/hpcarm/md.c
diff -u src/usr.sbin/sysinst/arch/hpcarm/md.c:1.4 src/usr.sbin/sysinst/arch/hpcarm/md.c:1.5
--- src/usr.sbin/sysinst/arch/hpcarm/md.c:1.4 Thu Jun 13 09:36:55 2019
+++ src/usr.sbin/sysinst/arch/hpcarm/md.c Sat Jul 13 17:13:38 2019
@@ -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 @@ md_parts_use_wholedisk(struct disk_parti
}
int
-md_pre_mount(struct install_partition_desc *install)
+md_pre_mount(struct install_partition_desc *install, size_t ndx)
{
return 0;
}
Index: src/usr.sbin/sysinst/arch/hpcmips/md.c
diff -u src/usr.sbin/sysinst/arch/hpcmips/md.c:1.4 src/usr.sbin/sysinst/arch/hpcmips/md.c:1.5
--- src/usr.sbin/sysinst/arch/hpcmips/md.c:1.4 Thu Jun 13 09:36:55 2019
+++ src/usr.sbin/sysinst/arch/hpcmips/md.c Sat Jul 13 17:13:38 2019
@@ -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.
@@ -201,7 +201,7 @@ md_parts_use_wholedisk(struct disk_parti
}
int
-md_pre_mount(struct install_partition_desc *install)
+md_pre_mount(struct install_partition_desc *install, size_t ndx)
{
return 0;
}
Index: src/usr.sbin/sysinst/arch/hpcsh/md.c
diff -u src/usr.sbin/sysinst/arch/hpcsh/md.c:1.5 src/usr.sbin/sysinst/arch/hpcsh/md.c:1.6
--- src/usr.sbin/sysinst/arch/hpcsh/md.c:1.5 Thu Jun 13 09:36:55 2019
+++ src/usr.sbin/sysinst/arch/hpcsh/md.c Sat Jul 13 17:13:38 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.5 2019/06/13 09:36:55 martin Exp $ */
+/* $NetBSD: md.c,v 1.6 2019/07/13 17:13:38 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -203,7 +203,7 @@ md_parts_use_wholedisk(struct disk_parti
}
int
-md_pre_mount(struct install_partition_desc *install)
+md_pre_mount(struct install_partition_desc *install, size_t ndx)
{
return 0;
}
Index: src/usr.sbin/sysinst/arch/hppa/md.c
diff -u src/usr.sbin/sysinst/arch/hppa/md.c:1.6 src/usr.sbin/sysinst/arch/hppa/md.c:1.7
--- src/usr.sbin/sysinst/arch/hppa/md.c:1.6 Thu Jun 20 00:43:56 2019
+++ src/usr.sbin/sysinst/arch/hppa/md.c Sat Jul 13 17:13:38 2019
@@ -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:38 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -222,7 +222,7 @@ md_update(struct install_partition_desc
}
int
-md_pre_mount(struct install_partition_desc *install)
+md_pre_mount(struct install_partition_desc *install, size_t ndx)
{
return 0;
}
Index: src/usr.sbin/sysinst/arch/i386/md.c
diff -u src/usr.sbin/sysinst/arch/i386/md.c:1.18 src/usr.sbin/sysinst/arch/i386/md.c:1.19
--- src/usr.sbin/sysinst/arch/i386/md.c:1.18 Thu Jun 20 00:43:56 2019
+++ src/usr.sbin/sysinst/arch/i386/md.c Sat Jul 13 17:13:38 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.18 2019/06/20 00:43:56 christos Exp $ */
+/* $NetBSD: md.c,v 1.19 2019/07/13 17:13:38 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -702,7 +702,7 @@ get_bootmodel(void)
int
-md_pre_mount(struct install_partition_desc *install)
+md_pre_mount(struct install_partition_desc *install, size_t ndx)
{
return 0;
}
Index: src/usr.sbin/sysinst/arch/landisk/md.c
diff -u src/usr.sbin/sysinst/arch/landisk/md.c:1.9 src/usr.sbin/sysinst/arch/landisk/md.c:1.10
--- src/usr.sbin/sysinst/arch/landisk/md.c:1.9 Fri Jun 21 16:57:12 2019
+++ src/usr.sbin/sysinst/arch/landisk/md.c Sat Jul 13 17:13:38 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.9 2019/06/21 16:57:12 martin Exp $ */
+/* $NetBSD: md.c,v 1.10 2019/07/13 17:13:38 martin Exp $ */
/*
* Copyright 1997,2002 Piermont Information Systems Inc.
@@ -210,7 +210,7 @@ md_parts_use_wholedisk(struct disk_parti
int
-md_pre_mount(struct install_partition_desc *install)
+md_pre_mount(struct install_partition_desc *install, size_t ndx)
{
return 0;
}
Index: src/usr.sbin/sysinst/arch/luna68k/md.c
diff -u src/usr.sbin/sysinst/arch/luna68k/md.c:1.6 src/usr.sbin/sysinst/arch/luna68k/md.c:1.7
--- src/usr.sbin/sysinst/arch/luna68k/md.c:1.6 Thu Jun 20 00:43:56 2019
+++ src/usr.sbin/sysinst/arch/luna68k/md.c Sat Jul 13 17:13:38 2019
@@ -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:38 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -268,7 +268,7 @@ md_update(struct install_partition_desc
}
int
-md_pre_mount(struct install_partition_desc *install)
+md_pre_mount(struct install_partition_desc *install, size_t ndx)
{
return 0;
}
Index: src/usr.sbin/sysinst/arch/mac68k/md.c
diff -u src/usr.sbin/sysinst/arch/mac68k/md.c:1.7 src/usr.sbin/sysinst/arch/mac68k/md.c:1.8
--- src/usr.sbin/sysinst/arch/mac68k/md.c:1.7 Thu Jun 20 00:43:56 2019
+++ src/usr.sbin/sysinst/arch/mac68k/md.c Sat Jul 13 17:13:38 2019
@@ -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:38 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -1216,7 +1216,7 @@ md_debug_dump(title)
#endif /* MD_DEBUG_SORT_MERGE */
int
-md_pre_mount(struct install_partition_desc *install)
+md_pre_mount(struct install_partition_desc *install, size_t ndx)
{
return 0;
}
Index: src/usr.sbin/sysinst/arch/macppc/md.c
diff -u src/usr.sbin/sysinst/arch/macppc/md.c:1.4 src/usr.sbin/sysinst/arch/macppc/md.c:1.5
--- src/usr.sbin/sysinst/arch/macppc/md.c:1.4 Thu Jun 20 00:43:56 2019
+++ src/usr.sbin/sysinst/arch/macppc/md.c Sat Jul 13 17:13:38 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.4 2019/06/20 00:43:56 christos Exp $ */
+/* $NetBSD: md.c,v 1.5 2019/07/13 17:13:38 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -213,7 +213,7 @@ md_update(struct install_partition_desc
}
int
-md_pre_mount(struct install_partition_desc *install)
+md_pre_mount(struct install_partition_desc *install, size_t ndx)
{
return 0;
}
Index: src/usr.sbin/sysinst/arch/mipsco/md.c
diff -u src/usr.sbin/sysinst/arch/mipsco/md.c:1.5 src/usr.sbin/sysinst/arch/mipsco/md.c:1.6
--- src/usr.sbin/sysinst/arch/mipsco/md.c:1.5 Thu Jun 20 00:43:57 2019
+++ src/usr.sbin/sysinst/arch/mipsco/md.c Sat Jul 13 17:13:39 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.5 2019/06/20 00:43:57 christos Exp $ */
+/* $NetBSD: md.c,v 1.6 2019/07/13 17:13:39 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -200,7 +200,7 @@ md_update(struct install_partition_desc
}
int
-md_pre_mount(struct install_partition_desc *install)
+md_pre_mount(struct install_partition_desc *install, size_t ndx)
{
return 0;
}
Index: src/usr.sbin/sysinst/arch/mvme68k/md.c
diff -u src/usr.sbin/sysinst/arch/mvme68k/md.c:1.7 src/usr.sbin/sysinst/arch/mvme68k/md.c:1.8
--- src/usr.sbin/sysinst/arch/mvme68k/md.c:1.7 Thu Jun 20 00:43:57 2019
+++ src/usr.sbin/sysinst/arch/mvme68k/md.c Sat Jul 13 17:13:39 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.7 2019/06/20 00:43:57 christos Exp $ */
+/* $NetBSD: md.c,v 1.8 2019/07/13 17:13:39 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -222,7 +222,7 @@ md_update(struct install_partition_desc
}
int
-md_pre_mount(struct install_partition_desc *install)
+md_pre_mount(struct install_partition_desc *install, size_t ndx)
{
return 0;
}
Index: src/usr.sbin/sysinst/arch/news68k/md.c
diff -u src/usr.sbin/sysinst/arch/news68k/md.c:1.5 src/usr.sbin/sysinst/arch/news68k/md.c:1.6
--- src/usr.sbin/sysinst/arch/news68k/md.c:1.5 Thu Jun 20 00:43:57 2019
+++ src/usr.sbin/sysinst/arch/news68k/md.c Sat Jul 13 17:13:39 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.5 2019/06/20 00:43:57 christos Exp $ */
+/* $NetBSD: md.c,v 1.6 2019/07/13 17:13:39 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -196,7 +196,7 @@ md_update(struct install_partition_desc
}
int
-md_pre_mount(struct install_partition_desc *install)
+md_pre_mount(struct install_partition_desc *install, size_t ndx)
{
return 0;
}
Index: src/usr.sbin/sysinst/arch/newsmips/md.c
diff -u src/usr.sbin/sysinst/arch/newsmips/md.c:1.4 src/usr.sbin/sysinst/arch/newsmips/md.c:1.5
--- src/usr.sbin/sysinst/arch/newsmips/md.c:1.4 Thu Jun 20 00:43:57 2019
+++ src/usr.sbin/sysinst/arch/newsmips/md.c Sat Jul 13 17:13:39 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.4 2019/06/20 00:43:57 christos Exp $ */
+/* $NetBSD: md.c,v 1.5 2019/07/13 17:13:39 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -188,7 +188,7 @@ md_update(struct install_partition_desc
}
int
-md_pre_mount(struct install_partition_desc *install)
+md_pre_mount(struct install_partition_desc *install, size_t ndx)
{
return 0;
}
Index: src/usr.sbin/sysinst/arch/ofppc/md.c
diff -u src/usr.sbin/sysinst/arch/ofppc/md.c:1.6 src/usr.sbin/sysinst/arch/ofppc/md.c:1.7
--- src/usr.sbin/sysinst/arch/ofppc/md.c:1.6 Thu Jun 20 00:43:57 2019
+++ src/usr.sbin/sysinst/arch/ofppc/md.c Sat Jul 13 17:13:39 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.6 2019/06/20 00:43:57 christos Exp $ */
+/* $NetBSD: md.c,v 1.7 2019/07/13 17:13:39 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -669,7 +669,7 @@ rdbchksum(void *bdata)
}
int
-md_pre_mount(struct install_partition_desc *install)
+md_pre_mount(struct install_partition_desc *install, size_t ndx)
{
return 0;
Index: src/usr.sbin/sysinst/arch/playstation2/md.c
diff -u src/usr.sbin/sysinst/arch/playstation2/md.c:1.4 src/usr.sbin/sysinst/arch/playstation2/md.c:1.5
--- src/usr.sbin/sysinst/arch/playstation2/md.c:1.4 Thu Jun 20 00:43:57 2019
+++ src/usr.sbin/sysinst/arch/playstation2/md.c Sat Jul 13 17:13:39 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.4 2019/06/20 00:43:57 christos Exp $ */
+/* $NetBSD: md.c,v 1.5 2019/07/13 17:13:39 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -216,7 +216,7 @@ md_parts_use_wholedisk(struct disk_parti
}
int
-md_pre_mount(struct install_partition_desc *install)
+md_pre_mount(struct install_partition_desc *install, size_t ndx)
{
return 0;
}
Index: src/usr.sbin/sysinst/arch/pmax/md.c
diff -u src/usr.sbin/sysinst/arch/pmax/md.c:1.5 src/usr.sbin/sysinst/arch/pmax/md.c:1.6
--- src/usr.sbin/sysinst/arch/pmax/md.c:1.5 Thu Jun 20 00:43:57 2019
+++ src/usr.sbin/sysinst/arch/pmax/md.c Sat Jul 13 17:13:39 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.5 2019/06/20 00:43:57 christos Exp $ */
+/* $NetBSD: md.c,v 1.6 2019/07/13 17:13:39 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -209,7 +209,7 @@ md_update(struct install_partition_desc
}
int
-md_pre_mount(struct install_partition_desc *install)
+md_pre_mount(struct install_partition_desc *install, size_t ndx)
{
return 0;
}
Index: src/usr.sbin/sysinst/arch/prep/md.c
diff -u src/usr.sbin/sysinst/arch/prep/md.c:1.7 src/usr.sbin/sysinst/arch/prep/md.c:1.8
--- src/usr.sbin/sysinst/arch/prep/md.c:1.7 Thu Jun 20 00:43:57 2019
+++ src/usr.sbin/sysinst/arch/prep/md.c Sat Jul 13 17:13:39 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.7 2019/06/20 00:43:57 christos Exp $ */
+/* $NetBSD: md.c,v 1.8 2019/07/13 17:13:39 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -288,7 +288,7 @@ md_parts_use_wholedisk(struct disk_parti
}
int
-md_pre_mount(struct install_partition_desc *install)
+md_pre_mount(struct install_partition_desc *install, size_t ndx)
{
return 0;
}
Index: src/usr.sbin/sysinst/arch/sandpoint/md.c
diff -u src/usr.sbin/sysinst/arch/sandpoint/md.c:1.4 src/usr.sbin/sysinst/arch/sandpoint/md.c:1.5
--- src/usr.sbin/sysinst/arch/sandpoint/md.c:1.4 Thu Jun 13 09:36:56 2019
+++ src/usr.sbin/sysinst/arch/sandpoint/md.c Sat Jul 13 17:13:39 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.4 2019/06/13 09:36:56 martin Exp $ */
+/* $NetBSD: md.c,v 1.5 2019/07/13 17:13:39 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -246,7 +246,7 @@ md_parts_use_wholedisk(struct disk_parti
}
int
-md_pre_mount(struct install_partition_desc *install)
+md_pre_mount(struct install_partition_desc *install, size_t ndx)
{
return 0;
}
Index: src/usr.sbin/sysinst/arch/sgimips/md.c
diff -u src/usr.sbin/sysinst/arch/sgimips/md.c:1.7 src/usr.sbin/sysinst/arch/sgimips/md.c:1.8
--- src/usr.sbin/sysinst/arch/sgimips/md.c:1.7 Wed Jun 12 06:20:22 2019
+++ src/usr.sbin/sysinst/arch/sgimips/md.c Sat Jul 13 17:13:40 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.7 2019/06/12 06:20:22 martin Exp $ */
+/* $NetBSD: md.c,v 1.8 2019/07/13 17:13:40 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -226,7 +226,7 @@ md_update(struct install_partition_desc
}
int
-md_pre_mount(struct install_partition_desc *install)
+md_pre_mount(struct install_partition_desc *install, size_t ndx)
{
return 0;
}
Index: src/usr.sbin/sysinst/arch/shark/md.c
diff -u src/usr.sbin/sysinst/arch/shark/md.c:1.4 src/usr.sbin/sysinst/arch/shark/md.c:1.5
--- src/usr.sbin/sysinst/arch/shark/md.c:1.4 Thu Jun 20 00:43:57 2019
+++ src/usr.sbin/sysinst/arch/shark/md.c Sat Jul 13 17:13:40 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.4 2019/06/20 00:43:57 christos Exp $ */
+/* $NetBSD: md.c,v 1.5 2019/07/13 17:13:40 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -224,7 +224,7 @@ clear_mbr(const char *disk, char *diskpa
}
int
-md_pre_mount(struct install_partition_desc *install)
+md_pre_mount(struct install_partition_desc *install, size_t ndx)
{
return 0;
}
Index: src/usr.sbin/sysinst/arch/sparc/md.c
diff -u src/usr.sbin/sysinst/arch/sparc/md.c:1.4 src/usr.sbin/sysinst/arch/sparc/md.c:1.5
--- src/usr.sbin/sysinst/arch/sparc/md.c:1.4 Thu Jun 20 00:43:58 2019
+++ src/usr.sbin/sysinst/arch/sparc/md.c Sat Jul 13 17:13:40 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.4 2019/06/20 00:43:58 christos Exp $ */
+/* $NetBSD: md.c,v 1.5 2019/07/13 17:13:40 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -155,7 +155,7 @@ md_update(struct install_partition_desc
}
int
-md_pre_mount(struct install_partition_desc *install)
+md_pre_mount(struct install_partition_desc *install, size_t ndx)
{
return 0;
}
Index: src/usr.sbin/sysinst/arch/sparc64/md.c
diff -u src/usr.sbin/sysinst/arch/sparc64/md.c:1.4 src/usr.sbin/sysinst/arch/sparc64/md.c:1.5
--- src/usr.sbin/sysinst/arch/sparc64/md.c:1.4 Thu Jun 20 00:43:58 2019
+++ src/usr.sbin/sysinst/arch/sparc64/md.c Sat Jul 13 17:13:40 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.4 2019/06/20 00:43:58 christos Exp $ */
+/* $NetBSD: md.c,v 1.5 2019/07/13 17:13:40 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -172,9 +172,10 @@ install_ofwboot(void)
}
int
-md_pre_mount(struct install_partition_desc *install)
+md_pre_mount(struct install_partition_desc *install, size_t ndx)
{
- install_bootblocks();
+ if (ndx == 0)
+ install_bootblocks();
return 0;
}
Index: src/usr.sbin/sysinst/arch/vax/md.c
diff -u src/usr.sbin/sysinst/arch/vax/md.c:1.5 src/usr.sbin/sysinst/arch/vax/md.c:1.6
--- src/usr.sbin/sysinst/arch/vax/md.c:1.5 Thu Jun 20 00:43:58 2019
+++ src/usr.sbin/sysinst/arch/vax/md.c Sat Jul 13 17:13:40 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.5 2019/06/20 00:43:58 christos Exp $ */
+/* $NetBSD: md.c,v 1.6 2019/07/13 17:13:40 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -192,7 +192,7 @@ md_update(struct install_partition_desc
}
int
-md_pre_mount(struct install_partition_desc *install)
+md_pre_mount(struct install_partition_desc *install, size_t ndx)
{
return 0;
}
Index: src/usr.sbin/sysinst/arch/x68k/md.c
diff -u src/usr.sbin/sysinst/arch/x68k/md.c:1.7 src/usr.sbin/sysinst/arch/x68k/md.c:1.8
--- src/usr.sbin/sysinst/arch/x68k/md.c:1.7 Thu Jun 20 00:43:58 2019
+++ src/usr.sbin/sysinst/arch/x68k/md.c Sat Jul 13 17:13:40 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.7 2019/06/20 00:43:58 christos Exp $ */
+/* $NetBSD: md.c,v 1.8 2019/07/13 17:13:40 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -318,7 +318,7 @@ md_newdisk(void)
int
-md_pre_mount(struct install_partition_desc *install)
+md_pre_mount(struct install_partition_desc *install, size_t ndx)
{
return 0;
}
Index: src/usr.sbin/sysinst/arch/zaurus/md.c
diff -u src/usr.sbin/sysinst/arch/zaurus/md.c:1.4 src/usr.sbin/sysinst/arch/zaurus/md.c:1.5
--- src/usr.sbin/sysinst/arch/zaurus/md.c:1.4 Thu Jun 13 09:36:56 2019
+++ src/usr.sbin/sysinst/arch/zaurus/md.c Sat Jul 13 17:13:40 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.4 2019/06/13 09:36:56 martin Exp $ */
+/* $NetBSD: md.c,v 1.5 2019/07/13 17:13:40 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -239,7 +239,7 @@ md_parts_use_wholedisk(struct disk_parti
int
-md_pre_mount(struct install_partition_desc *install)
+md_pre_mount(struct install_partition_desc *install, size_t ndx)
{
return 0;
}
