From ea4f82e353a9946587bb951abdf055807de19e85 Mon Sep 17 00:00:00 2001 From: jkh Date: Fri, 24 Jan 1997 19:24:51 +0000 Subject: OK, I've got two ideas to file in the "really seemed like a good idea at the time, but on further reflection..." bucket with these changes. 1. Checking the media before frobbing the disks was a fine idea, and I wish it could have worked, but that leads to a rather difficult situation when you need to mount the media someplace and you're about to: a) Chroot away from your present root. b) Newfs the root to be. You're basically screwed since there's no place to stick the mount point where it will be found following the newfs/chroot (and eliminating the chroot in favor of just using the "root bias" feature would work great for the distributions but not the pkg_add calls done by the package installer). 2. Automatic timeout handling. I don't know why, but alarm() frequently returns no residual even when the alarm didn't go off, which defies the man page but hey, since when was that so unusual? Take out timeouts but retain the code which temporarily replaces the SIGINT handler in favor of a more media-specific handler. This way, at least, if it's hanging you can at least whap it. I think the timeout code would have been losing over *really slow* links anyway, so it's probably best that it go. This should fix NFS, tape & CDROM installs again (serves me right for getting complacent and using just the FTP installs in my testing). --- release/sysinstall/options.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'release/sysinstall/options.c') diff --git a/release/sysinstall/options.c b/release/sysinstall/options.c index 284bc0e..fb05a5f 100644 --- a/release/sysinstall/options.c +++ b/release/sysinstall/options.c @@ -127,7 +127,7 @@ static Option Options[] = { OPT_IS_VAR, RELNAME_PROMPT, VAR_RELNAME, varCheck }, { "Install Root", "Which directory to unpack distributions or packages relative to", OPT_IS_VAR, INSTROOT_PROMPT, VAR_INSTALL_ROOT, varCheck }, -{ "Browser Pkg", "This is the browser package that will be used for viewing HTML docs", +{ "Browser package", "This is the browser package that will be used for viewing HTML docs", OPT_IS_VAR, BPKG_PROMPT, VAR_BROWSER_PACKAGE, varCheck }, { "Browser Exec", "This is the path to the main binary of the browser package", OPT_IS_VAR, BBIN_PROMPT, VAR_BROWSER_BINARY, varCheck }, -- cgit v1.1