| Age | Commit message (Collapse) | Author |
|---|
|
|
|
Only appeared when non-boot disks were initialized.
|
|
questions.
ask_yn() always returns a 'y' or 'n' in $resp, vastly simplifying the
logic used to check the user response.
ask_yn() insists on the user responding with a 'y', 'n', 'yes', or
'no'. Case is ignored.
Previously almost any input was accepted as either a yes or a no
depending on the question. ask_yn() reduces the chance of user error,
e.g. by answering the next question (default route) instead of the
posed one (Use DNS server now?).
All 'yes or no' questions now use ask_yn(). All questions show the
full default answer, i.e. 'yes' or 'no' rather than 'y' or 'n'.
Some minor logic cleanups of the usual sort, but no changes to logic
flow or questions bar minor verbiage adjustment.
Inspired by a Bob Beck install nit.
|
|
|
|
/usr/include and /usr/libdata/perl5/site_perl/*-openbsd.
Allows both base34 and comp34 to be upgraded from a stock install.
ok deraadt@.
|
|
will be set by DHCP.
ok drahn@ beck@ henning@
|
|
directory it points to. Previously ssl was the directory and openssl
the link.
That change causes the upgrade of the comp34 set to fail, so manually
adjust a pre-3.4 setup to the 3.4 setup before attempting to upgrade
any sets.
ok millert@.
|
|
Don't leave ftp password in a global variable. It is re-initialized
each time it is used anyway. Use a shorter (_passwd vs
_ftp_server_password) local variable name to save a few bytes.
|
|
Replace the generic 'Done - no available Xs found.' message with two
more relevant ones. Suggested several times, most memorably by Todd@.
a) For selection of disks or cds to install from, and for selection of
the root disk, make it 'No Xs found.'.
b) For processing the list of disks or interfaces to initialize, make
it 'No more Xs to initialize.'.
Delete get_root() as it is only called in one place, and insert code
at that location.
Reclaim a few characters by putting ask_which() punctuation where
message is output rather than repeating it where message passed.
|
|
Use '<msg>...done.' consistantly by replacing last five varient uses. Out with
'<msg> ... done.', '<msg>...Done.', etc.
|
|
|
|
|
|
- change 2 instances of the check from != "yes" to == "no"
ok deraadt@
|
|
looked in to get the list of available sets.
The list of available sets is obtained by connecting to the ftp server
interactively and issuing the commands
user <user> <pass>
cd <dir>
ls
where <dir> is treated as a relative path unless the user enters an
initial '/'. But the files are obtained by issuing the command
ftp ftp://<user>:<pass>@<host>/<dir>
and here <dir> is treated as an absolute path.
When using non-anonymous ftp this difference in the treatment of <dir>
could result in
a) Unhelpful error messages and unsuccessfull transfers.
b) Different sets than intended being installed.
c) Incorrect lists of available sets being displayed.
Now, the non-anonymous ftp transfer command with relative paths (i.e.
no leading '/' or '~') will look like
ftp ftp://<user>:<pass>@<host>/~/<dir>
Problem reported by (amoung others) Sebastian Stark, Nick Holland,
Steven Boothe, Sam Smith, Sergey Smitienko, Stephen Marley, Brad Ely.
ok millert@.
|
|
settings. Set them all to 'unlimited'.
Problem with datasize limit vs fsck of large filesystem noted by
millert@.
ok millert@.
|
|
|
|
In addel(), use $* and isin to avoid a duplicated traversal of the
argument list.
In bsort() remove code designed to prevent a trailing space in sorted
list. With the elimination of cutlast() and cutword() this is not
longer necessary.
The usual [] -> [[]], etc. in areas being revised.
|
|
cases and a simple sed expression in the third.
Add pfsync to the list of interfaces that should not be offered to the
user for configuration.
Display the server line selected from the ftp/http server list in a
more compact form with only a single space between fields.
The usual [] -> [[]], etc. in areas being revised.
|
|
Use first device in supplied list as default unless overridden.
Eliminates repeated 'echo XXX | cutword 1' constructs.
Use 'set -- $_devs' to parse _devs and find out if there are any
devices in the list. Then use '_devs="$*" to eliminate all extraneous
whitespace from _devs, rather than just a single trailing blank.
Usual [...] -> [[...]], `` -> $(), extra '{}' and '"' eliminations in
areas being fixed up.
|
|
timezone name from '/etc/localtime' link. Use cutword() rather than
cutlast() to see if there is more than one possible root disk. As
these were the last two uses of cutlast(), eradicate it.
Usual [...] -> [[...]], `` -> $(), extra '{}' and '"' eliminations in
areas being fixed up.
|
|
a) Add all defined swap partitions except the default partition on the
root disk to the installed /etc/fstab.
b) Mount all possible swap partitions just before creating all
devices, giving small memory machines a better chance to successfully
install/upgrade.
Should obviate the need for FAQ 4.3.6.
ok deraadt@ millert@ (slightly earlier version)
|
|
|
|
1) Don't check for the existance of /mnt/etc/hosts twice. Since we
bail out at the first check the 2nd one is superfluous.
2) Shorten and clarify the upgrade network configuration logic.
3) Always ask if manual network configuration is desired when
upgrading. Allows the upgrader to decline to use the existing network
configuration and still have an explicit opportunity to configure the
network.
4) Don't bail out if the existing network configuration fails. Instead
(see 3)) offer manual network configuration and let the user decide if
it is worthwhile to continue.
5) Refer to actual file that is missing when bailing out, rather than
forcing user to be alert enough to prepend '/mnt'.
|
|
|
|
|
|
Rather than evaluating the expression
case _f in
$resp) ...
esac
use the equivalent form
case _f in
@($resp)) ...
esac
so that user input with multiple file names, user input with some
special characters like ';', etc. do not cause syntax errors and
premature ejection from the selection loop. A determined user can
still cause problems, e.g. by using quotes.
Clean up and simplify the code while in the area.
Problems noted by todd@.
|
|
|
|
|
|
1) Filter appropriate lines (ftp or http) from ftplist once when it is
downloaded rather than everytime the lines are needed.
2) Don't display the 'ftp://' or 'http://' part of the listed url's as
all displayed url's are of the same type. Partially compensates for
the last increase in the width of the 'cat -n' line number field.
3) Store filtered lines in /tmp/serverlist instead of /tmp/ftplist,
since it can be a list of http servers too. Makes it more obvious that
it is not a copy of ftplist.
4) Avoid 'ftplist: No such file' message, but add more informative
'Getting...done.' or 'Getting...FAILED.' message. Display the actual
ftp error that caused the FAILED status.
5) Add 'done' to the list of available options when asking for a
server location, allowing the user to return to set location selection
without having to enter a server.
6) Mention the '?' option in the prompt. It re-displays the list of
servers.
7) Eliminate unneeded variables 'host' and 'maxlines'. Make global
tline a local (_line). Change _ftp_get_list global to more generic
_get_server_list.
8) General logic cleanup.
|
|
contents of ftp_server_dir or http_server_dir, and not their names.
ftp and http installs now work again.
|
|
1) Rework _url_base to eliminate need for _url_pass and _url_login
variables.
2) Shorten and make more consistant with other messages the prompt for
the list of ftp/http servers.
3) Don't refer to _ftp_server_dir, use ${_url_type}_server_dir so that
a default prompt is available for both ftp and http installs.
4) Eliminate a couple of unneeded {}'s.
|
|
Eliminate unnecessary _proxy_host variable that merely kept a copy of
the value of ftp_proxy and http_proxy.
|
|
user was observant enough to see where the filesystems are mounted.
Suggested by espie@.
|
|
Recover two of the three extra characters by deleting unneeded '-'s in
the tar invocations used in tape installs.
Problem noted and solution suggested by millert@.
|
|
|
|
Collect all tests that cause a line to be skipped into one test by
using ksh string pattern features instead of case statements.
Simply sed expressions by not worrying about extra commas in the
options field (they're ignored during mount) and assuming 'rw',
'noauto', 'xx' do not appear as substrings in any valid option.
Leave out fs_freq and fs_passno fields as unnecessary during
install/upgrade.
Eliminate special test for '/' mount point and simply strip any
trailing slash from all mount points.
Kicked off my wifried@'s 'xx'/altroot change, and ok'ed in various
incarnations by wilfried@ deraadt@ millert@.
|
|
|
|
|
|
|
|
From deraadt@
|
|
ok henning@
|
|
a) We shouldn't display passwords.
b) If it is encoded, and thus different from what was entered,
installers will leap to the incorrect conclusion that the logon
failed.
c) At this point the logon to the server was successful so the
password worked, and the user shouldn't have forgotten it already.
ok deraadt@.
|
|
default route even if 'none' or 'dhcp' is selected as the default
route for the installed system. Previously, specifying 'none' or
'dhcp' would delete the existing default route, making ftp installs
from non-local servers impossible.
This is done by only deleting the existing default route when a change
is attempted, and putting back the previous default route if the
change fails.
Problem noticed by drahn@.
|
|
Fix up default route selection by
a) Forcing user to explicitly chose 'dhcp' as a mechanism for
specifying a default route, rather than guessing based on one or more
interfaces being configured by dhcp.
b) If the user specified default route does not work, re-present the
existing default route rather than losing it.
c) Move default route selection to after nameserver activation so the
user can specify a hostname as the default route.
Change /etc/netstart so that /etc/mygate wins if a default route was
already specified (i.e. by dhcp).
ok deraadt@.
|
|
Suggestion by Nick Holland out of comments by deraadt@ and miod@.
ok deraadt@ millert@
|
|
|
|
Simplify and clarify logic around selecting/installing sets.
Rename do_selection_list() to select_sets(), and install_get_files()
to install_files().
Eliminate glob_selection() and get_get_files() and the global
GET_FILES, folding logic into select_sets() and install_files().
Show the user entire 'url' when no sets are found, rather than trying
to hide mount points, etc.
Eliminate VERSION_MAJOR and VERSION_MINOR since they were always used
together. Instead, simply construct a few variables (SETDIR, FTPDIR,
OBSD) holding the strings these were used to construct.
Various 'standard' cleanups of quotes, braces, etc. in modified areas.
Also shrinks install.sub by 681 bytes.
|
|
Add (back?) function SETSDONE was probably supposed to be doing
(preventing the automatic selection of already installed sets) by
manipulating DEFAULTSETS instead. Remove successfully installed sets
from DEFAULTSETS, and add 'problem' sets detected in sane_install()
back into DEFAULTSETS.
|
|
From David Krause.
|
|
hosts entries, so comments are not processed.
Last few touchups & shrinkage for this round.
Current score:
install.sh+install.sub+upgrade.sh = 36,934 (vs 40,062 for 3.2).
|
