diff options
| author | brucec <brucec@FreeBSD.org> | 2010-06-23 14:19:19 +0000 |
|---|---|---|
| committer | brucec <brucec@FreeBSD.org> | 2010-06-23 14:19:19 +0000 |
| commit | 181e38ac992eec26ae4c3979a2201eaa74d27bd5 (patch) | |
| tree | 807f54c65cb1f866a761ddd974f80eaafe74fead /usr.sbin/sysinstall/install.c | |
| parent | b2337fe9dd8bd759c1535c5e805731500ca30878 (diff) | |
| download | FreeBSD-src-181e38ac992eec26ae4c3979a2201eaa74d27bd5.zip FreeBSD-src-181e38ac992eec26ae4c3979a2201eaa74d27bd5.tar.gz | |
Make it easier to cancel a failing installation by only attempting to
extract distributions once. If a distribution fails to fetch/extract
and the user doesn't want to retry, abort the installation.
Reviewed by: randi
Approved by: rrs (mentor)
MFC after: 1 month
Diffstat (limited to 'usr.sbin/sysinstall/install.c')
| -rw-r--r-- | usr.sbin/sysinstall/install.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/usr.sbin/sysinstall/install.c b/usr.sbin/sysinstall/install.c index 4e7de1a..2a6a95b 100644 --- a/usr.sbin/sysinstall/install.c +++ b/usr.sbin/sysinstall/install.c @@ -678,8 +678,7 @@ nodisks: msgConfirm("Installation completed with some errors. You may wish to\n" "scroll through the debugging messages on VTY1 with the\n" "scroll-lock feature. You can also choose \"No\" at the next\n" - "prompt and go back into the installation menus to retry\n" - "whichever operations have failed."); + "prompt and reboot and try the installation again."); return i; } @@ -855,6 +854,9 @@ try_media: /* Now go get it all */ i = distExtractAll(self); + if (i == FALSE) + return FALSE; + /* When running as init, *now* it's safe to grab the rc.foo vars */ installEnvironment(); |
