[src/netbsd-9]: src/usr.sbin/sysinst/arch/i386 Pull up following revision(s) ...

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

details:   https://anonhg.NetBSD.org/src/rev/029a115e2d12
branches:  netbsd-9
changeset: 843527:029a115e2d12
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Tue Nov 19 06:19:04 2019 +0000

description:
Pull up following revision(s) (requested by martin in ticket #443):
        usr.sbin/sysinst/arch/i386/md.c: revision 1.25
        usr.sbin/sysinst/arch/i386/md.c: revision 1.26
Fix previous: the install medium may not have /usr/mdec/prekern; it was
meant to copy the one from the just installed system.
Fix previous: not a good idea to try to copy files from the not yet
extracted sets.

diffstat:

 usr.sbin/sysinst/arch/i386/md.c |  18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)

diffs (39 lines):

diff -r 89231b29b96f -r 029a115e2d12 usr.sbin/sysinst/arch/i386/md.c
--- a/usr.sbin/sysinst/arch/i386/md.c   Mon Nov 18 19:48:41 2019 +0000
+++ b/usr.sbin/sysinst/arch/i386/md.c   Tue Nov 19 06:19:04 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: md.c,v 1.20.2.2 2019/11/17 13:45:26 msaitoh Exp $ */
+/*     $NetBSD: md.c,v 1.20.2.3 2019/11/19 06:19:04 msaitoh Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -376,13 +376,6 @@
 int
 md_post_newfs(struct install_partition_desc *install)
 {
-#if defined(__amd64__)
-       int ret;
-
-       ret = cp_to_target("/usr/mdec/prekern", "/prekern");
-       if (ret)
-               return ret;
-#endif
 
        return uefi_boot ? md_post_newfs_uefi(install)
            : md_post_newfs_bios(install);
@@ -391,6 +384,15 @@
 int
 md_post_extract(struct install_partition_desc *install)
 {
+#if defined(__amd64__)
+       if (get_kernel_set() == SET_KERNEL_2) {
+               int ret;
+
+               ret = cp_within_target("/usr/mdec/prekern", "/prekern", 0);
+               if (ret)
+                       return ret;
+       }
+#endif
        return 0;
 }