upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-09 00:32:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cope with Open_Disk() failure much more gracefully.

Browse source
This commit is contained in:
Jordan K. Hubbard 1997-01-16 14:42:21 +00:00
parent f7b630a403
commit 2974f2c077
3 changed files with 30 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
release/sysinstall/disks.c
View file

@ -189,7 +189,8 @@ diskPartition(Device *dev, Disk *d)
char *val, geometry[80];
/* Now print our overall state */
print_chunks(d);
if (d)
print_chunks(d);
print_command_summary();
if (msg) {
attrset(title_attr); mvprintw(23, 0, msg); attrset(A_NORMAL);
@ -357,17 +358,18 @@ diskPartition(Device *dev, Disk *d)
"can't undo it.");
}
else if (!msgYesNo("Are you SURE you want to Undo everything?")) {
d = Open_Disk(d->name);
if (!d) {
msgConfirm("Can't reopen disk %s! Internal state is probably corrupted", d->name);
clear();
break;
}
char cp[BUFSIZ];
sstrncpy(cp, d->name, sizeof cp);
Free_Disk(dev->private);
d = Open_Disk(cp);
if (!d)
msgConfirm("Can't reopen disk %s! Internal state is probably corrupted", cp);
dev->private = d;
variable_unset(DISK_PARTITIONED);
variable_unset(DISK_LABELLED);
record_chunks(d);
if (d)
record_chunks(d);
}
clear();
break;

18
usr.sbin/sade/disks.c
View file

@ -189,7 +189,8 @@ diskPartition(Device *dev, Disk *d)
char *val, geometry[80];
/* Now print our overall state */
print_chunks(d);
if (d)
print_chunks(d);
print_command_summary();
if (msg) {
attrset(title_attr); mvprintw(23, 0, msg); attrset(A_NORMAL);
@ -357,17 +358,18 @@ diskPartition(Device *dev, Disk *d)
"can't undo it.");
}
else if (!msgYesNo("Are you SURE you want to Undo everything?")) {
d = Open_Disk(d->name);
if (!d) {
msgConfirm("Can't reopen disk %s! Internal state is probably corrupted", d->name);
clear();
break;
}
char cp[BUFSIZ];
sstrncpy(cp, d->name, sizeof cp);
Free_Disk(dev->private);
d = Open_Disk(cp);
if (!d)
msgConfirm("Can't reopen disk %s! Internal state is probably corrupted", cp);
dev->private = d;
variable_unset(DISK_PARTITIONED);
variable_unset(DISK_LABELLED);
record_chunks(d);
if (d)
record_chunks(d);
}
clear();
break;

18
usr.sbin/sysinstall/disks.c
View file

@ -189,7 +189,8 @@ diskPartition(Device *dev, Disk *d)
char *val, geometry[80];
/* Now print our overall state */
print_chunks(d);
if (d)
print_chunks(d);
print_command_summary();
if (msg) {
attrset(title_attr); mvprintw(23, 0, msg); attrset(A_NORMAL);
@ -357,17 +358,18 @@ diskPartition(Device *dev, Disk *d)
"can't undo it.");
}
else if (!msgYesNo("Are you SURE you want to Undo everything?")) {
d = Open_Disk(d->name);
if (!d) {
msgConfirm("Can't reopen disk %s! Internal state is probably corrupted", d->name);
clear();
break;
}
char cp[BUFSIZ];
sstrncpy(cp, d->name, sizeof cp);
Free_Disk(dev->private);
d = Open_Disk(cp);
if (!d)
msgConfirm("Can't reopen disk %s! Internal state is probably corrupted", cp);
dev->private = d;
variable_unset(DISK_PARTITIONED);
variable_unset(DISK_LABELLED);
record_chunks(d);
if (d)
record_chunks(d);
}
clear();
break;