diff options
| author | Jordan K. Hubbard <jkh@FreeBSD.org> | 1995-10-20 10:38:49 +0000 |
|---|---|---|
| committer | Jordan K. Hubbard <jkh@FreeBSD.org> | 1995-10-20 10:38:49 +0000 |
| commit | 29dd7e5407a9be97aab0cac6c446501b8fc6a9d6 (patch) | |
| tree | 4147d5d8c4483cd021ffec6a313db65ec9954ea4 | |
| parent | 7bf9cdd060bf2855e0c0f51e99957ab555d6cfed (diff) | |
| download | src-29dd7e5407a9be97aab0cac6c446501b8fc6a9d6.tar.gz src-29dd7e5407a9be97aab0cac6c446501b8fc6a9d6.zip | |
Fix fix.
Notes
Notes:
svn path=/head/; revision=11584
| -rw-r--r-- | release/sysinstall/installUpgrade.c | 9 | ||||
| -rw-r--r-- | usr.sbin/sysinstall/installUpgrade.c | 9 |
2 files changed, 8 insertions, 10 deletions
diff --git a/release/sysinstall/installUpgrade.c b/release/sysinstall/installUpgrade.c index bfb63c1f08d3..0a837d848b99 100644 --- a/release/sysinstall/installUpgrade.c +++ b/release/sysinstall/installUpgrade.c @@ -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")) { diff --git a/usr.sbin/sysinstall/installUpgrade.c b/usr.sbin/sysinstall/installUpgrade.c index bfb63c1f08d3..0a837d848b99 100644 --- a/usr.sbin/sysinstall/installUpgrade.c +++ b/usr.sbin/sysinstall/installUpgrade.c @@ -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")) { |