d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make upgrade allow reselection of failed media.

Browse Source
This commit is contained in:
jkh 1997-01-15 07:28:25 +00:00
parent ff123f1d69
commit 733cd98f43
2 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
release/sysinstall/installUpgrade.c
View File

@ -221,14 +221,17 @@ installUpgrade(dialogMenuItem *self)
if (!mediaVerify()) {
msgConfirm("Now you must specify an installation medium for the upgrade.");
media:
if (!dmenuOpenSimple(&MenuMedia, FALSE) || !mediaDevice)
return DITEM_FAILURE | DITEM_RECREATE;
}
if (!mediaDevice->init(mediaDevice)) {
msgConfirm("Couldn't initialize the media; upgrade aborted. Please\n"
"fix whatever the problem is and try again.");
return DITEM_FAILURE | DITEM_REDRAW;
if (!msgYesNo("Couldn't initialize the media. Would you like\n"
"to adjust your media selection and try again?"))
goto media;
else
return DITEM_FAILURE | DITEM_REDRAW;
}
if (RunningAsInit) {
@ -274,18 +277,17 @@ installUpgrade(dialogMenuItem *self)
variable_unset(DISK_PARTITIONED);
return DITEM_FAILURE | DITEM_RECREATE;
}
}
if (DITEM_STATUS(chroot("/mnt")) == DITEM_FAILURE) {
msgConfirm("Unable to chroot to /mnt - something is wrong with the\n"
"root partition or the way it's mounted if this doesn't work.");
variable_unset(DISK_PARTITIONED);
return DITEM_FAILURE | DITEM_RECREATE;
if (DITEM_STATUS(chroot("/mnt")) == DITEM_FAILURE) {
msgConfirm("Unable to chroot to /mnt - something is wrong with the\n"
"root partition or the way it's mounted if this doesn't work.");
variable_unset(DISK_PARTITIONED);
return DITEM_FAILURE | DITEM_RECREATE;
}
chdir("/");
systemCreateHoloshell();
}
chdir("/");
systemCreateHoloshell();
saved_etc = NULL;
if (extractingBin) {
while (!saved_etc) {

26
usr.sbin/sysinstall/installUpgrade.c
View File

@ -221,14 +221,17 @@ installUpgrade(dialogMenuItem *self)
if (!mediaVerify()) {
msgConfirm("Now you must specify an installation medium for the upgrade.");
media:
if (!dmenuOpenSimple(&MenuMedia, FALSE) || !mediaDevice)
return DITEM_FAILURE | DITEM_RECREATE;
}
if (!mediaDevice->init(mediaDevice)) {
msgConfirm("Couldn't initialize the media; upgrade aborted. Please\n"
"fix whatever the problem is and try again.");
return DITEM_FAILURE | DITEM_REDRAW;
if (!msgYesNo("Couldn't initialize the media. Would you like\n"
"to adjust your media selection and try again?"))
goto media;
else
return DITEM_FAILURE | DITEM_REDRAW;
}
if (RunningAsInit) {
@ -274,18 +277,17 @@ installUpgrade(dialogMenuItem *self)
variable_unset(DISK_PARTITIONED);
return DITEM_FAILURE | DITEM_RECREATE;
}
}
if (DITEM_STATUS(chroot("/mnt")) == DITEM_FAILURE) {
msgConfirm("Unable to chroot to /mnt - something is wrong with the\n"
"root partition or the way it's mounted if this doesn't work.");
variable_unset(DISK_PARTITIONED);
return DITEM_FAILURE | DITEM_RECREATE;
if (DITEM_STATUS(chroot("/mnt")) == DITEM_FAILURE) {
msgConfirm("Unable to chroot to /mnt - something is wrong with the\n"
"root partition or the way it's mounted if this doesn't work.");
variable_unset(DISK_PARTITIONED);
return DITEM_FAILURE | DITEM_RECREATE;
}
chdir("/");
systemCreateHoloshell();
}
chdir("/");
systemCreateHoloshell();
saved_etc = NULL;
if (extractingBin) {
while (!saved_etc) {