From 1a4cbf6251491e758cca757e635f69e373fecd67 Mon Sep 17 00:00:00 2001 From: jkh Date: Mon, 29 Apr 1996 06:47:10 +0000 Subject: Add some more debugging statements. --- release/sysinstall/disks.c | 4 +++- release/sysinstall/install.c | 6 +++++- release/sysinstall/variable.c | 4 +++- usr.sbin/sade/disks.c | 4 +++- usr.sbin/sade/install.c | 6 +++++- usr.sbin/sade/variable.c | 4 +++- usr.sbin/sysinstall/disks.c | 4 +++- usr.sbin/sysinstall/install.c | 6 +++++- usr.sbin/sysinstall/variable.c | 4 +++- 9 files changed, 33 insertions(+), 9 deletions(-) diff --git a/release/sysinstall/disks.c b/release/sysinstall/disks.c index 79f5881..a4a0095 100644 --- a/release/sysinstall/disks.c +++ b/release/sysinstall/disks.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: disks.c,v 1.44 1996/04/28 03:26:49 jkh Exp $ + * $Id: disks.c,v 1.45 1996/04/28 20:53:54 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -492,6 +492,8 @@ diskPartitionWrite(dialogMenuItem *self) msgConfirm("Unable to find any disks to write to??"); return DITEM_FAILURE; } + if (isDebug()) + msgDebug("diskPartitionWrite: Examining %d devices\n", deviceCount(devs)); for (i = 0; devs[i]; i++) { Chunk *c1; diff --git a/release/sysinstall/install.c b/release/sysinstall/install.c index ce36a3a..21009a2 100644 --- a/release/sysinstall/install.c +++ b/release/sysinstall/install.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: install.c,v 1.89 1996/04/28 03:27:02 jkh Exp $ + * $Id: install.c,v 1.90 1996/04/28 20:54:00 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -179,6 +179,8 @@ installInitial(void) msgConfirm("Couldn't make filesystems properly. Aborting."); return DITEM_FAILURE; } + else if (isDebug()) + msgDebug("installInitial: Scribbled successfully on the disk(s)\n"); if (!copySelf()) { msgConfirm("Couldn't clone the boot floppy onto the root file system.\n" @@ -378,6 +380,8 @@ installCommit(dialogMenuItem *self) str = variable_get(SYSTEM_STATE); i = DITEM_LEAVE_MENU; + if (isDebug()) + msgDebug("installCommit: System state is `%s'\n", str); if (RunningAsInit) { if (DITEM_STATUS(installInitial()) == DITEM_FAILURE) return DITEM_FAILURE; diff --git a/release/sysinstall/variable.c b/release/sysinstall/variable.c index 4f7ad73..85b19e26 100644 --- a/release/sysinstall/variable.c +++ b/release/sysinstall/variable.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: variable.c,v 1.8 1996/04/13 13:32:15 jkh Exp $ + * $Id: variable.c,v 1.9 1996/04/23 01:29:35 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -49,6 +49,8 @@ make_variable(char *var, char *value) /* Now search to see if it's already in the list */ for (newvar = VarHead; newvar; newvar = newvar->next) { if (!strcmp(newvar->name, var)) { + if (isDebug()) + msgDebug("variable %s was %s, now %s\n", newvar->name, newvar->value, value); strncpy(newvar->value, value, VAR_VALUE_MAX); return; } diff --git a/usr.sbin/sade/disks.c b/usr.sbin/sade/disks.c index 79f5881..a4a0095 100644 --- a/usr.sbin/sade/disks.c +++ b/usr.sbin/sade/disks.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: disks.c,v 1.44 1996/04/28 03:26:49 jkh Exp $ + * $Id: disks.c,v 1.45 1996/04/28 20:53:54 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -492,6 +492,8 @@ diskPartitionWrite(dialogMenuItem *self) msgConfirm("Unable to find any disks to write to??"); return DITEM_FAILURE; } + if (isDebug()) + msgDebug("diskPartitionWrite: Examining %d devices\n", deviceCount(devs)); for (i = 0; devs[i]; i++) { Chunk *c1; diff --git a/usr.sbin/sade/install.c b/usr.sbin/sade/install.c index ce36a3a..21009a2 100644 --- a/usr.sbin/sade/install.c +++ b/usr.sbin/sade/install.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: install.c,v 1.89 1996/04/28 03:27:02 jkh Exp $ + * $Id: install.c,v 1.90 1996/04/28 20:54:00 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -179,6 +179,8 @@ installInitial(void) msgConfirm("Couldn't make filesystems properly. Aborting."); return DITEM_FAILURE; } + else if (isDebug()) + msgDebug("installInitial: Scribbled successfully on the disk(s)\n"); if (!copySelf()) { msgConfirm("Couldn't clone the boot floppy onto the root file system.\n" @@ -378,6 +380,8 @@ installCommit(dialogMenuItem *self) str = variable_get(SYSTEM_STATE); i = DITEM_LEAVE_MENU; + if (isDebug()) + msgDebug("installCommit: System state is `%s'\n", str); if (RunningAsInit) { if (DITEM_STATUS(installInitial()) == DITEM_FAILURE) return DITEM_FAILURE; diff --git a/usr.sbin/sade/variable.c b/usr.sbin/sade/variable.c index 4f7ad73..85b19e26 100644 --- a/usr.sbin/sade/variable.c +++ b/usr.sbin/sade/variable.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: variable.c,v 1.8 1996/04/13 13:32:15 jkh Exp $ + * $Id: variable.c,v 1.9 1996/04/23 01:29:35 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -49,6 +49,8 @@ make_variable(char *var, char *value) /* Now search to see if it's already in the list */ for (newvar = VarHead; newvar; newvar = newvar->next) { if (!strcmp(newvar->name, var)) { + if (isDebug()) + msgDebug("variable %s was %s, now %s\n", newvar->name, newvar->value, value); strncpy(newvar->value, value, VAR_VALUE_MAX); return; } diff --git a/usr.sbin/sysinstall/disks.c b/usr.sbin/sysinstall/disks.c index 79f5881..a4a0095 100644 --- a/usr.sbin/sysinstall/disks.c +++ b/usr.sbin/sysinstall/disks.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: disks.c,v 1.44 1996/04/28 03:26:49 jkh Exp $ + * $Id: disks.c,v 1.45 1996/04/28 20:53:54 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -492,6 +492,8 @@ diskPartitionWrite(dialogMenuItem *self) msgConfirm("Unable to find any disks to write to??"); return DITEM_FAILURE; } + if (isDebug()) + msgDebug("diskPartitionWrite: Examining %d devices\n", deviceCount(devs)); for (i = 0; devs[i]; i++) { Chunk *c1; diff --git a/usr.sbin/sysinstall/install.c b/usr.sbin/sysinstall/install.c index ce36a3a..21009a2 100644 --- a/usr.sbin/sysinstall/install.c +++ b/usr.sbin/sysinstall/install.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: install.c,v 1.89 1996/04/28 03:27:02 jkh Exp $ + * $Id: install.c,v 1.90 1996/04/28 20:54:00 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -179,6 +179,8 @@ installInitial(void) msgConfirm("Couldn't make filesystems properly. Aborting."); return DITEM_FAILURE; } + else if (isDebug()) + msgDebug("installInitial: Scribbled successfully on the disk(s)\n"); if (!copySelf()) { msgConfirm("Couldn't clone the boot floppy onto the root file system.\n" @@ -378,6 +380,8 @@ installCommit(dialogMenuItem *self) str = variable_get(SYSTEM_STATE); i = DITEM_LEAVE_MENU; + if (isDebug()) + msgDebug("installCommit: System state is `%s'\n", str); if (RunningAsInit) { if (DITEM_STATUS(installInitial()) == DITEM_FAILURE) return DITEM_FAILURE; diff --git a/usr.sbin/sysinstall/variable.c b/usr.sbin/sysinstall/variable.c index 4f7ad73..85b19e26 100644 --- a/usr.sbin/sysinstall/variable.c +++ b/usr.sbin/sysinstall/variable.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: variable.c,v 1.8 1996/04/13 13:32:15 jkh Exp $ + * $Id: variable.c,v 1.9 1996/04/23 01:29:35 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -49,6 +49,8 @@ make_variable(char *var, char *value) /* Now search to see if it's already in the list */ for (newvar = VarHead; newvar; newvar = newvar->next) { if (!strcmp(newvar->name, var)) { + if (isDebug()) + msgDebug("variable %s was %s, now %s\n", newvar->name, newvar->value, value); strncpy(newvar->value, value, VAR_VALUE_MAX); return; } -- cgit v1.1