Keep fingers off /etc files until they're properly backed up.
PR: 4636 Submitted by: Jack <jack@zeus.xtalwind.net>
This commit is contained in:
parent
2ce18d2da7
commit
0c795d27ea
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=30018
@ -4,7 +4,7 @@
|
||||
* This is probably the last program in the `sysinstall' line - the next
|
||||
* generation being essentially a complete rewrite.
|
||||
*
|
||||
* $Id: installUpgrade.c,v 1.50 1997/09/08 11:09:09 jkh Exp $
|
||||
* $Id: installUpgrade.c,v 1.51 1997/09/09 09:19:30 jkh Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
@ -252,20 +252,6 @@ installUpgrade(dialogMenuItem *self)
|
||||
systemCreateHoloshell();
|
||||
}
|
||||
|
||||
media:
|
||||
if (!mediaVerify())
|
||||
return DITEM_FAILURE | DITEM_RESTORE;
|
||||
|
||||
if (!mediaDevice->init(mediaDevice)) {
|
||||
if (!msgYesNo("Couldn't initialize the media. Would you like\n"
|
||||
"to adjust your media selection and try again?")) {
|
||||
mediaDevice = NULL;
|
||||
goto media;
|
||||
}
|
||||
else
|
||||
return DITEM_FAILURE | DITEM_REDRAW;
|
||||
}
|
||||
|
||||
saved_etc = NULL;
|
||||
if (extractingBin) {
|
||||
while (!saved_etc) {
|
||||
@ -281,7 +267,7 @@ installUpgrade(dialogMenuItem *self)
|
||||
|
||||
if (saved_etc) {
|
||||
msgNotify("Preserving /etc directory..");
|
||||
if (vsystem("tar -cBpf - -C /etc . | tar -xBpf - -C %s", saved_etc))
|
||||
if (vsystem("tar -cBpf - -C /etc . | tar --unlink -xBpf - -C %s", saved_etc))
|
||||
if (msgYesNo("Unable to backup your /etc into %s.\n"
|
||||
"Do you want to continue anyway?", saved_etc) != 0)
|
||||
return DITEM_FAILURE | DITEM_RESTORE;
|
||||
@ -300,6 +286,20 @@ installUpgrade(dialogMenuItem *self)
|
||||
}
|
||||
}
|
||||
|
||||
media:
|
||||
if (!mediaVerify())
|
||||
return DITEM_FAILURE | DITEM_RESTORE;
|
||||
|
||||
if (!mediaDevice->init(mediaDevice)) {
|
||||
if (!msgYesNo("Couldn't initialize the media. Would you like\n"
|
||||
"to adjust your media selection and try again?")) {
|
||||
mediaDevice = NULL;
|
||||
goto media;
|
||||
}
|
||||
else
|
||||
return DITEM_FAILURE | DITEM_REDRAW;
|
||||
}
|
||||
|
||||
msgNotify("Beginning extraction of distributions..");
|
||||
if (DITEM_STATUS(distExtractAll(self)) == DITEM_FAILURE) {
|
||||
msgConfirm("Hmmmm. We couldn't even extract the bin distribution. This upgrade\n"
|
||||
|
@ -4,7 +4,7 @@
|
||||
* This is probably the last program in the `sysinstall' line - the next
|
||||
* generation being essentially a complete rewrite.
|
||||
*
|
||||
* $Id: installUpgrade.c,v 1.50 1997/09/08 11:09:09 jkh Exp $
|
||||
* $Id: installUpgrade.c,v 1.51 1997/09/09 09:19:30 jkh Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
@ -252,20 +252,6 @@ installUpgrade(dialogMenuItem *self)
|
||||
systemCreateHoloshell();
|
||||
}
|
||||
|
||||
media:
|
||||
if (!mediaVerify())
|
||||
return DITEM_FAILURE | DITEM_RESTORE;
|
||||
|
||||
if (!mediaDevice->init(mediaDevice)) {
|
||||
if (!msgYesNo("Couldn't initialize the media. Would you like\n"
|
||||
"to adjust your media selection and try again?")) {
|
||||
mediaDevice = NULL;
|
||||
goto media;
|
||||
}
|
||||
else
|
||||
return DITEM_FAILURE | DITEM_REDRAW;
|
||||
}
|
||||
|
||||
saved_etc = NULL;
|
||||
if (extractingBin) {
|
||||
while (!saved_etc) {
|
||||
@ -281,7 +267,7 @@ installUpgrade(dialogMenuItem *self)
|
||||
|
||||
if (saved_etc) {
|
||||
msgNotify("Preserving /etc directory..");
|
||||
if (vsystem("tar -cBpf - -C /etc . | tar -xBpf - -C %s", saved_etc))
|
||||
if (vsystem("tar -cBpf - -C /etc . | tar --unlink -xBpf - -C %s", saved_etc))
|
||||
if (msgYesNo("Unable to backup your /etc into %s.\n"
|
||||
"Do you want to continue anyway?", saved_etc) != 0)
|
||||
return DITEM_FAILURE | DITEM_RESTORE;
|
||||
@ -300,6 +286,20 @@ installUpgrade(dialogMenuItem *self)
|
||||
}
|
||||
}
|
||||
|
||||
media:
|
||||
if (!mediaVerify())
|
||||
return DITEM_FAILURE | DITEM_RESTORE;
|
||||
|
||||
if (!mediaDevice->init(mediaDevice)) {
|
||||
if (!msgYesNo("Couldn't initialize the media. Would you like\n"
|
||||
"to adjust your media selection and try again?")) {
|
||||
mediaDevice = NULL;
|
||||
goto media;
|
||||
}
|
||||
else
|
||||
return DITEM_FAILURE | DITEM_REDRAW;
|
||||
}
|
||||
|
||||
msgNotify("Beginning extraction of distributions..");
|
||||
if (DITEM_STATUS(distExtractAll(self)) == DITEM_FAILURE) {
|
||||
msgConfirm("Hmmmm. We couldn't even extract the bin distribution. This upgrade\n"
|
||||
|
Loading…
Reference in New Issue
Block a user