[src/trunk]: src/usr.sbin/sysinst/arch/i386 Fix previous: not a good idea to ...

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

details:   https://anonhg.NetBSD.org/src/rev/b76865e41b61
branches:  trunk
changeset: 1004892:b76865e41b61
user:      martin <martin%NetBSD.org@localhost>
date:      Mon Nov 18 16:05:55 2019 +0000

description:
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 1ff03aad68f7 -r b76865e41b61 usr.sbin/sysinst/arch/i386/md.c
--- a/usr.sbin/sysinst/arch/i386/md.c   Mon Nov 18 15:42:26 2019 +0000
+++ b/usr.sbin/sysinst/arch/i386/md.c   Mon Nov 18 16:05:55 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: md.c,v 1.25 2019/11/18 08:16:32 martin Exp $ */
+/*     $NetBSD: md.c,v 1.26 2019/11/18 16:05:55 martin 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_within_target("/usr/mdec/prekern", "/prekern", 0);
-       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;
 }