diff options
author | phk <phk@FreeBSD.org> | 2002-10-28 22:40:49 +0000 |
---|---|---|
committer | phk <phk@FreeBSD.org> | 2002-10-28 22:40:49 +0000 |
commit | 2defbf45e4706d08dbe7d9ae663b4b10c07da443 (patch) | |
tree | b242fae480a64bc6c921971a9626459979f485fc | |
parent | 040119a454802a5c073948f6a3cbcfb62e094bb0 (diff) | |
download | FreeBSD-src-2defbf45e4706d08dbe7d9ae663b4b10c07da443.zip FreeBSD-src-2defbf45e4706d08dbe7d9ae663b4b10c07da443.tar.gz |
Fix the wizardmodes 'write' command to not explode: Don't reference
the name in the disk tree we just deleted when we reopen.
-rw-r--r-- | usr.sbin/sade/wizard.c | 6 | ||||
-rw-r--r-- | usr.sbin/sysinstall/wizard.c | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/usr.sbin/sade/wizard.c b/usr.sbin/sade/wizard.c index e9c0da5..3a07887 100644 --- a/usr.sbin/sade/wizard.c +++ b/usr.sbin/sade/wizard.c @@ -169,8 +169,9 @@ slice_wizard(Disk *d) if (!strcasecmp(*cmds,"write")) { printf("Write=%d\n", Fake ? 0 : Write_Disk(d)); + q = strdup(d->name); Free_Disk(d); - d = Open_Disk(d->name); + d = Open_Disk(q); continue; } if (strcasecmp(*cmds,"help")) @@ -192,9 +193,6 @@ slice_wizard(Disk *d) printf("read [disk]\t\t"); printf("scan\n"); printf("write\t\t"); - printf("ENUM:\n\t"); - for(i=0;chunk_n[i];i++) - printf("%d = %s%s",i,chunk_n[i],i == 4 ? "\n\t" : " "); printf("\n"); } diff --git a/usr.sbin/sysinstall/wizard.c b/usr.sbin/sysinstall/wizard.c index e9c0da5..3a07887 100644 --- a/usr.sbin/sysinstall/wizard.c +++ b/usr.sbin/sysinstall/wizard.c @@ -169,8 +169,9 @@ slice_wizard(Disk *d) if (!strcasecmp(*cmds,"write")) { printf("Write=%d\n", Fake ? 0 : Write_Disk(d)); + q = strdup(d->name); Free_Disk(d); - d = Open_Disk(d->name); + d = Open_Disk(q); continue; } if (strcasecmp(*cmds,"help")) @@ -192,9 +193,6 @@ slice_wizard(Disk *d) printf("read [disk]\t\t"); printf("scan\n"); printf("write\t\t"); - printf("ENUM:\n\t"); - for(i=0;chunk_n[i];i++) - printf("%d = %s%s",i,chunk_n[i],i == 4 ? "\n\t" : " "); printf("\n"); } |