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

Oups, missed a lot of run_prog() calls when I changed the prototype.

This commit is contained in:
bouyer 1999-04-09 10:43:56 +00:00
parent 04f9354ab3
commit 72d28a06a3
8 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
distrib/utils/sysinst/arch/alpha/md.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: md.c,v 1.10 1999/04/09 10:24:40 bouyer Exp $ */
/* $NetBSD: md.c,v 1.11 1999/04/09 10:43:56 bouyer Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@ -138,7 +138,7 @@ int md_post_newfs (void)
printf (msg_string(MSG_dobootblks), diskdev);
cp_to_target("/usr/mdec/boot", "/boot");
run_prog(0, 0, "/usr/mdec/installboot %s %s /dev/r%sc",
run_prog(0, 0, NULL, "/usr/mdec/installboot %s %s /dev/r%sc",
bootfile, "/usr/mdec/bootxx", diskdev);
return 0;
}
@ -151,7 +151,7 @@ int md_copy_filesystem (void)
/* Copy the instbin(s) to the disk */
printf ("%s", msg_string(MSG_dotar));
if (run_prog(0, 0, "pax -X -r -w -pe / /mnt") != 0)
if (run_prog(0, 0, NULL, "pax -X -r -w -pe / /mnt") != 0)
return 1;
/* Copy next-stage profile into target /.profile. */

14
distrib/utils/sysinst/arch/arm32/md.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: md.c,v 1.16 1999/04/09 10:24:40 bouyer Exp $ */
/* $NetBSD: md.c,v 1.17 1999/04/09 10:43:59 bouyer Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@ -283,7 +283,7 @@ int md_post_newfs (void)
#if 0
/* XXX boot blocks ... */
printf(msg_string(MSG_dobootblks), diskdev);
run_prog(0, 1, "/sbin/disklabel -B %s /dev/r%sc",
run_prog(0, 1, NULL, "/sbin/disklabel -B %s /dev/r%sc",
"-b /usr/mdec/rzboot -s /usr/mdec/bootrz", diskdev);
#endif
return 0;
@ -297,7 +297,7 @@ int md_copy_filesystem (void)
/* Copy the instbin(s) to the disk */
printf("%s", msg_string(MSG_dotar));
if (run_prog(0, 1, "pax -X -r -w -pe / /mnt") != 0)
if (run_prog(0, 1, NULL, "pax -X -r -w -pe / /mnt") != 0)
return 1;
/* Copy next-stage install profile into target /.profile. */
@ -520,9 +520,9 @@ md_cleanup_install(void)
if (scripting)
(void)fprintf(script, "%s\n", sedcmd);
do_system(sedcmd);
run_prog(1, 0, "mv -f %s %s", realto, realfrom);
run_prog(0, 0, "rm -f %s", target_expand("/sysinst"));
run_prog(0, 0, "rm -f %s", target_expand("/.termcap"));
run_prog(0, 0, "rm -f %s", target_expand("/.profile"));
run_prog(1, 0, NULL, "mv -f %s %s", realto, realfrom);
run_prog(0, 0, NULL, "rm -f %s", target_expand("/sysinst"));
run_prog(0, 0, NULL, "rm -f %s", target_expand("/.termcap"));
run_prog(0, 0, NULL, "rm -f %s", target_expand("/.profile"));
#endif
}

18
distrib/utils/sysinst/arch/bebox/md.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: md.c,v 1.8 1999/04/09 10:24:40 bouyer Exp $ */
/* $NetBSD: md.c,v 1.9 1999/04/09 10:43:59 bouyer Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@ -80,7 +80,7 @@ int md_post_disklabel(void)
/* Sector forwarding / badblocks ... */
if (*doessf) {
printf ("%s", msg_string (MSG_dobad144));
return run_prog(0, 1, "/usr/sbin/bad144 %s 0", diskdev);
return run_prog(0, 1, NULL, "/usr/sbin/bad144 %s 0", diskdev);
}
return 0;
}
@ -89,7 +89,7 @@ int md_post_newfs(void)
{
/* boot blocks ... */
printf (msg_string(MSG_dobootblks), diskdev);
run_prog (0, 1, "/usr/mdec/installboot -v /usr/mdec/biosboot.sym "
run_prog (0, 1, NULL, "/usr/mdec/installboot -v /usr/mdec/biosboot.sym "
"/dev/r%sa", diskdev);
return 0;
}
@ -102,7 +102,7 @@ int md_copy_filesystem (void)
/* Copy the instbin(s) to the disk */
printf ("%s", msg_string(MSG_dotar));
if (run_prog (0, 1, "pax -X -r -w -pe / /mnt") != 0)
if (run_prog (0, 1, NULL, "pax -X -r -w -pe / /mnt") != 0)
return 1;
/* Copy next-stage install profile into target /.profile. */
@ -288,7 +288,7 @@ editlab:
msg_prompt (MSG_packname, "mydisk", bsddiskname, DISKNAME_SIZE);
/* Create the disktab.preinstall */
run_prog (0, 0, "cp /etc/disktab.preinstall /etc/disktab");
run_prog (0, 0, NULL, "cp /etc/disktab.preinstall /etc/disktab");
#ifdef DEBUG
f = fopen ("/tmp/disktab", "a");
#else
@ -354,8 +354,8 @@ md_cleanup_install(void)
(void)fprintf(script, "%s\n", sedcmd);
do_system(sedcmd);
run_prog(1, 0, "mv -f %s %s", realto, realfrom);
run_prog(0, 0, "rm -f %s", target_expand("/sysinst"));
run_prog(0, 0, "rm -f %s", target_expand("/.termcap"));
run_prog(0, 0, "rm -f %s", target_expand("/.profile"));
run_prog(1, 0, NULL, "mv -f %s %s", realto, realfrom);
run_prog(0, 0, NULL, "rm -f %s", target_expand("/sysinst"));
run_prog(0, 0, NULL, "rm -f %s", target_expand("/.termcap"));
run_prog(0, 0, NULL, "rm -f %s", target_expand("/.profile"));
}

14
distrib/utils/sysinst/arch/mac68k/md.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: md.c,v 1.3 1999/04/09 10:24:41 bouyer Exp $ */
/* $NetBSD: md.c,v 1.4 1999/04/09 10:43:59 bouyer Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@ -709,7 +709,7 @@ md_copy_filesystem(void)
/* Copy the instbin(s) to the disk */
msg_display(MSG_dotar);
if (run_prog (0, 0, "pax -X -r -w -pe / /mnt") != 0)
if (run_prog (0, 0, NULL, "pax -X -r -w -pe / /mnt") != 0)
return 1;
/* Copy next-stage install profile into target /.profile. */
@ -806,7 +806,7 @@ md_make_bsd_partitions(void)
strcpy (bsddiskname, diskdev);
/* Create the disktab.preinstall */
run_prog (0, 0, "cp /etc/disktab.preinstall /etc/disktab");
run_prog (0, 0, NULL, "cp /etc/disktab.preinstall /etc/disktab");
#ifdef DEBUG
f = fopen ("/tmp/disktab", "a");
#else
@ -880,9 +880,9 @@ md_cleanup_install(void)
(void)fprintf(script, "%s\n", sedcmd);
do_system(sedcmd);
run_prog(1, 0, "mv -f %s %s", realto, realfrom);
run_prog(0, 0, "rm -f %s", target_expand("/sysinst"));
run_prog(0, 0, "rm -f %s", target_expand("/.termcap"));
run_prog(0, 0, "rm -f %s", target_expand("/.profile"));
run_prog(1, 0, NULL, "mv -f %s %s", realto, realfrom);
run_prog(0, 0, NULL, "rm -f %s", target_expand("/sysinst"));
run_prog(0, 0, NULL, "rm -f %s", target_expand("/.termcap"));
run_prog(0, 0, NULL, "rm -f %s", target_expand("/.profile"));
}

4
distrib/utils/sysinst/arch/macppc/md.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: md.c,v 1.7 1999/04/09 10:24:41 bouyer Exp $ */
/* $NetBSD: md.c,v 1.8 1999/04/09 10:44:00 bouyer Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@ -141,7 +141,7 @@ md_post_newfs()
printf (msg_string(MSG_dobootblks), diskdev);
cp_to_target("/usr/mdec/ofwboot", "/boot");
sync();
run_prog(0, 1, "/usr/mdec/installboot %s %s /dev/r%sa",
run_prog(0, 1, NULL, "/usr/mdec/installboot %s %s /dev/r%sa",
bootfile, "/usr/mdec/bootxx", diskdev);
return 0;
}

14
distrib/utils/sysinst/arch/pmax/md.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: md.c,v 1.26 1999/04/09 10:24:42 bouyer Exp $ */
/* $NetBSD: md.c,v 1.27 1999/04/09 10:44:00 bouyer Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@ -152,7 +152,7 @@ void md_post_newfs (void)
}
printf (msg_string(MSG_dobootblks), diskdev);
run_prog(0, 1, "/sbin/disklabel -B %s /dev/r%sc",
run_prog(0, 1, NULL, "/sbin/disklabel -B %s /dev/r%sc",
"-b /usr/mdec/rzboot -s /usr/mdec/bootrz", diskdev);
return 0;
}
@ -342,7 +342,7 @@ int md_make_bsd_partitions (void)
get_labelname();
/* Create the disktab.preinstall */
run_prog (0, 0, "cp /etc/disktab.preinstall /etc/disktab");
run_prog (0, 0, NULL, "cp /etc/disktab.preinstall /etc/disktab");
#ifdef DEBUG
f = fopen ("/tmp/disktab", "a");
#else
@ -417,9 +417,9 @@ int md_copy_filesystem (void)
/* test returns 0 on success */
dir_exists = (run_prog(0, 0, "test -d %s", diskimage_usr) == 0);
dir_exists = (run_prog(0, 0, NULL, "test -d %s", diskimage_usr) == 0);
if (dir_exists) {
if (run_prog ( 0, 1, "pax -Xrwpe -s /%s// %s /usr",
if (run_prog ( 0, 1, NULL, "pax -Xrwpe -s /%s// %s /usr",
diskimage_usr, diskimage_usr) != 0)
return 1;
}
@ -429,14 +429,14 @@ int md_copy_filesystem (void)
/* The diskimage /usr subset has served its purpose. */
/* (but leave it for now, in case of errors.) */
#if 0
run_prog(0, 0, "rm -fr %s", diskimage_usr);
run_prog(0, 0, NULL, "rm -fr %s", diskimage_usr);
#endif
return 0;
}
/* Copy all the diskimage/ramdisk binaries to the target disk. */
printf ("%s", msg_string(MSG_dotar));
if (run_prog (0, 1, "pax -X -r -w -pe / /mnt") != 0)
if (run_prog (0, 1, NULL, "pax -X -r -w -pe / /mnt") != 0)
return 1;
/* Make sure target has a copy of install kernel. */

6
distrib/utils/sysinst/arch/sparc/md.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: md.c,v 1.9 1999/04/09 10:24:42 bouyer Exp $ */
/* $NetBSD: md.c,v 1.10 1999/04/09 10:44:00 bouyer Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@ -138,9 +138,9 @@ md_post_newfs()
{
printf(msg_string(MSG_dobootblks), diskdev);
if (run_prog(0, 1, "/sbin/disklabel -W %s", diskdev) != 0)
if (run_prog(0, 1, NULL, "/sbin/disklabel -W %s", diskdev) != 0)
return 0;
run_prog(0, 1, "/usr/mdec/binstall ffs /mnt") ;
run_prog(0, 1, NULL, "/usr/mdec/binstall ffs /mnt") ;
return 0;
}

4
distrib/utils/sysinst/arch/vax/md.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: md.c,v 1.4 1999/04/09 10:24:42 bouyer Exp $ */
/* $NetBSD: md.c,v 1.5 1999/04/09 10:44:01 bouyer Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@ -143,7 +143,7 @@ md_post_newfs()
{
printf(msg_string(MSG_dobootblks), diskdev);
run_prog(0, 0, "/sbin/disklabel -B %s", diskdev);
run_prog(0, 0, NULL, "/sbin/disklabel -B %s", diskdev);
return 0;
}