diff options
| author | msaitoh <msaitoh@NetBSD.org> | 2019-11-19 06:19:04 +0000 |
|---|---|---|
| committer | msaitoh <msaitoh@NetBSD.org> | 2019-11-19 06:19:04 +0000 |
| commit | a8b8ec0d57fd827e3dc125422b7ac903053d5535 (patch) | |
| tree | 4270b6c6145d477f5ecc43cc34379269727f1f9a /usr.sbin | |
| parent | 611045e5267b66006f5c3af6fd4d7827d305bfd0 (diff) | |
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 (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/sysinst/arch/i386/md.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/usr.sbin/sysinst/arch/i386/md.c b/usr.sbin/sysinst/arch/i386/md.c index f4bba34a451..2c29f0d71dc 100644 --- a/usr.sbin/sysinst/arch/i386/md.c +++ b/usr.sbin/sysinst/arch/i386/md.c @@ -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 @@ md_post_newfs_uefi(struct install_partition_desc *install) 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 @@ md_post_newfs(struct install_partition_desc *install) 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; } |
