Module Name: src
Committed By: martin
Date: Sat Jan 29 16:01:21 UTC 2022
Modified Files:
src/usr.sbin/sysinst: defs.h install.c upgrade.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:
When upgrading, update the boot code post extraction from
the updated target file system.
To generate a diff of this commit:
cvs rdiff -u -r1.77 -r1.78 src/usr.sbin/sysinst/defs.h
cvs rdiff -u -r1.21 -r1.22 src/usr.sbin/sysinst/install.c
cvs rdiff -u -r1.18 -r1.19 src/usr.sbin/sysinst/upgrade.c
cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/sysinst/arch/acorn32/md.c
cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/sysinst/arch/alpha/md.c
cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/sysinst/arch/amiga/md.c
cvs rdiff -u -r1.13 -r1.14 src/usr.sbin/sysinst/arch/arc/md.c
cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/sysinst/arch/atari/md.c
cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/sysinst/arch/bebox/md.c
cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/sysinst/arch/cats/md.c
cvs rdiff -u -r1.14 -r1.15 src/usr.sbin/sysinst/arch/cobalt/md.c
cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/sysinst/arch/dummy/md.c
cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/sysinst/arch/emips/md.c
cvs rdiff -u -r1.21 -r1.22 src/usr.sbin/sysinst/arch/evbarm/md.c
cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/sysinst/arch/evbmips/md.c
cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/sysinst/arch/evbppc/md.c
cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/sysinst/arch/evbsh3/md.c
cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/sysinst/arch/ews4800mips/md.c
cvs rdiff -u -r1.11 -r1.12 src/usr.sbin/sysinst/arch/hp300/md.c
cvs rdiff -u -r1.10 -r1.11 src/usr.sbin/sysinst/arch/hpcarm/md.c
cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/sysinst/arch/hpcmips/md.c
cvs rdiff -u -r1.10 -r1.11 src/usr.sbin/sysinst/arch/hpcsh/md.c
cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/sysinst/arch/hppa/md.c
cvs rdiff -u -r1.33 -r1.34 src/usr.sbin/sysinst/arch/i386/md.c
cvs rdiff -u -r1.14 -r1.15 src/usr.sbin/sysinst/arch/landisk/md.c
cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/sysinst/arch/luna68k/md.c
cvs rdiff -u -r1.10 -r1.11 src/usr.sbin/sysinst/arch/mac68k/md.c
cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/sysinst/arch/macppc/md.c
cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/sysinst/arch/mipsco/md.c
cvs rdiff -u -r1.11 -r1.12 src/usr.sbin/sysinst/arch/mvme68k/md.c
cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/sysinst/arch/news68k/md.c
cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/sysinst/arch/newsmips/md.c
cvs rdiff -u -r1.12 -r1.13 src/usr.sbin/sysinst/arch/ofppc/md.c
cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/sysinst/arch/playstation2/md.c
cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/sysinst/arch/pmax/md.c
cvs rdiff -u -r1.13 -r1.14 src/usr.sbin/sysinst/arch/prep/md.c
cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/sysinst/arch/sandpoint/md.c
cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/sysinst/arch/sgimips/md.c
cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/sysinst/arch/shark/md.c
cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/sysinst/arch/sparc/md.c
cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/sysinst/arch/sparc64/md.c
cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/sysinst/arch/vax/md.c
cvs rdiff -u -r1.11 -r1.12 src/usr.sbin/sysinst/arch/x68k/md.c
cvs rdiff -u -r1.11 -r1.12 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.77 src/usr.sbin/sysinst/defs.h:1.78
--- src/usr.sbin/sysinst/defs.h:1.77 Sat Jan 29 15:32:49 2022
+++ src/usr.sbin/sysinst/defs.h Sat Jan 29 16:01:16 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: defs.h,v 1.77 2022/01/29 15:32:49 martin Exp $ */
+/* $NetBSD: defs.h,v 1.78 2022/01/29 16:01:16 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -667,7 +667,7 @@ bool md_pre_disklabel(struct install_par
bool md_post_disklabel(struct install_partition_desc*, struct disk_partitions*);
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*);
+int md_post_extract(struct install_partition_desc*, bool upgrade);
void md_cleanup_install(struct install_partition_desc*);
/* MD functions if user selects upgrade - in order called */
Index: src/usr.sbin/sysinst/install.c
diff -u src/usr.sbin/sysinst/install.c:1.21 src/usr.sbin/sysinst/install.c:1.22
--- src/usr.sbin/sysinst/install.c:1.21 Fri Oct 8 15:59:55 2021
+++ src/usr.sbin/sysinst/install.c Sat Jan 29 16:01:16 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: install.c,v 1.21 2021/10/08 15:59:55 martin Exp $ */
+/* $NetBSD: install.c,v 1.22 2022/01/29 16:01:16 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -230,7 +230,7 @@ do_install(void)
MSG_extractcomplete, MSG_abortinst) != 0)
goto error;
- if (md_post_extract(&install) != 0)
+ if (md_post_extract(&install, false) != 0)
goto error;
do_configmenu(&install);
Index: src/usr.sbin/sysinst/upgrade.c
diff -u src/usr.sbin/sysinst/upgrade.c:1.18 src/usr.sbin/sysinst/upgrade.c:1.19
--- src/usr.sbin/sysinst/upgrade.c:1.18 Thu Aug 12 09:33:59 2021
+++ src/usr.sbin/sysinst/upgrade.c Sat Jan 29 16:01:16 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: upgrade.c,v 1.18 2021/08/12 09:33:59 martin Exp $ */
+/* $NetBSD: upgrade.c,v 1.19 2022/01/29 16:01:16 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -119,7 +119,7 @@ do_upgrade(void)
MSG_upgrcomplete, MSG_abortupgr) != 0)
goto free_install;
- if (md_post_extract(&install))
+ if (md_post_extract(&install, true))
goto free_install;
merge_X("/usr/X11R6");
Index: src/usr.sbin/sysinst/arch/acorn32/md.c
diff -u src/usr.sbin/sysinst/arch/acorn32/md.c:1.7 src/usr.sbin/sysinst/arch/acorn32/md.c:1.8
--- src/usr.sbin/sysinst/arch/acorn32/md.c:1.7 Mon Oct 12 16:14:32 2020
+++ src/usr.sbin/sysinst/arch/acorn32/md.c Sat Jan 29 16:01:16 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.7 2020/10/12 16:14:32 martin Exp $ */
+/* $NetBSD: md.c,v 1.8 2022/01/29 16:01:16 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -249,7 +249,7 @@ md_post_newfs(struct install_partition_d
}
int
-md_post_extract(struct install_partition_desc *install)
+md_post_extract(struct install_partition_desc *install, bool upgrade)
{
return 0;
}
Index: src/usr.sbin/sysinst/arch/alpha/md.c
diff -u src/usr.sbin/sysinst/arch/alpha/md.c:1.9 src/usr.sbin/sysinst/arch/alpha/md.c:1.10
--- src/usr.sbin/sysinst/arch/alpha/md.c:1.9 Mon Oct 12 16:14:32 2020
+++ src/usr.sbin/sysinst/arch/alpha/md.c Sat Jan 29 16:01:16 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.9 2020/10/12 16:14:32 martin Exp $ */
+/* $NetBSD: md.c,v 1.10 2022/01/29 16:01:16 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -175,7 +175,7 @@ md_post_newfs(struct install_partition_d
}
int
-md_post_extract(struct install_partition_desc *install)
+md_post_extract(struct install_partition_desc *install, bool upgrade)
{
return 0;
}
Index: src/usr.sbin/sysinst/arch/amiga/md.c
diff -u src/usr.sbin/sysinst/arch/amiga/md.c:1.6 src/usr.sbin/sysinst/arch/amiga/md.c:1.7
--- src/usr.sbin/sysinst/arch/amiga/md.c:1.6 Mon Oct 12 16:14:32 2020
+++ src/usr.sbin/sysinst/arch/amiga/md.c Sat Jan 29 16:01:16 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.6 2020/10/12 16:14:32 martin Exp $ */
+/* $NetBSD: md.c,v 1.7 2022/01/29 16:01:16 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -115,7 +115,7 @@ md_post_newfs(struct install_partition_d
}
int
-md_post_extract(struct install_partition_desc *install)
+md_post_extract(struct install_partition_desc *install, bool upgrade)
{
return 0;
}
Index: src/usr.sbin/sysinst/arch/arc/md.c
diff -u src/usr.sbin/sysinst/arch/arc/md.c:1.13 src/usr.sbin/sysinst/arch/arc/md.c:1.14
--- src/usr.sbin/sysinst/arch/arc/md.c:1.13 Mon Oct 12 16:14:33 2020
+++ src/usr.sbin/sysinst/arch/arc/md.c Sat Jan 29 16:01:17 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.13 2020/10/12 16:14:33 martin Exp $ */
+/* $NetBSD: md.c,v 1.14 2022/01/29 16:01:17 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -188,7 +188,7 @@ md_post_newfs(struct install_partition_d
}
int
-md_post_extract(struct install_partition_desc *install)
+md_post_extract(struct install_partition_desc *install, bool upgrade)
{
return 0;
}
Index: src/usr.sbin/sysinst/arch/atari/md.c
diff -u src/usr.sbin/sysinst/arch/atari/md.c:1.7 src/usr.sbin/sysinst/arch/atari/md.c:1.8
--- src/usr.sbin/sysinst/arch/atari/md.c:1.7 Mon Oct 12 16:14:33 2020
+++ src/usr.sbin/sysinst/arch/atari/md.c Sat Jan 29 16:01:17 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.7 2020/10/12 16:14:33 martin Exp $ */
+/* $NetBSD: md.c,v 1.8 2022/01/29 16:01:17 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -144,7 +144,7 @@ md_post_newfs(struct install_partition_d
}
int
-md_post_extract(struct install_partition_desc *install)
+md_post_extract(struct install_partition_desc *install, bool upgrade)
{
return 0;
}
Index: src/usr.sbin/sysinst/arch/bebox/md.c
diff -u src/usr.sbin/sysinst/arch/bebox/md.c:1.9 src/usr.sbin/sysinst/arch/bebox/md.c:1.10
--- src/usr.sbin/sysinst/arch/bebox/md.c:1.9 Mon Oct 12 16:14:33 2020
+++ src/usr.sbin/sysinst/arch/bebox/md.c Sat Jan 29 16:01:17 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.9 2020/10/12 16:14:33 martin Exp $ */
+/* $NetBSD: md.c,v 1.10 2022/01/29 16:01:17 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -160,7 +160,7 @@ md_post_newfs(struct install_partition_d
}
int
-md_post_extract(struct install_partition_desc *install)
+md_post_extract(struct install_partition_desc *install, bool upgrade)
{
return 0;
}
Index: src/usr.sbin/sysinst/arch/cats/md.c
diff -u src/usr.sbin/sysinst/arch/cats/md.c:1.5 src/usr.sbin/sysinst/arch/cats/md.c:1.6
--- src/usr.sbin/sysinst/arch/cats/md.c:1.5 Mon Oct 12 16:14:33 2020
+++ src/usr.sbin/sysinst/arch/cats/md.c Sat Jan 29 16:01:17 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.5 2020/10/12 16:14:33 martin Exp $ */
+/* $NetBSD: md.c,v 1.6 2022/01/29 16:01:17 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -170,7 +170,7 @@ md_post_newfs(struct install_partition_d
}
int
-md_post_extract(struct install_partition_desc *install)
+md_post_extract(struct install_partition_desc *install, bool upgrade)
{
return 0;
}
Index: src/usr.sbin/sysinst/arch/cobalt/md.c
diff -u src/usr.sbin/sysinst/arch/cobalt/md.c:1.14 src/usr.sbin/sysinst/arch/cobalt/md.c:1.15
--- src/usr.sbin/sysinst/arch/cobalt/md.c:1.14 Mon Oct 12 16:14:33 2020
+++ src/usr.sbin/sysinst/arch/cobalt/md.c Sat Jan 29 16:01:17 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.14 2020/10/12 16:14:33 martin Exp $ */
+/* $NetBSD: md.c,v 1.15 2022/01/29 16:01:17 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -205,7 +205,7 @@ md_post_newfs(struct install_partition_d
}
int
-md_post_extract(struct install_partition_desc *install)
+md_post_extract(struct install_partition_desc *install, bool upgrade)
{
return 0;
}
Index: src/usr.sbin/sysinst/arch/dummy/md.c
diff -u src/usr.sbin/sysinst/arch/dummy/md.c:1.6 src/usr.sbin/sysinst/arch/dummy/md.c:1.7
--- src/usr.sbin/sysinst/arch/dummy/md.c:1.6 Mon Oct 12 16:14:33 2020
+++ src/usr.sbin/sysinst/arch/dummy/md.c Sat Jan 29 16:01:17 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.6 2020/10/12 16:14:33 martin Exp $ */
+/* $NetBSD: md.c,v 1.7 2022/01/29 16:01:17 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -94,7 +94,7 @@ md_post_newfs(struct install_partition_d
}
int
-md_post_extract(struct install_partition_desc *install)
+md_post_extract(struct install_partition_desc *install, bool upgrade)
{
return 0;
}
Index: src/usr.sbin/sysinst/arch/emips/md.c
diff -u src/usr.sbin/sysinst/arch/emips/md.c:1.9 src/usr.sbin/sysinst/arch/emips/md.c:1.10
--- src/usr.sbin/sysinst/arch/emips/md.c:1.9 Mon Oct 12 16:14:33 2020
+++ src/usr.sbin/sysinst/arch/emips/md.c Sat Jan 29 16:01:17 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.9 2020/10/12 16:14:33 martin Exp $ */
+/* $NetBSD: md.c,v 1.10 2022/01/29 16:01:17 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -162,7 +162,7 @@ md_post_newfs(struct install_partition_d
* On emips, we take this opportunity to update the boot loader.
*/
int
-md_post_extract(struct install_partition_desc *install)
+md_post_extract(struct install_partition_desc *install, bool upgrade)
{
char ldr_path[STRSIZE];
Index: src/usr.sbin/sysinst/arch/evbarm/md.c
diff -u src/usr.sbin/sysinst/arch/evbarm/md.c:1.21 src/usr.sbin/sysinst/arch/evbarm/md.c:1.22
--- src/usr.sbin/sysinst/arch/evbarm/md.c:1.21 Sun May 9 10:39:00 2021
+++ src/usr.sbin/sysinst/arch/evbarm/md.c Sat Jan 29 16:01:17 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.21 2021/05/09 10:39:00 martin Exp $ */
+/* $NetBSD: md.c,v 1.22 2022/01/29 16:01:17 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -266,7 +266,7 @@ evbarm_extract_finalize(int update)
}
int
-md_post_extract(struct install_partition_desc *install)
+md_post_extract(struct install_partition_desc *install, bool upgrade)
{
return 0;
Index: src/usr.sbin/sysinst/arch/evbmips/md.c
diff -u src/usr.sbin/sysinst/arch/evbmips/md.c:1.9 src/usr.sbin/sysinst/arch/evbmips/md.c:1.10
--- src/usr.sbin/sysinst/arch/evbmips/md.c:1.9 Mon Oct 12 16:14:33 2020
+++ src/usr.sbin/sysinst/arch/evbmips/md.c Sat Jan 29 16:01:17 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.9 2020/10/12 16:14:33 martin Exp $ */
+/* $NetBSD: md.c,v 1.10 2022/01/29 16:01:17 martin Exp $ */
/*
* Copyright 1997,2002 Piermont Information Systems Inc.
@@ -160,7 +160,7 @@ md_post_newfs(struct install_partition_d
}
int
-md_post_extract(struct install_partition_desc *install)
+md_post_extract(struct install_partition_desc *install, bool upgrade)
{
return 0;
}
Index: src/usr.sbin/sysinst/arch/evbppc/md.c
diff -u src/usr.sbin/sysinst/arch/evbppc/md.c:1.9 src/usr.sbin/sysinst/arch/evbppc/md.c:1.10
--- src/usr.sbin/sysinst/arch/evbppc/md.c:1.9 Mon Oct 12 16:14:34 2020
+++ src/usr.sbin/sysinst/arch/evbppc/md.c Sat Jan 29 16:01:18 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.9 2020/10/12 16:14:34 martin Exp $ */
+/* $NetBSD: md.c,v 1.10 2022/01/29 16:01:18 martin Exp $ */
/*
* Copyright 1997,2002 Piermont Information Systems Inc.
@@ -161,7 +161,7 @@ md_post_newfs(struct install_partition_d
}
int
-md_post_extract(struct install_partition_desc *install)
+md_post_extract(struct install_partition_desc *install, bool upgrade)
{
return 0;
}
Index: src/usr.sbin/sysinst/arch/evbsh3/md.c
diff -u src/usr.sbin/sysinst/arch/evbsh3/md.c:1.6 src/usr.sbin/sysinst/arch/evbsh3/md.c:1.7
--- src/usr.sbin/sysinst/arch/evbsh3/md.c:1.6 Mon Oct 12 16:14:34 2020
+++ src/usr.sbin/sysinst/arch/evbsh3/md.c Sat Jan 29 16:01:18 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.6 2020/10/12 16:14:34 martin Exp $ */
+/* $NetBSD: md.c,v 1.7 2022/01/29 16:01:18 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -182,7 +182,7 @@ md_init_set_status(int flags)
}
int
-md_post_extract(struct install_partition_desc *install)
+md_post_extract(struct install_partition_desc *install, bool upgrade)
{
return 0;
}
Index: src/usr.sbin/sysinst/arch/ews4800mips/md.c
diff -u src/usr.sbin/sysinst/arch/ews4800mips/md.c:1.7 src/usr.sbin/sysinst/arch/ews4800mips/md.c:1.8
--- src/usr.sbin/sysinst/arch/ews4800mips/md.c:1.7 Mon Oct 12 16:14:34 2020
+++ src/usr.sbin/sysinst/arch/ews4800mips/md.c Sat Jan 29 16:01:18 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.7 2020/10/12 16:14:34 martin Exp $ */
+/* $NetBSD: md.c,v 1.8 2022/01/29 16:01:18 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -183,7 +183,7 @@ md_post_newfs(struct install_partition_d
}
int
-md_post_extract(struct install_partition_desc *install)
+md_post_extract(struct install_partition_desc *install, bool upgrade)
{
return 0;
}
Index: src/usr.sbin/sysinst/arch/hp300/md.c
diff -u src/usr.sbin/sysinst/arch/hp300/md.c:1.11 src/usr.sbin/sysinst/arch/hp300/md.c:1.12
--- src/usr.sbin/sysinst/arch/hp300/md.c:1.11 Mon Oct 12 16:14:34 2020
+++ src/usr.sbin/sysinst/arch/hp300/md.c Sat Jan 29 16:01:18 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.11 2020/10/12 16:14:34 martin Exp $ */
+/* $NetBSD: md.c,v 1.12 2022/01/29 16:01:18 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -203,7 +203,7 @@ md_post_newfs(struct install_partition_d
}
int
-md_post_extract(struct install_partition_desc *install)
+md_post_extract(struct install_partition_desc *install, bool upgrade)
{
return 0;
}
Index: src/usr.sbin/sysinst/arch/hpcarm/md.c
diff -u src/usr.sbin/sysinst/arch/hpcarm/md.c:1.10 src/usr.sbin/sysinst/arch/hpcarm/md.c:1.11
--- src/usr.sbin/sysinst/arch/hpcarm/md.c:1.10 Mon Aug 9 19:24:33 2021
+++ src/usr.sbin/sysinst/arch/hpcarm/md.c Sat Jan 29 16:01:18 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.10 2021/08/09 19:24:33 andvar Exp $ */
+/* $NetBSD: md.c,v 1.11 2022/01/29 16:01:18 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -230,7 +230,7 @@ out:
}
int
-md_post_extract(struct install_partition_desc *install)
+md_post_extract(struct install_partition_desc *install, bool upgrade)
{
return 0;
}
Index: src/usr.sbin/sysinst/arch/hpcmips/md.c
diff -u src/usr.sbin/sysinst/arch/hpcmips/md.c:1.9 src/usr.sbin/sysinst/arch/hpcmips/md.c:1.10
--- src/usr.sbin/sysinst/arch/hpcmips/md.c:1.9 Mon Oct 12 16:14:34 2020
+++ src/usr.sbin/sysinst/arch/hpcmips/md.c Sat Jan 29 16:01:18 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.9 2020/10/12 16:14:34 martin Exp $ */
+/* $NetBSD: md.c,v 1.10 2022/01/29 16:01:18 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -193,7 +193,7 @@ md_update(struct install_partition_desc
}
int
-md_post_extract(struct install_partition_desc *install)
+md_post_extract(struct install_partition_desc *install, bool upgrade)
{
return 0;
}
Index: src/usr.sbin/sysinst/arch/hpcsh/md.c
diff -u src/usr.sbin/sysinst/arch/hpcsh/md.c:1.10 src/usr.sbin/sysinst/arch/hpcsh/md.c:1.11
--- src/usr.sbin/sysinst/arch/hpcsh/md.c:1.10 Mon Oct 12 16:14:34 2020
+++ src/usr.sbin/sysinst/arch/hpcsh/md.c Sat Jan 29 16:01:18 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.10 2020/10/12 16:14:34 martin Exp $ */
+/* $NetBSD: md.c,v 1.11 2022/01/29 16:01:18 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -192,7 +192,7 @@ md_update(struct install_partition_desc
}
int
-md_post_extract(struct install_partition_desc *install)
+md_post_extract(struct install_partition_desc *install, bool upgrade)
{
return 0;
Index: src/usr.sbin/sysinst/arch/hppa/md.c
diff -u src/usr.sbin/sysinst/arch/hppa/md.c:1.8 src/usr.sbin/sysinst/arch/hppa/md.c:1.9
--- src/usr.sbin/sysinst/arch/hppa/md.c:1.8 Mon Oct 12 16:14:34 2020
+++ src/usr.sbin/sysinst/arch/hppa/md.c Sat Jan 29 16:01:18 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.8 2020/10/12 16:14:34 martin Exp $ */
+/* $NetBSD: md.c,v 1.9 2022/01/29 16:01:18 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -194,7 +194,7 @@ md_post_newfs(struct install_partition_d
}
int
-md_post_extract(struct install_partition_desc *install)
+md_post_extract(struct install_partition_desc *install, bool upgrade)
{
return 0;
}
Index: src/usr.sbin/sysinst/arch/i386/md.c
diff -u src/usr.sbin/sysinst/arch/i386/md.c:1.33 src/usr.sbin/sysinst/arch/i386/md.c:1.34
--- src/usr.sbin/sysinst/arch/i386/md.c:1.33 Fri Oct 23 19:03:42 2020
+++ src/usr.sbin/sysinst/arch/i386/md.c Sat Jan 29 16:01:18 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.33 2020/10/23 19:03:42 martin Exp $ */
+/* $NetBSD: md.c,v 1.34 2022/01/29 16:01:18 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -233,12 +233,12 @@ md_post_disklabel(struct install_partiti
* Do all legacy bootblock update/setup here
*/
static int
-md_post_newfs_bios(struct install_partition_desc *install)
+update_bios_boot(struct install_partition_desc *install, bool use_target_files)
{
int ret;
size_t len;
char boot_options[1024];
- char *bootxx_filename;
+ char *bootxx_filename, *p;
/*
* XXX - this code retains a lot of cruft from when we went
* to great pains to exclude installboot from the ramdisk
@@ -282,13 +282,22 @@ md_post_newfs_bios(struct install_partit
return 0;
}
- ret = cp_to_target("/usr/mdec/boot", "/boot");
+ if (use_target_files)
+ ret = cp_within_target("/usr/mdec/boot", "/", 0);
+ else
+ ret = cp_to_target("/usr/mdec/boot", "/");
if (ret)
return ret;
if (pm && pm->no_part)
return 0;
- bootxx_filename = bootxx_name(install);
+ p = bootxx_name(install);
+ if (p && use_target_files) {
+ bootxx_filename = strdup(target_expand(p));
+ free(p);
+ } else {
+ bootxx_filename = p;
+ }
if (bootxx_filename != NULL) {
char rdev[PATH_MAX];
@@ -314,6 +323,12 @@ md_post_newfs_bios(struct install_partit
return ret;
}
+static int
+md_post_newfs_bios(struct install_partition_desc *install)
+{
+ return update_bios_boot(install, false);
+}
+
/*
* Make sure our bootloader(s) are in the proper directory in the boot
* boot partition (or update them).
@@ -321,7 +336,7 @@ md_post_newfs_bios(struct install_partit
static int
copy_uefi_boot(const struct part_usage_info *boot)
{
- char dev[MAXPATHLEN], path[MAXPATHLEN];
+ char dev[MAXPATHLEN], path[MAXPATHLEN], src[MAXPATHLEN];
size_t i;
int err;
@@ -349,9 +364,10 @@ copy_uefi_boot(const struct part_usage_i
make_target_dir(path);
for (i = 0; i < __arraycount(uefi_bootloaders); i++) {
- if (access(uefi_bootloaders[i], R_OK) != 0)
+ strcpy(src, target_expand(uefi_bootloaders[i]));
+ if (access(src, R_OK) != 0)
continue;
- err = cp_to_target(uefi_bootloaders[i], path);
+ err = cp_within_target(uefi_bootloaders[i], path, 0);
if (err)
return err;
}
@@ -363,19 +379,59 @@ copy_uefi_boot(const struct part_usage_i
* Find (U)EFI boot partition and install/update bootloaders
*/
static int
-md_post_newfs_uefi(struct install_partition_desc *install)
+update_uefi_boot_code(struct install_partition_desc *install)
{
- size_t i;
+ size_t i, boot_part;
+ boot_part = ~0U;
for (i = 0; i < install->num; i++) {
if (!(install->infos[i].instflags & PUIINST_BOOT))
continue;
-
- return copy_uefi_boot(&install->infos[i]);
+ boot_part = i;
+ break;
+ }
+ if (boot_part == ~0U) {
+ /*
+ * Didn't find an explicitly marked boot partition,
+ * check if we have any EFI System Partitions and
+ * use the first.
+ */
+ for (i = 0; i < install->num; i++) {
+ if (install->infos[i].type != PT_EFI_SYSTEM)
+ continue;
+ boot_part = i;
+ break;
+ }
}
+ if (boot_part < install->num)
+ return copy_uefi_boot(&install->infos[boot_part]);
+
return -1; /* no EFI boot partition found */
}
+
+/*
+ * Find bootloader options and update bootloader
+ */
+static int
+update_bios_boot_code(struct install_partition_desc *install)
+{
+ return update_bios_boot(install, true);
+}
+
+static int
+update_boot_code(struct install_partition_desc *install)
+{
+ return uefi_boot ?
+ update_uefi_boot_code(install)
+ : update_bios_boot_code(install);
+}
+
+static int
+md_post_newfs_uefi(struct install_partition_desc *install)
+{
+ return update_uefi_boot_code(install);
+}
/*
* hook called after upgrade() or install() has finished setting
@@ -391,8 +447,11 @@ md_post_newfs(struct install_partition_d
}
int
-md_post_extract(struct install_partition_desc *install)
+md_post_extract(struct install_partition_desc *install, bool upgrade)
{
+ if (upgrade)
+ update_boot_code(install);
+
#if defined(__amd64__)
if (get_kernel_set() == SET_KERNEL_2) {
int ret;
@@ -402,6 +461,7 @@ md_post_extract(struct install_partition
return ret;
}
#endif
+
return 0;
}
@@ -461,7 +521,6 @@ md_pre_update(struct install_partition_d
int
md_update(struct install_partition_desc *install)
{
- md_post_newfs(install);
return 1;
}
Index: src/usr.sbin/sysinst/arch/landisk/md.c
diff -u src/usr.sbin/sysinst/arch/landisk/md.c:1.14 src/usr.sbin/sysinst/arch/landisk/md.c:1.15
--- src/usr.sbin/sysinst/arch/landisk/md.c:1.14 Mon Oct 12 16:14:34 2020
+++ src/usr.sbin/sysinst/arch/landisk/md.c Sat Jan 29 16:01:19 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.14 2020/10/12 16:14:34 martin Exp $ */
+/* $NetBSD: md.c,v 1.15 2022/01/29 16:01:19 martin Exp $ */
/*
* Copyright 1997,2002 Piermont Information Systems Inc.
@@ -179,7 +179,7 @@ md_post_newfs(struct install_partition_d
}
int
-md_post_extract(struct install_partition_desc *install)
+md_post_extract(struct install_partition_desc *install, bool upgrade)
{
return 0;
}
Index: src/usr.sbin/sysinst/arch/luna68k/md.c
diff -u src/usr.sbin/sysinst/arch/luna68k/md.c:1.9 src/usr.sbin/sysinst/arch/luna68k/md.c:1.10
--- src/usr.sbin/sysinst/arch/luna68k/md.c:1.9 Mon Oct 12 16:14:35 2020
+++ src/usr.sbin/sysinst/arch/luna68k/md.c Sat Jan 29 16:01:19 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.9 2020/10/12 16:14:35 martin Exp $ */
+/* $NetBSD: md.c,v 1.10 2022/01/29 16:01:19 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -208,7 +208,7 @@ md_post_newfs(struct install_partition_d
}
int
-md_post_extract(struct install_partition_desc *install)
+md_post_extract(struct install_partition_desc *install, bool upgrade)
{
return 0;
Index: src/usr.sbin/sysinst/arch/mac68k/md.c
diff -u src/usr.sbin/sysinst/arch/mac68k/md.c:1.10 src/usr.sbin/sysinst/arch/mac68k/md.c:1.11
--- src/usr.sbin/sysinst/arch/mac68k/md.c:1.10 Mon Oct 12 16:14:35 2020
+++ src/usr.sbin/sysinst/arch/mac68k/md.c Sat Jan 29 16:01:19 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.10 2020/10/12 16:14:35 martin Exp $ */
+/* $NetBSD: md.c,v 1.11 2022/01/29 16:01:19 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -528,7 +528,7 @@ md_post_newfs(struct install_partition_d
}
int
-md_post_extract(struct install_partition_desc *install)
+md_post_extract(struct install_partition_desc *install, bool upgrade)
{
return 0;
}
Index: src/usr.sbin/sysinst/arch/macppc/md.c
diff -u src/usr.sbin/sysinst/arch/macppc/md.c:1.6 src/usr.sbin/sysinst/arch/macppc/md.c:1.7
--- src/usr.sbin/sysinst/arch/macppc/md.c:1.6 Mon Oct 12 16:14:35 2020
+++ src/usr.sbin/sysinst/arch/macppc/md.c Sat Jan 29 16:01:19 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.6 2020/10/12 16:14:35 martin Exp $ */
+/* $NetBSD: md.c,v 1.7 2022/01/29 16:01:19 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -185,7 +185,7 @@ md_post_newfs(struct install_partition_d
}
int
-md_post_extract(struct install_partition_desc *install)
+md_post_extract(struct install_partition_desc *install, bool upgrade)
{
return 0;
}
Index: src/usr.sbin/sysinst/arch/mipsco/md.c
diff -u src/usr.sbin/sysinst/arch/mipsco/md.c:1.8 src/usr.sbin/sysinst/arch/mipsco/md.c:1.9
--- src/usr.sbin/sysinst/arch/mipsco/md.c:1.8 Mon Oct 12 16:14:35 2020
+++ src/usr.sbin/sysinst/arch/mipsco/md.c Sat Jan 29 16:01:19 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.8 2020/10/12 16:14:35 martin Exp $ */
+/* $NetBSD: md.c,v 1.9 2022/01/29 16:01:19 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -178,7 +178,7 @@ md_post_newfs(struct install_partition_d
}
int
-md_post_extract(struct install_partition_desc *install)
+md_post_extract(struct install_partition_desc *install, bool upgrade)
{
return 0;
}
Index: src/usr.sbin/sysinst/arch/mvme68k/md.c
diff -u src/usr.sbin/sysinst/arch/mvme68k/md.c:1.11 src/usr.sbin/sysinst/arch/mvme68k/md.c:1.12
--- src/usr.sbin/sysinst/arch/mvme68k/md.c:1.11 Mon Oct 12 16:14:35 2020
+++ src/usr.sbin/sysinst/arch/mvme68k/md.c Sat Jan 29 16:01:19 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.11 2020/10/12 16:14:35 martin Exp $ */
+/* $NetBSD: md.c,v 1.12 2022/01/29 16:01:19 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -206,7 +206,7 @@ md_post_newfs(struct install_partition_d
}
int
-md_post_extract(struct install_partition_desc *install)
+md_post_extract(struct install_partition_desc *install, bool upgrade)
{
return 0;
}
Index: src/usr.sbin/sysinst/arch/news68k/md.c
diff -u src/usr.sbin/sysinst/arch/news68k/md.c:1.7 src/usr.sbin/sysinst/arch/news68k/md.c:1.8
--- src/usr.sbin/sysinst/arch/news68k/md.c:1.7 Mon Oct 12 16:14:35 2020
+++ src/usr.sbin/sysinst/arch/news68k/md.c Sat Jan 29 16:01:19 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.7 2020/10/12 16:14:35 martin Exp $ */
+/* $NetBSD: md.c,v 1.8 2022/01/29 16:01:19 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -164,7 +164,7 @@ md_post_newfs(struct install_partition_d
}
int
-md_post_extract(struct install_partition_desc *install)
+md_post_extract(struct install_partition_desc *install, bool upgrade)
{
return 0;
Index: src/usr.sbin/sysinst/arch/newsmips/md.c
diff -u src/usr.sbin/sysinst/arch/newsmips/md.c:1.6 src/usr.sbin/sysinst/arch/newsmips/md.c:1.7
--- src/usr.sbin/sysinst/arch/newsmips/md.c:1.6 Mon Oct 12 16:14:35 2020
+++ src/usr.sbin/sysinst/arch/newsmips/md.c Sat Jan 29 16:01:19 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.6 2020/10/12 16:14:35 martin Exp $ */
+/* $NetBSD: md.c,v 1.7 2022/01/29 16:01:19 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -160,7 +160,7 @@ md_post_newfs(struct install_partition_d
}
int
-md_post_extract(struct install_partition_desc *install)
+md_post_extract(struct install_partition_desc *install, bool upgrade)
{
return 0;
}
Index: src/usr.sbin/sysinst/arch/ofppc/md.c
diff -u src/usr.sbin/sysinst/arch/ofppc/md.c:1.12 src/usr.sbin/sysinst/arch/ofppc/md.c:1.13
--- src/usr.sbin/sysinst/arch/ofppc/md.c:1.12 Wed Oct 14 08:49:04 2020
+++ src/usr.sbin/sysinst/arch/ofppc/md.c Sat Jan 29 16:01:19 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.12 2020/10/14 08:49:04 martin Exp $ */
+/* $NetBSD: md.c,v 1.13 2022/01/29 16:01:19 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -425,7 +425,7 @@ md_post_newfs(struct install_partition_d
}
int
-md_post_extract(struct install_partition_desc *install)
+md_post_extract(struct install_partition_desc *install, bool upgrade)
{
char bootdev[100], bootbdev[100], version[64];
struct disk_partitions *parts;
Index: src/usr.sbin/sysinst/arch/playstation2/md.c
diff -u src/usr.sbin/sysinst/arch/playstation2/md.c:1.9 src/usr.sbin/sysinst/arch/playstation2/md.c:1.10
--- src/usr.sbin/sysinst/arch/playstation2/md.c:1.9 Mon Oct 12 16:14:35 2020
+++ src/usr.sbin/sysinst/arch/playstation2/md.c Sat Jan 29 16:01:20 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.9 2020/10/12 16:14:35 martin Exp $ */
+/* $NetBSD: md.c,v 1.10 2022/01/29 16:01:20 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -185,7 +185,7 @@ md_post_newfs(struct install_partition_d
}
int
-md_post_extract(struct install_partition_desc *install)
+md_post_extract(struct install_partition_desc *install, bool upgrade)
{
return 0;
}
Index: src/usr.sbin/sysinst/arch/pmax/md.c
diff -u src/usr.sbin/sysinst/arch/pmax/md.c:1.8 src/usr.sbin/sysinst/arch/pmax/md.c:1.9
--- src/usr.sbin/sysinst/arch/pmax/md.c:1.8 Mon Oct 12 16:14:36 2020
+++ src/usr.sbin/sysinst/arch/pmax/md.c Sat Jan 29 16:01:20 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.8 2020/10/12 16:14:36 martin Exp $ */
+/* $NetBSD: md.c,v 1.9 2022/01/29 16:01:20 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -186,7 +186,7 @@ md_post_newfs(struct install_partition_d
}
int
-md_post_extract(struct install_partition_desc *install)
+md_post_extract(struct install_partition_desc *install, bool upgrade)
{
return 0;
}
Index: src/usr.sbin/sysinst/arch/prep/md.c
diff -u src/usr.sbin/sysinst/arch/prep/md.c:1.13 src/usr.sbin/sysinst/arch/prep/md.c:1.14
--- src/usr.sbin/sysinst/arch/prep/md.c:1.13 Mon Oct 12 16:14:36 2020
+++ src/usr.sbin/sysinst/arch/prep/md.c Sat Jan 29 16:01:20 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.13 2020/10/12 16:14:36 martin Exp $ */
+/* $NetBSD: md.c,v 1.14 2022/01/29 16:01:20 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -179,7 +179,7 @@ md_post_newfs(struct install_partition_d
}
int
-md_post_extract(struct install_partition_desc *install)
+md_post_extract(struct install_partition_desc *install, bool upgrade)
{
char rawdev[100], bootpart[100], bootloader[100];
int contype;
Index: src/usr.sbin/sysinst/arch/sandpoint/md.c
diff -u src/usr.sbin/sysinst/arch/sandpoint/md.c:1.9 src/usr.sbin/sysinst/arch/sandpoint/md.c:1.10
--- src/usr.sbin/sysinst/arch/sandpoint/md.c:1.9 Mon Oct 12 16:14:36 2020
+++ src/usr.sbin/sysinst/arch/sandpoint/md.c Sat Jan 29 16:01:20 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.9 2020/10/12 16:14:36 martin Exp $ */
+/* $NetBSD: md.c,v 1.10 2022/01/29 16:01:20 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -195,7 +195,7 @@ md_post_newfs(struct install_partition_d
}
int
-md_post_extract(struct install_partition_desc *install)
+md_post_extract(struct install_partition_desc *install, bool upgrade)
{
return 0;
}
Index: src/usr.sbin/sysinst/arch/sgimips/md.c
diff -u src/usr.sbin/sysinst/arch/sgimips/md.c:1.9 src/usr.sbin/sysinst/arch/sgimips/md.c:1.10
--- src/usr.sbin/sysinst/arch/sgimips/md.c:1.9 Mon Oct 12 16:14:36 2020
+++ src/usr.sbin/sysinst/arch/sgimips/md.c Sat Jan 29 16:01:20 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.9 2020/10/12 16:14:36 martin Exp $ */
+/* $NetBSD: md.c,v 1.10 2022/01/29 16:01:20 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -191,7 +191,7 @@ md_post_newfs(struct install_partition_d
}
int
-md_post_extract(struct install_partition_desc *install)
+md_post_extract(struct install_partition_desc *install, bool upgrade)
{
return 0;
}
Index: src/usr.sbin/sysinst/arch/shark/md.c
diff -u src/usr.sbin/sysinst/arch/shark/md.c:1.6 src/usr.sbin/sysinst/arch/shark/md.c:1.7
--- src/usr.sbin/sysinst/arch/shark/md.c:1.6 Mon Oct 12 16:14:36 2020
+++ src/usr.sbin/sysinst/arch/shark/md.c Sat Jan 29 16:01:20 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.6 2020/10/12 16:14:36 martin Exp $ */
+/* $NetBSD: md.c,v 1.7 2022/01/29 16:01:20 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -161,7 +161,7 @@ md_post_newfs(struct install_partition_d
}
int
-md_post_extract(struct install_partition_desc *install)
+md_post_extract(struct install_partition_desc *install, bool upgrade)
{
msg_display(MSG_setbootdevice);
process_menu(MENU_ok, NULL);
Index: src/usr.sbin/sysinst/arch/sparc/md.c
diff -u src/usr.sbin/sysinst/arch/sparc/md.c:1.6 src/usr.sbin/sysinst/arch/sparc/md.c:1.7
--- src/usr.sbin/sysinst/arch/sparc/md.c:1.6 Mon Oct 12 16:14:36 2020
+++ src/usr.sbin/sysinst/arch/sparc/md.c Sat Jan 29 16:01:20 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.6 2020/10/12 16:14:36 martin Exp $ */
+/* $NetBSD: md.c,v 1.7 2022/01/29 16:01:20 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -127,7 +127,7 @@ md_post_newfs(struct install_partition_d
}
int
-md_post_extract(struct install_partition_desc *install)
+md_post_extract(struct install_partition_desc *install, bool upgrade)
{
return 0;
}
Index: src/usr.sbin/sysinst/arch/sparc64/md.c
diff -u src/usr.sbin/sysinst/arch/sparc64/md.c:1.6 src/usr.sbin/sysinst/arch/sparc64/md.c:1.7
--- src/usr.sbin/sysinst/arch/sparc64/md.c:1.6 Mon Oct 12 16:14:36 2020
+++ src/usr.sbin/sysinst/arch/sparc64/md.c Sat Jan 29 16:01:20 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.6 2020/10/12 16:14:36 martin Exp $ */
+/* $NetBSD: md.c,v 1.7 2022/01/29 16:01:20 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -123,7 +123,7 @@ md_post_newfs(struct install_partition_d
}
int
-md_post_extract(struct install_partition_desc *install)
+md_post_extract(struct install_partition_desc *install, bool upgrade)
{
return 0;
}
Index: src/usr.sbin/sysinst/arch/vax/md.c
diff -u src/usr.sbin/sysinst/arch/vax/md.c:1.7 src/usr.sbin/sysinst/arch/vax/md.c:1.8
--- src/usr.sbin/sysinst/arch/vax/md.c:1.7 Mon Oct 12 16:14:36 2020
+++ src/usr.sbin/sysinst/arch/vax/md.c Sat Jan 29 16:01:20 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.7 2020/10/12 16:14:36 martin Exp $ */
+/* $NetBSD: md.c,v 1.8 2022/01/29 16:01:20 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -164,7 +164,7 @@ md_post_newfs(struct install_partition_d
}
int
-md_post_extract(struct install_partition_desc *install)
+md_post_extract(struct install_partition_desc *install, bool upgrade)
{
return 0;
}
Index: src/usr.sbin/sysinst/arch/x68k/md.c
diff -u src/usr.sbin/sysinst/arch/x68k/md.c:1.11 src/usr.sbin/sysinst/arch/x68k/md.c:1.12
--- src/usr.sbin/sysinst/arch/x68k/md.c:1.11 Mon Oct 12 16:14:36 2020
+++ src/usr.sbin/sysinst/arch/x68k/md.c Sat Jan 29 16:01:21 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.11 2020/10/12 16:14:36 martin Exp $ */
+/* $NetBSD: md.c,v 1.12 2022/01/29 16:01:21 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -292,7 +292,7 @@ md_post_newfs(struct install_partition_d
}
int
-md_post_extract(struct install_partition_desc *install)
+md_post_extract(struct install_partition_desc *install, bool upgrade)
{
return 0;
}
Index: src/usr.sbin/sysinst/arch/zaurus/md.c
diff -u src/usr.sbin/sysinst/arch/zaurus/md.c:1.11 src/usr.sbin/sysinst/arch/zaurus/md.c:1.12
--- src/usr.sbin/sysinst/arch/zaurus/md.c:1.11 Mon Aug 9 19:24:33 2021
+++ src/usr.sbin/sysinst/arch/zaurus/md.c Sat Jan 29 16:01:21 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.11 2021/08/09 19:24:33 andvar Exp $ */
+/* $NetBSD: md.c,v 1.12 2022/01/29 16:01:21 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -207,7 +207,7 @@ out:
}
int
-md_post_extract(struct install_partition_desc *install)
+md_post_extract(struct install_partition_desc *install, bool upgrade)
{
return 0;
}
