diff options
author | jkh <jkh@FreeBSD.org> | 1995-05-29 11:01:42 +0000 |
---|---|---|
committer | jkh <jkh@FreeBSD.org> | 1995-05-29 11:01:42 +0000 |
commit | 4bc5a2dda3322237aff9d99c18e2080f78559ba4 (patch) | |
tree | f98b313f289088a0f9384387c68ec7516031cc7e /usr.sbin/sysinstall/command.c | |
parent | 56df30b7c63bbeceb73f75bc2eb45c0e1c271e5e (diff) | |
download | FreeBSD-src-4bc5a2dda3322237aff9d99c18e2080f78559ba4.zip FreeBSD-src-4bc5a2dda3322237aff9d99c18e2080f78559ba4.tar.gz |
Sync up my work for the night. This should implement ALL possible
installation methods and provide a fairly robust set of menu options.
This should also fix a few more bugs on Poul-Henning's latest gripe
list.
Diffstat (limited to 'usr.sbin/sysinstall/command.c')
-rw-r--r-- | usr.sbin/sysinstall/command.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/usr.sbin/sysinstall/command.c b/usr.sbin/sysinstall/command.c index 1728964..57f6213 100644 --- a/usr.sbin/sysinstall/command.c +++ b/usr.sbin/sysinstall/command.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: command.c,v 1.8 1995/05/19 21:30:32 jkh Exp $ + * $Id: command.c,v 1.9 1995/05/20 13:24:33 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -167,14 +167,16 @@ command_execute(void) if (commandStack[i]->cmds[j].type == CMD_SHELL) { msgNotify("Doing %s", commandStack[i]->cmds[j].ptr); ret = vsystem((char *)commandStack[i]->cmds[j].ptr); - msgDebug("Command `%s' returns status %d\n", commandStack[i]->cmds[j].ptr, ret); + if (isDebug()) + msgDebug("Command `%s' returns status %d\n", commandStack[i]->cmds[j].ptr, ret); } else { /* It's a function pointer - call it with the key and the data */ func = (commandFunc)commandStack[i]->cmds[j].ptr; msgNotify("%x: Execute(%s, %s)", func, commandStack[i]->key, commandStack[i]->cmds[j].data); ret = (*func)(commandStack[i]->key, commandStack[i]->cmds[j].data); - msgDebug("Function @ %x returns status %d\n", commandStack[i]->cmds[j].ptr, ret); + if (isDebug()) + msgDebug("Function @ %x returns status %d\n", commandStack[i]->cmds[j].ptr, ret); } } } |