Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Unmounting /targetroot in md_post_newfs() is not needed.

Browse Source 
Use target_prefix() instead of /mnt2 in md_post_extract().
This commit is contained in:
phx 2011-08-21 13:40:08 +00:00
parent 7b18fe3c86
commit fd263523fc
1 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
distrib/utils/sysinst/arch/ofppc/md.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: md.c,v 1.8 2011/04/04 08:30:39 mbalmer Exp $ */
/* $NetBSD: md.c,v 1.9 2011/08/21 13:40:08 phx Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@ -297,8 +297,7 @@ int
md_post_newfs(void)
{
/* just in case */
run_program(RUN_DISPLAY, "/sbin/umount /targetroot/boot");
/* No bootblock. We use ofwboot from a partition visiable by OFW. */
return 0;
}
@ -316,25 +315,16 @@ md_post_extract(void)
"/tmp/bootinfo.txt", version, bootinfo_mbr);
if (!nobootfix) {
snprintf(bootdev, sizeof bootdev, "/dev/r%s%c", diskdev,
'a'+bootpart_fat12);
snprintf(bootbdev, sizeof bootbdev, "/dev/%s%c", diskdev,
'a'+bootpart_fat12);
if (nonewfsmsdos == 0)
run_program(RUN_DISPLAY, "/sbin/newfs_msdos %s",
bootdev);
run_program(RUN_DISPLAY, "/sbin/mount_msdos %s /mnt2",
bootbdev);
run_program(RUN_DISPLAY, "/bin/mkdir -p /mnt2/ppc");
run_program(RUN_DISPLAY, "/bin/mkdir -p /mnt2/netbsd");
run_program(RUN_DISPLAY, "/bin/mkdir -p /%s/boot/ppc",
target_prefix());
run_program(RUN_DISPLAY, "/bin/mkdir -p /%s/boot/netbsd",
target_prefix());
run_program(RUN_DISPLAY, "/bin/cp /usr/mdec/ofwboot "
"/mnt2/netbsd");
"/%s/boot/netbsd", target_prefix());
run_program(RUN_DISPLAY, "/bin/cp /tmp/bootinfo.txt "
"/mnt2/ppc");
run_program(RUN_DISPLAY,
"/bin/cp /usr/mdec/ofwboot /mnt2/ofwboot");
run_program(RUN_DISPLAY, "/sbin/umount /mnt2");
"/%s/boot/ppc", target_prefix());
run_program(RUN_DISPLAY, "/bin/cp /usr/mdec/ofwboot "
"/%s/boot/ofwboot", target_prefix());
}
if (!noprepfix) {