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

Fix fix.

Browse Source
This commit is contained in:
Jordan K. Hubbard 1995-10-20 10:38:49 +00:00
parent 7bf9cdd060
commit 29dd7e5407
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
release/sysinstall/installUpgrade.c
View File

@ -231,12 +231,14 @@ installUpgrade(char *str)
if (diskLabelCommit(NULL) == RET_FAIL) {
msgConfirm("Not all file systems were properly mounted. Upgrade operation\n"
"aborted.");
variable_unset(DISK_PARTITIONED);
return RET_FAIL;
}
if (chroot("/mnt") == RET_FAIL) {
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 RET_FAIL;
}
chdir("/");
@ -253,11 +255,8 @@ installUpgrade(char *str)
if (saved_etc) {
msgNotify("Preserving /etc directory..");
if (vsystem("cp -pr /etc/* %s", saved_etc)) {
msgConfirm("Unable to back up /etc directory to %s! Upgrade operation\n"
"aborted.", saved_etc);
return RET_FAIL;
}
/* cp returns a bogus status, so we can't check the status meaningfully. Bleah. */
(void)vsystem("cp -pr /etc/* %s", saved_etc)) {
}
if (file_readable("/kernel")) {

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

@ -231,12 +231,14 @@ installUpgrade(char *str)
if (diskLabelCommit(NULL) == RET_FAIL) {
msgConfirm("Not all file systems were properly mounted. Upgrade operation\n"
"aborted.");
variable_unset(DISK_PARTITIONED);
return RET_FAIL;
}
if (chroot("/mnt") == RET_FAIL) {
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 RET_FAIL;
}
chdir("/");
@ -253,11 +255,8 @@ installUpgrade(char *str)
if (saved_etc) {
msgNotify("Preserving /etc directory..");
if (vsystem("cp -pr /etc/* %s", saved_etc)) {
msgConfirm("Unable to back up /etc directory to %s! Upgrade operation\n"
"aborted.", saved_etc);
return RET_FAIL;
}
/* cp returns a bogus status, so we can't check the status meaningfully. Bleah. */
(void)vsystem("cp -pr /etc/* %s", saved_etc)) {
}
if (file_readable("/kernel")) {