diff --git a/distrib/utils/sysinst/defs.h b/distrib/utils/sysinst/defs.h index cd8462204b29..3fcc3ff5b480 100644 --- a/distrib/utils/sysinst/defs.h +++ b/distrib/utils/sysinst/defs.h @@ -1,4 +1,4 @@ -/* $NetBSD: defs.h,v 1.46 1999/07/04 21:32:48 cgd Exp $ */ +/* $NetBSD: defs.h,v 1.47 1999/07/04 21:39:33 cgd Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -274,7 +274,7 @@ void mnt_net_config __P((void)); /* From run.c */ int collect __P((int kind, char **buffer, const char *name, ...)); -int run_prog __P((int, int, const char *, const char *, ...)); +int run_prog __P((int, int, msg, const char *, ...)); void do_logging __P((void)); int do_system __P((const char *)); diff --git a/distrib/utils/sysinst/disks.c b/distrib/utils/sysinst/disks.c index 7314643b01cc..91e23b31825f 100644 --- a/distrib/utils/sysinst/disks.c +++ b/distrib/utils/sysinst/disks.c @@ -1,4 +1,4 @@ -/* $NetBSD: disks.c,v 1.28 1999/07/04 08:01:39 cgd Exp $ */ +/* $NetBSD: disks.c,v 1.29 1999/07/04 21:39:33 cgd Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -232,7 +232,7 @@ int write_disklabel (void) #ifdef DISKLABEL_CMD /* disklabel the disk */ - return run_prog(0, 1, msg_string(MSG_cmdfail), + return run_prog(0, 1, MSG_cmdfail, "%s %s %s", DISKLABEL_CMD, diskdev, bsddiskname); #endif return 0; @@ -271,7 +271,7 @@ do_ffs_newfs(const char *partname, int partno, const char *mountpoint) char devname[STRSIZE]; int error; - error = run_prog(0, 1, msg_string(MSG_cmdfail), + error = run_prog(0, 1, MSG_cmdfail, "/sbin/newfs /dev/r%s", partname); if (*mountpoint && error == 0) { snprintf(devname, STRSIZE, "/dev/%s", partname); diff --git a/distrib/utils/sysinst/run.c b/distrib/utils/sysinst/run.c index edc4faa1544f..2708ceafe375 100644 --- a/distrib/utils/sysinst/run.c +++ b/distrib/utils/sysinst/run.c @@ -1,4 +1,4 @@ -/* $NetBSD: run.c,v 1.22 1999/07/04 21:32:48 cgd Exp $ */ +/* $NetBSD: run.c,v 1.23 1999/07/04 21:39:34 cgd Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -419,7 +419,7 @@ loop: */ int -run_prog(int fatal, int display, const char *errmsg, const char *cmd, ...) +run_prog(int fatal, int display, msg errmsg, const char *cmd, ...) { va_list ap; struct winsize win; @@ -530,8 +530,8 @@ run_prog(int fatal, int display, const char *errmsg, const char *cmd, ...) va_end(ap); if (fatal && ret != 0) exit(ret); - if (ret && errmsg) { - msg_printf(errmsg, command); + if (ret && errmsg != MSG_NONE) { + msg_display(errmsg, command); process_menu(MENU_ok); } return(ret);