OpenBSD CVS

CVS log for src/distrib/miniroot/Attic/install.sh


[BACK] Up to [local] / src / distrib / miniroot

Request diff between arbitrary revisions


Default branch: MAIN


Revision 1.277, Sat Apr 2 12:36:49 2016 UTC (8 years, 2 months ago) by rpe
Branch: MAIN
CVS Tags: HEAD
Changes since 1.276: +0 -0 lines
FILE REMOVED

forgot to cvs rm locally in previous commit

Revision 1.276 / (download) - annotate - [select for diffs], Sat Apr 2 12:23:46 2016 UTC (8 years, 2 months ago) by rpe
Branch: MAIN
Changes since 1.275: +0 -316 lines
Diff to previous 1.275 (colored)

- merge install.sh into install.sub as do_install()
- merge upgrade.sh into install.sub as do_upgrade()
- delete install.sh and upgrade.sh
- make install.sub executable
- turn install and upgrade into symbolic links to install.sub
- add autoinstall symbolic link to install.sub
- change dot.profile to use these symlinks
- introduce a -m option to set MODE in install.sub
- alternativly set MODE and AUTO depending on PROGNAME
- execute the do_{install,upgrade) functions depending on $MODE

OK halex@, krw@
'go for it' deraadt@

Revision 1.275 / (download) - annotate - [select for diffs], Thu Feb 11 14:24:28 2016 UTC (8 years, 3 months ago) by rpe
Branch: MAIN
CVS Tags: OPENBSD_5_9_BASE, OPENBSD_5_9
Changes since 1.274: +5 -6 lines
Diff to previous 1.274 (colored)

Ensure, that the '&' is placed correctly if not all variables are set.
While there do it with less code.

with feedback from and OK halex@

Revision 1.274 / (download) - annotate - [select for diffs], Sun Jan 31 11:07:06 2016 UTC (8 years, 4 months ago) by rpe
Branch: MAIN
Changes since 1.273: +8 -9 lines
Diff to previous 1.273 (colored)

spacing

OK krw@

Revision 1.273 / (download) - annotate - [select for diffs], Sun Dec 27 18:42:11 2015 UTC (8 years, 5 months ago) by rpe
Branch: MAIN
Changes since 1.272: +7 -61 lines
Diff to previous 1.272 (colored)

Refactor and move disk initialization code from install.sh to a separate
function configure_disk() in install.sub.

based on work from and OK halex@

Revision 1.272 / (download) - annotate - [select for diffs], Wed Dec 23 18:06:32 2015 UTC (8 years, 5 months ago) by rpe
Branch: MAIN
Changes since 1.271: +2 -4 lines
Diff to previous 1.271 (colored)

Move the code, that lists uninitialized disk into a separate function.
This makes the disk initialization question code easier to understand.

OK krw@

Revision 1.271 / (download) - annotate - [select for diffs], Wed Dec 23 17:54:52 2015 UTC (8 years, 5 months ago) by rpe
Branch: MAIN
Changes since 1.270: +11 -4 lines
Diff to previous 1.270 (colored)

- quote user supplied hostname
- in this context ((NIFS)) does the same as ((NIFS != 0))
- use if-block for root ssh key question
- spacing

OK krw@

Revision 1.270 / (download) - annotate - [select for diffs], Wed Sep 9 23:07:10 2015 UTC (8 years, 8 months ago) by halex
Branch: MAIN
Changes since 1.269: +2 -2 lines
Diff to previous 1.269 (colored)

zap trailing whitespace

Revision 1.269 / (download) - annotate - [select for diffs], Sun Jul 19 21:05:41 2015 UTC (8 years, 10 months ago) by rpe
Branch: MAIN
CVS Tags: OPENBSD_5_8_BASE, OPENBSD_5_8
Changes since 1.268: +4 -7 lines
Diff to previous 1.268 (colored)

Replace two instances where ed is used for inplace editing of files
with the new sed -i.

"Nice" deraadt@
OK krw@ jasper@

Revision 1.268 / (download) - annotate - [select for diffs], Tue Jun 2 19:54:06 2015 UTC (9 years ago) by rpe
Branch: MAIN
Changes since 1.267: +2 -3 lines
Diff to previous 1.267 (colored)

Remove the $FSTABFLAG variable and use -F directly. The installer
uses disklabel UIDs unconditionally for a while already.

OK krw@
"looks good" deraadt@

Revision 1.267 / (download) - annotate - [select for diffs], Fri May 15 07:41:30 2015 UTC (9 years ago) by rpe
Branch: MAIN
Changes since 1.266: +1 -3 lines
Diff to previous 1.266 (colored)

Remove the 'Use DUIDs rather than device names in fstab?' question
and use DUIDs unconditionally. DUIDs in the installed /etc/fstab
has been the default for quite some time now.

OK deraadt@, krw@, guenther@, beck@

Revision 1.266 / (download) - annotate - [select for diffs], Mon Apr 27 23:17:11 2015 UTC (9 years, 1 month ago) by djm
Branch: MAIN
Changes since 1.265: +2 -1 lines
Diff to previous 1.265 (colored)

Rework sshd enable root login questions in light of sshd PermitRootLogin
default change. The new default is not to ask to enable root logins
when a non-root user has been addedi. There is some additional sublety
for auto-installs that provide root ssh keys.

patch by myself and rpe@ with feedback from sthen@;
ok rpe@ deraadt@ sthen@

Revision 1.265 / (download) - annotate - [select for diffs], Mon Apr 13 21:27:07 2015 UTC (9 years, 1 month ago) by deraadt
Branch: MAIN
Changes since 1.264: +2 -2 lines
Diff to previous 1.264 (colored)

pwd_mkdb now fits onto the install media.  no more chroot games.

Revision 1.264 / (download) - annotate - [select for diffs], Tue Apr 7 09:59:38 2015 UTC (9 years, 1 month ago) by rpe
Branch: MAIN
Changes since 1.263: +3 -3 lines
Diff to previous 1.263 (colored)

Tweak previous.

OK halex@ krw@

Revision 1.263 / (download) - annotate - [select for diffs], Mon Apr 6 21:36:56 2015 UTC (9 years, 1 month ago) by rpe
Branch: MAIN
Changes since 1.262: +24 -5 lines
Diff to previous 1.262 (colored)

Moar comments !! Explain what's going on during install / upgrade.

OK krw@

Revision 1.262 / (download) - annotate - [select for diffs], Sat Apr 4 14:21:01 2015 UTC (9 years, 2 months ago) by rpe
Branch: MAIN
Changes since 1.261: +3 -1 lines
Diff to previous 1.261 (colored)

I contributed substantially to the installer, so add copyright.

prodded by deraadt@

Revision 1.261 / (download) - annotate - [select for diffs], Sat Mar 28 00:03:05 2015 UTC (9 years, 2 months ago) by rpe
Branch: MAIN
Changes since 1.260: +11 -11 lines
Diff to previous 1.260 (colored)

- Start comments with capital letters.
- End comments with a full stop.

OK krw@

Revision 1.260 / (download) - annotate - [select for diffs], Wed Mar 11 21:00:35 2015 UTC (9 years, 2 months ago) by krw
Branch: MAIN
Changes since 1.259: +32 -2 lines
Diff to previous 1.259 (colored)

Shuffle some code around to make it easier to read. Add get_rootinfo()
and shuffle some install specific code into install.sh. No intentional
functional change.

Update copyrights to 2015 while here.

Tested & ok rpe@

Revision 1.259 / (download) - annotate - [select for diffs], Fri Jan 2 22:38:50 2015 UTC (9 years, 5 months ago) by rpe
Branch: MAIN
CVS Tags: OPENBSD_5_7_BASE, OPENBSD_5_7
Changes since 1.258: +4 -2 lines
Diff to previous 1.258 (colored)

Fix saving dhclient lease files during installation.

OK krw@

Revision 1.258 / (download) - annotate - [select for diffs], Fri Sep 5 07:22:29 2014 UTC (9 years, 8 months ago) by ajacoutot
Branch: MAIN
Changes since 1.257: +8 -2 lines
Diff to previous 1.257 (colored)

Remove /etc/{hosts,myname} from etc.tgz.
Make the installer create the /etc/hosts template. While here, re-add a
missing 'echo' from install.sh.

ok miod@ krw@ halex@

Revision 1.257 / (download) - annotate - [select for diffs], Wed Aug 27 14:04:15 2014 UTC (9 years, 9 months ago) by florian
Branch: MAIN
Changes since 1.256: +1 -4 lines
Diff to previous 1.256 (colored)

Nuke net.inet6.icmp6.rediraccept and allow redirects on interfaces
with autoconf enabled.
If one is doing SLAAC one does already trust link local icmp6 so the
policy for icmp6 redirects should be the same.
pointed out by & OK bluhm@; OK henning@

Revision 1.256 / (download) - annotate - [select for diffs], Sun Aug 10 16:32:28 2014 UTC (9 years, 9 months ago) by rpe
Branch: MAIN
Changes since 1.255: +2 -3 lines
Diff to previous 1.255 (colored)

Convert if foo; then bar; fi blocks to foo && bar but leave out enable_network()
because it shares code&style with /etc/netstart. No functional change.

with feedback and OK krw@ halex@

Revision 1.255 / (download) - annotate - [select for diffs], Sun Aug 10 14:59:22 2014 UTC (9 years, 9 months ago) by rpe
Branch: MAIN
Changes since 1.254: +6 -6 lines
Diff to previous 1.254 (colored)

{ foo ; bar ; } -> { foo; bar; }

OK krw@

Revision 1.254 / (download) - annotate - [select for diffs], Sat Aug 9 21:51:29 2014 UTC (9 years, 9 months ago) by halex
Branch: MAIN
Changes since 1.253: +2 -2 lines
Diff to previous 1.253 (colored)

After a cleanup by deraadt I noticed the four-space-indent had started
infesting the scripts. As we generally use a single tab for line
continuation indent in the scripts, let's reclaim 30 precious bytes!

ok rpe@ krw@

Revision 1.253 / (download) - annotate - [select for diffs], Tue Jul 22 10:03:56 2014 UTC (9 years, 10 months ago) by ajacoutot
Branch: MAIN
CVS Tags: OPENBSD_5_6_BASE, OPENBSD_5_6
Changes since 1.252: +2 -2 lines
Diff to previous 1.252 (colored)

tab->space; consistent with the other sysctl values.

Revision 1.252 / (download) - annotate - [select for diffs], Tue Jul 22 06:45:31 2014 UTC (9 years, 10 months ago) by ajacoutot
Branch: MAIN
Changes since 1.251: +2 -4 lines
Diff to previous 1.251 (colored)

Drop the "... during install" comments; they were missing in several
places and it makes things simpler: no need to check for file existence.

discussed with and ok deraadt@ rpe@

Revision 1.251 / (download) - annotate - [select for diffs], Mon Jul 21 20:43:00 2014 UTC (9 years, 10 months ago) by naddy
Branch: MAIN
Changes since 1.250: +7 -1 lines
Diff to previous 1.250 (colored)

Bring back net.inet6.icmp6.rediraccept for rtsol.  Pointed out by
bluhm@ three days ago, oops.

Revision 1.250 / (download) - annotate - [select for diffs], Mon Jul 21 20:34:14 2014 UTC (9 years, 10 months ago) by naddy
Branch: MAIN
Changes since 1.249: +1 -8 lines
Diff to previous 1.249 (colored)

Since net.inet6.ip6.accept_rtadv is gone, the installer shouldn't
set it.  Provisionally drop net.inet6.icmp6.rediraccept, too.

Revision 1.249 / (download) - annotate - [select for diffs], Wed Jul 16 08:27:14 2014 UTC (9 years, 10 months ago) by ajacoutot
Branch: MAIN
Changes since 1.248: +4 -2 lines
Diff to previous 1.248 (colored)

Add a comment at the top of sysctl.conf when it is created by the
installer.

ok deraadt@ rpe@

Revision 1.248 / (download) - annotate - [select for diffs], Tue Jul 15 08:49:50 2014 UTC (9 years, 10 months ago) by deraadt
Branch: MAIN
Changes since 1.247: +3 -5 lines
Diff to previous 1.247 (colored)

Create /etc/sysctl.conf based upon the 3 variables we might want to set
at install time.
ok aja

Revision 1.247 / (download) - annotate - [select for diffs], Sat Apr 19 16:50:52 2014 UTC (10 years, 1 month ago) by rpe
Branch: MAIN
Changes since 1.246: +3 -5 lines
Diff to previous 1.246 (colored)

Simplify things by using the return code of ask_yn() directly instead
of looking in resp. No need to specify 'no' as default answer. It's
the default for ask_yn() anyway.

OK krw@ halex@

Revision 1.246 / (download) - annotate - [select for diffs], Thu Mar 20 20:01:28 2014 UTC (10 years, 2 months ago) by krw
Branch: MAIN
Changes since 1.245: +9 -9 lines
Diff to previous 1.245 (colored)

FTP is so 20th century. Remove 'ftp' as a method to obtain installation
sets. 'http' is the present.

A bunch of related or triggered cleanup/consistenizing.

Prodded by deraadt@, much feedback and testing by rpe@.

ok rpe@

Revision 1.245 / (download) - annotate - [select for diffs], Fri Feb 21 17:11:02 2014 UTC (10 years, 3 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_5_5_BASE, OPENBSD_5_5
Changes since 1.244: +1 -3 lines
Diff to previous 1.244 (colored)

remove stupid comment from decades ago.  Proof is in the pudding, turns
out ksh is the perfect language to write this in.

Revision 1.244 / (download) - annotate - [select for diffs], Fri Feb 21 16:30:14 2014 UTC (10 years, 3 months ago) by deraadt
Branch: MAIN
Changes since 1.243: +9 -6 lines
Diff to previous 1.243 (colored)

oops, seperate pieces coming...

Revision 1.243 / (download) - annotate - [select for diffs], Fri Feb 21 16:29:08 2014 UTC (10 years, 3 months ago) by deraadt
Branch: MAIN
Changes since 1.242: +7 -10 lines
Diff to previous 1.242 (colored)

services

Revision 1.242 / (download) - annotate - [select for diffs], Tue Feb 4 00:47:27 2014 UTC (10 years, 3 months ago) by rpe
Branch: MAIN
Changes since 1.241: +2 -2 lines
Diff to previous 1.241 (colored)

simplify removal of fstab leftovers in /tmp

OK halex@

Revision 1.241 / (download) - annotate - [select for diffs], Sun Feb 2 09:32:00 2014 UTC (10 years, 4 months ago) by rpe
Branch: MAIN
Changes since 1.240: +2 -2 lines
Diff to previous 1.240 (colored)

remove -e sed option where only one command is used

ok halex@ krw@

Revision 1.240 / (download) - annotate - [select for diffs], Sun Jan 5 01:56:52 2014 UTC (10 years, 4 months ago) by deraadt
Branch: MAIN
Changes since 1.239: +3 -11 lines
Diff to previous 1.239 (colored)

Like upgrade, use feed_random right after mounting filesystems.  This
is less than ideal.  We hope the kernel has good entropy already, because
this is a reinstall??  Or maybe the ftp server startup has run to completion?
Or if this is an autoinstall, that config has enough unique in it?  This
needs more work, but the existing late-entropy feed sequence is worse.
discussed at length with rpe, who tested it

Revision 1.239 / (download) - annotate - [select for diffs], Wed Dec 18 08:04:16 2013 UTC (10 years, 5 months ago) by halex
Branch: MAIN
Changes since 1.238: +8 -1 lines
Diff to previous 1.238 (colored)

change password prompts (for the good of install.conf)
add autoinstall question for root ssh pubkey
make pubkey prompts appear in autoinstall log

ideas from and ok deraaddt@, ok rpe@

Revision 1.238 / (download) - annotate - [select for diffs], Fri Dec 6 00:42:45 2013 UTC (10 years, 5 months ago) by rpe
Branch: MAIN
Changes since 1.237: +2 -2 lines
Diff to previous 1.237 (colored)

Workaround closed stdin in non-interactive mode.

ok deraadt@

Revision 1.237 / (download) - annotate - [select for diffs], Sun Dec 1 01:54:23 2013 UTC (10 years, 6 months ago) by halex
Branch: MAIN
Changes since 1.236: +11 -5 lines
Diff to previous 1.236 (colored)

Allows the autoinstaller to pass a public ssh key for inclusion in the
user's .ssh/authorized_keys. Deliberately not in interactive mode since
I am not sure it's worth adding another question that only quite few
people would enjoy.

ok rpe@

Revision 1.236 / (download) - annotate - [select for diffs], Tue Nov 19 22:20:06 2013 UTC (10 years, 6 months ago) by halex
Branch: MAIN
Changes since 1.235: +2 -2 lines
Diff to previous 1.235 (colored)

Add autoinstall configuration to the list of files and output stirring
the random pool at install.  Apart from the configuration in itself, this
permits adding various random data in comments or whatever.

ok krw@ rpe@

Revision 1.235 / (download) - annotate - [select for diffs], Sat Nov 16 18:37:27 2013 UTC (10 years, 6 months ago) by rpe
Branch: MAIN
Changes since 1.234: +1 -2 lines
Diff to previous 1.234 (colored)

Remove AUTOROOT variable which is a leftover of r1.183 of install.sub

diff from Philipp e1c1bac6253dc54a1e89ddc046585792 at osteo dot net

ok krw@ halex@

Revision 1.234 / (download) - annotate - [select for diffs], Thu Oct 31 19:15:20 2013 UTC (10 years, 7 months ago) by halex
Branch: MAIN
Changes since 1.233: +3 -4 lines
Diff to previous 1.233 (colored)

If if looks like a duck, swims like a duck, and quacks like a duck, then
it's probably is a pre-encrypted password hash.

This means that the autoinstall configuration (and interactive password
too) does not have to specify a cleartext password.

reworked diff originating from krw@
no objections, specifically so from krw@

Revision 1.233 / (download) - annotate - [select for diffs], Fri May 31 06:27:08 2013 UTC (11 years ago) by rpe
Branch: MAIN
CVS Tags: OPENBSD_5_4_BASE, OPENBSD_5_4
Changes since 1.232: +4 -4 lines
Diff to previous 1.232 (colored)

remove unneeded '\' for line continuations

ok halex@ krw@

Revision 1.232 / (download) - annotate - [select for diffs], Mon Apr 15 18:53:50 2013 UTC (11 years, 1 month ago) by deraadt
Branch: MAIN
Changes since 1.231: +4 -4 lines
Diff to previous 1.231 (colored)

Use the dd and ed that are on the media, instead of the one post-install.
Amazing this mistake lurked for so long...

Revision 1.231 / (download) - annotate - [select for diffs], Fri Sep 28 16:23:25 2012 UTC (11 years, 8 months ago) by rpe
Branch: MAIN
CVS Tags: OPENBSD_5_3_BASE, OPENBSD_5_3
Changes since 1.230: +2 -2 lines
Diff to previous 1.230 (colored)

consistently use [[ ]] for tests

ok halex@

Revision 1.230 / (download) - annotate - [select for diffs], Fri Sep 28 16:19:05 2012 UTC (11 years, 8 months ago) by rpe
Branch: MAIN
Changes since 1.229: +2 -2 lines
Diff to previous 1.229 (colored)

remove unnecessary quotes within [[ ]]

ok halex@

Revision 1.229 / (download) - annotate - [select for diffs], Fri Sep 28 16:13:50 2012 UTC (11 years, 8 months ago) by rpe
Branch: MAIN
Changes since 1.228: +4 -4 lines
Diff to previous 1.228 (colored)

replace the last remaining backticks with $() for consistency

ok halex@

Revision 1.228 / (download) - annotate - [select for diffs], Fri Sep 28 16:07:10 2012 UTC (11 years, 8 months ago) by rpe
Branch: MAIN
Changes since 1.227: +1 -3 lines
Diff to previous 1.227 (colored)

remove a comment that does not make sense any more

ok halex@

Revision 1.227 / (download) - annotate - [select for diffs], Fri Sep 28 15:48:05 2012 UTC (11 years, 8 months ago) by rpe
Branch: MAIN
Changes since 1.226: +4 -5 lines
Diff to previous 1.226 (colored)

replace _fsent array with a simple concatenated list

ok halex@

Revision 1.226 / (download) - annotate - [select for diffs], Mon Sep 3 07:34:37 2012 UTC (11 years, 9 months ago) by deraadt
Branch: MAIN
Changes since 1.225: +2 -2 lines
Diff to previous 1.225 (colored)

compress arguments to the ftp command; ok halex

Revision 1.225 / (download) - annotate - [select for diffs], Tue Jan 31 20:01:12 2012 UTC (12 years, 4 months ago) by halex
Branch: MAIN
CVS Tags: OPENBSD_5_2_BASE, OPENBSD_5_2, OPENBSD_5_1_BASE, OPENBSD_5_1
Changes since 1.224: +2 -2 lines
Diff to previous 1.224 (colored)

redirect stdout to /dev/null instead of closing it

ok krw@

Revision 1.224 / (download) - annotate - [select for diffs], Wed Aug 17 03:42:14 2011 UTC (12 years, 9 months ago) by todd
Branch: MAIN
Changes since 1.223: +2 -3 lines
Diff to previous 1.223 (colored)

make sure to set two rtsol sysctls, not just the last one
ok krw@

Revision 1.223 / (download) - annotate - [select for diffs], Sun Jul 24 15:33:41 2011 UTC (12 years, 10 months ago) by fgsch
Branch: MAIN
CVS Tags: OPENBSD_5_0_BASE, OPENBSD_5_0
Changes since 1.222: +2 -2 lines
Diff to previous 1.222 (colored)

use the right sysctl, doh!
pointed out by Moritz Grimm (mgrimm-at-mrsserver-dot-net)

Revision 1.222 / (download) - annotate - [select for diffs], Sat Jul 23 08:31:25 2011 UTC (12 years, 10 months ago) by fgsch
Branch: MAIN
Changes since 1.221: +3 -1 lines
Diff to previous 1.221 (colored)

uncomment net.inet6.ip6.rediraccept from /etc/sysctl.conf as well if the
user picks up rtsol.
reported in bugs@ by Rene Maroufi (info at maroufi dot net).
bluhm@ ok

Revision 1.221 / (download) - annotate - [select for diffs], Mon Jul 4 20:59:05 2011 UTC (12 years, 11 months ago) by halex
Branch: MAIN
Changes since 1.220: +7 -1 lines
Diff to previous 1.220 (colored)

there is no need to do the rtsol check (whether to enable
net.inet6.ip6.accept_rtadv in sysctl.conf or not) on updates
as then we dont do any network config, so move it from
install.sub to install.sh

idea not rejected by IPv6-enabled bluhm@
ok krw@ deraadt@

Revision 1.220 / (download) - annotate - [select for diffs], Sun Apr 17 21:02:44 2011 UTC (13 years, 1 month ago) by krw
Branch: MAIN
Changes since 1.219: +2 -2 lines
Diff to previous 1.219 (colored)

Make DUID fstab the default so we can see how people like it. Requested
by deraadt@.

Revision 1.219 / (download) - annotate - [select for diffs], Sun Apr 17 20:57:10 2011 UTC (13 years, 1 month ago) by krw
Branch: MAIN
Changes since 1.218: +15 -8 lines
Diff to previous 1.218 (colored)

First crack at enabling the installation of a DUID version of
/etc/fstab, after asking user. Current default is existing behaviour.

Feedback & suggestions deraadt@, halex@, jsing@, todd@.

ok deraadt@

Revision 1.218 / (download) - annotate - [select for diffs], Mon Apr 4 14:37:25 2011 UTC (13 years, 2 months ago) by ajacoutot
Branch: MAIN
Changes since 1.217: +2 -1 lines
Diff to previous 1.217 (colored)

If we choose to create a user during installation, put it into
/root/.forward.

"makes sense" kettenis, ok pirofti@ deraadt@

Revision 1.217 / (download) - annotate - [select for diffs], Mon Feb 7 18:01:08 2011 UTC (13 years, 3 months ago) by miod
Branch: MAIN
CVS Tags: OPENBSD_4_9_BASE, OPENBSD_4_9
Changes since 1.216: +2 -2 lines
Diff to previous 1.216 (colored)

Use absolute path to the temporary hosts file; causes /etc/hosts to be correctly
populated upon installation again.

Revision 1.216 / (download) - annotate - [select for diffs], Mon Jan 10 06:49:08 2011 UTC (13 years, 4 months ago) by deraadt
Branch: MAIN
Changes since 1.215: +2 -2 lines
Diff to previous 1.215 (colored)

like in /etc/rc, talk to /dev/arandom as a single read or write.
in particular a single write will result in a single re-key event,
rather than 64 writes causing 64 re-keys -- wasting the kernel's time.

Revision 1.215 / (download) - annotate - [select for diffs], Mon Jan 3 00:36:50 2011 UTC (13 years, 5 months ago) by deraadt
Branch: MAIN
Changes since 1.214: +26 -30 lines
Diff to previous 1.214 (colored)

reduce the amount of cd'ing in the install script, since it sucks
to change the environment that functions assume they run in.  use
sub-shells or absolute paths when possible.
ok krw

Revision 1.214 / (download) - annotate - [select for diffs], Wed Dec 22 22:22:40 2010 UTC (13 years, 5 months ago) by todd
Branch: MAIN
Changes since 1.213: +1 -2 lines
Diff to previous 1.213 (colored)

remove redundant junk
pointed out by Mikalaj Kucharski, mikolaj at kuharski dot name
ok deraadt@

Revision 1.213 / (download) - annotate - [select for diffs], Wed Dec 22 21:23:26 2010 UTC (13 years, 5 months ago) by todd
Branch: MAIN
Changes since 1.212: +3 -2 lines
Diff to previous 1.212 (colored)

add more commands of output of random "junk" to arandom
please commit deraadt@

Revision 1.212 / (download) - annotate - [select for diffs], Wed Dec 22 18:23:54 2010 UTC (13 years, 5 months ago) by deraadt
Branch: MAIN
Changes since 1.211: +4 -4 lines
Diff to previous 1.211 (colored)

wow, we must reach into the chroot for /dev/arandom, meaning some of
this code has been busted for quite a while.
pointed out by miod

Revision 1.211 / (download) - annotate - [select for diffs], Wed Dec 22 18:13:15 2010 UTC (13 years, 5 months ago) by deraadt
Branch: MAIN
Changes since 1.210: +4 -4 lines
Diff to previous 1.210 (colored)

Consistantly use /dev/arandom for feeding entropy to the kernel.
ok kjell otto miod

Revision 1.210 / (download) - annotate - [select for diffs], Sat Oct 30 22:48:03 2010 UTC (13 years, 7 months ago) by deraadt
Branch: MAIN
Changes since 1.209: +5 -4 lines
Diff to previous 1.209 (colored)

for the user, create a matching group and put the user in there by default; ok halex guenther

Revision 1.209 / (download) - annotate - [select for diffs], Fri Oct 29 07:43:09 2010 UTC (13 years, 7 months ago) by deraadt
Branch: MAIN
Changes since 1.208: +4 -3 lines
Diff to previous 1.208 (colored)

for late TZ handling, place the temporarily tzlist file into /mnt/tmp
(which has already been mounted).
discussed with halex

Revision 1.208 / (download) - annotate - [select for diffs], Wed Aug 4 07:07:41 2010 UTC (13 years, 10 months ago) by halex
Branch: MAIN
CVS Tags: OPENBSD_4_8_BASE, OPENBSD_4_8
Changes since 1.207: +4 -2 lines
Diff to previous 1.207 (colored)

Set an appropriate To: header in /var/mail/$user which is copied from
/var/mail/root

idea and first version from deraadt@, ok deraadt@ krw@

Revision 1.207 / (download) - annotate - [select for diffs], Tue Apr 6 21:01:20 2010 UTC (14 years, 1 month ago) by deraadt
Branch: MAIN
Changes since 1.206: +2 -2 lines
Diff to previous 1.206 (colored)

Try a more detailed message about the time

Revision 1.206 / (download) - annotate - [select for diffs], Sun Apr 4 22:29:08 2010 UTC (14 years, 2 months ago) by halex
Branch: MAIN
Changes since 1.205: +15 -1 lines
Diff to previous 1.205 (colored)

If the system time is off by more than 120 seconds from the TIME=nnn
supplied from ftplist.cgi, ask if the user wants to set it accordingly.

Idea from deraadt@, feedback from sthen@, guenther@
ok deraadt@, krw@ (slightly different version)

Revision 1.205 / (download) - annotate - [select for diffs], Fri Jul 10 02:59:32 2009 UTC (14 years, 10 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_4_7_BASE, OPENBSD_4_7, OPENBSD_4_6_BASE, OPENBSD_4_6
Changes since 1.204: +3 -3 lines
Diff to previous 1.204 (colored)

We should be using the $SERVERLISTALL (not the url-only $SERVERLIST) to
decide to talk-back.  Sigh.

Revision 1.204 / (download) - annotate - [select for diffs], Thu Jul 2 23:48:34 2009 UTC (14 years, 11 months ago) by krw
Branch: MAIN
Changes since 1.203: +5 -3 lines
Diff to previous 1.203 (colored)

Do *not* newfs non-ffs partitions while installing. Even if someone
has entered 'n i' in disklabel and caused a mountpoint to be saved
for the non-ffs partition. Discovered by and fix tested by mgrimm@.

ok deraadt@.

Revision 1.203 / (download) - annotate - [select for diffs], Sat Jun 27 08:33:27 2009 UTC (14 years, 11 months ago) by ajacoutot
Branch: MAIN
Changes since 1.202: +2 -2 lines
Diff to previous 1.202 (colored)

Add initial user to the 'staff' class.

ok deraadt@, ok krw@

Revision 1.202 / (download) - annotate - [select for diffs], Thu Jun 11 02:44:50 2009 UTC (14 years, 11 months ago) by krw
Branch: MAIN
Changes since 1.201: +2 -2 lines
Diff to previous 1.201 (colored)

No need to show the filename the duplicate mount point was detected
in. Noticed in an error message from todd@.

Revision 1.201 / (download) - annotate - [select for diffs], Tue Jun 9 10:11:21 2009 UTC (14 years, 11 months ago) by halex
Branch: MAIN
Changes since 1.200: +7 -2 lines
Diff to previous 1.200 (colored)

Update the user input routines to (re-evaluate and) redraw the
question if dmesg changes are detected. The password reading
routines are not subject to these changes at this point.

ok deraadt@, krw@

Revision 1.200 / (download) - annotate - [select for diffs], Wed Jun 3 00:30:31 2009 UTC (15 years ago) by krw
Branch: MAIN
Changes since 1.199: +1 -2 lines
Diff to previous 1.199 (colored)

Only need to umount once on restarting. Force umounts in case of
restarting. No need to ask for verbose umount output since we send
it all to /dev/null. Make sure we start in '/', lest we were restarted
while exploring the installed/upgraded filesystems.

Revision 1.199 / (download) - annotate - [select for diffs], Tue Jun 2 23:53:34 2009 UTC (15 years ago) by krw
Branch: MAIN
Changes since 1.198: +115 -115 lines
Diff to previous 1.198 (colored)

Nuke sissy verbiage about losing data. No more special casing for
restarted installs/upgrades. They should just work the same as first
attempts except for presenting some remembered info as default
answers.

ok deraadt@

Revision 1.198 / (download) - annotate - [select for diffs], Mon Jun 1 02:57:40 2009 UTC (15 years ago) by krw
Branch: MAIN
Changes since 1.197: +2 -2 lines
Diff to previous 1.197 (colored)

Test the return value of md_prep_disklabel() to detect failed
attempts to write a disklabel. When failure is detected don't
configure the disk, return it to the list of disks available to be
configured.

Revision 1.197 / (download) - annotate - [select for diffs], Sun May 31 18:38:42 2009 UTC (15 years ago) by deraadt
Branch: MAIN
Changes since 1.196: +8 -4 lines
Diff to previous 1.196 (colored)

push the dmesg and $SERVERLIST into the random pool to enhance the
entropy, before we pull out the host.random for the next boot

Revision 1.196 / (download) - annotate - [select for diffs], Sun May 31 00:03:29 2009 UTC (15 years ago) by deraadt
Branch: MAIN
Changes since 1.195: +2 -1 lines
Diff to previous 1.195 (colored)

Ask the cgi to remember the install method too, and as a result, this
makes two more questions only need a return.
ok krw

Revision 1.195 / (download) - annotate - [select for diffs], Sun May 31 00:02:50 2009 UTC (15 years ago) by deraadt
Branch: MAIN
Changes since 1.194: +2 -3 lines
Diff to previous 1.194 (colored)

Change the order of the installer questions again, because it is better.
hostname, network, root password, misc, timezone, and then the disks
and sets.
ok krw

Revision 1.194 / (download) - annotate - [select for diffs], Sat May 30 20:40:59 2009 UTC (15 years ago) by deraadt
Branch: MAIN
Changes since 1.193: +18 -3 lines
Diff to previous 1.193 (colored)

Defer talking to the ftpinstall cgi until a fair bit later, so that we can
also tell it the timezone.  As a result, this will also work for non-url
based installs.

Revision 1.193 / (download) - annotate - [select for diffs], Sat May 30 19:34:39 2009 UTC (15 years ago) by deraadt
Branch: MAIN
Changes since 1.192: +1 -2 lines
Diff to previous 1.192 (colored)

silly comment is wrong

Revision 1.192 / (download) - annotate - [select for diffs], Sat May 30 19:32:20 2009 UTC (15 years ago) by deraadt
Branch: MAIN
Changes since 1.191: +3 -3 lines
Diff to previous 1.191 (colored)

these scripts should use tabs because 4 spaces wastes 3 chars of media space

Revision 1.191 / (download) - annotate - [select for diffs], Sat May 30 18:11:03 2009 UTC (15 years ago) by deraadt
Branch: MAIN
Changes since 1.190: +3 -3 lines
Diff to previous 1.190 (colored)

install.sh already knows that MODE == install

Revision 1.190 / (download) - annotate - [select for diffs], Thu May 28 02:34:56 2009 UTC (15 years ago) by krw
Branch: MAIN
Changes since 1.189: +2 -2 lines
Diff to previous 1.189 (colored)

Get the list of disks or cds whenever required rather than once at
startup. This means you can plugin USB disks or cds after the install
has started and you will see the new device the next time the list
is shown. The wonders of using sysctl.

'excellent' miod@

Revision 1.189 / (download) - annotate - [select for diffs], Sun May 17 15:00:51 2009 UTC (15 years ago) by krw
Branch: MAIN
Changes since 1.188: +31 -34 lines
Diff to previous 1.188 (colored)

Use sed to directly create swap entries in fstab rather than dancing
through an intermediate file.

Protect only fstab.$DISK manipulating commands with the check for
the existance of fstab.$DISK. This restores the ability to have
disks with only swap partitions.

Revision 1.188 / (download) - annotate - [select for diffs], Sun May 17 12:45:00 2009 UTC (15 years ago) by krw
Branch: MAIN
Changes since 1.187: +6 -3 lines
Diff to previous 1.187 (colored)

Move comment to correct spot.

Suppress 'No such file' error message when grep'ing for '/' mount
point in fstab.$ROOTDISK. We are interested in success or failure,
not excuses!

Check for existance of fstab.$DISK. User may exit disklabel with
'x', especially for non-root disks, and not create the file.

Revision 1.187 / (download) - annotate - [select for diffs], Mon May 11 02:07:47 2009 UTC (15 years ago) by krw
Branch: MAIN
Changes since 1.186: +43 -80 lines
Diff to previous 1.186 (colored)

Clean up and shrink code. Don't newfs paritions without a mount
point specified. Check for duplicate mount points and don't accept
a disk which has such a duplicate configured. Don't remount
all partitions after installing sets.

'be brave' deraadt@

Revision 1.186 / (download) - annotate - [select for diffs], Thu May 7 03:43:02 2009 UTC (15 years, 1 month ago) by todd
Branch: MAIN
Changes since 1.185: +5 -3 lines
Diff to previous 1.185 (colored)

o use 'ls -C' to speed and simplify both sets viewing and timezone selection
o use a tzlist instead of a tzdir
o as a bonus, sets lists are now sorted top-down instead of left-right
o use stty to calculate 4char padding surrounding sets lists
collaboration with Alexander Hall halex@
ok deraadt@

Revision 1.185 / (download) - annotate - [select for diffs], Wed May 6 08:35:24 2009 UTC (15 years, 1 month ago) by deraadt
Branch: MAIN
Changes since 1.184: +2 -2 lines
Diff to previous 1.184 (colored)

whoa, we were assuming that $_password was still the user password.  we
got lucky.

Revision 1.184 / (download) - annotate - [select for diffs], Wed May 6 01:29:48 2009 UTC (15 years, 1 month ago) by deraadt
Branch: MAIN
Changes since 1.183: +21 -34 lines
Diff to previous 1.183 (colored)

Split the collection of many questions from the appplication of their
change.  Then ask them at the start.  The timezone stuff remains a bit
weird since we have to depend on when we get the TZ names, or when we
get network... so there are 3 possible places that question can be
asked.  But now basically once it starts ftp'ing the sets, you only
have the final done prompt.

Revision 1.183 / (download) - annotate - [select for diffs], Wed May 6 01:00:14 2009 UTC (15 years, 1 month ago) by krw
Branch: MAIN
Changes since 1.182: +14 -87 lines
Diff to previous 1.182 (colored)

De-uglify disk configuration in the non-auto layout cases. Trust
disklabel(8) to prevent duplicate mount points, and the user to
enter all their mountpoint info in disklabel(8). Proceed directly
to disk formatting after the last disk is configured. Do not pass
go.

ok deraadt@

Revision 1.182 / (download) - annotate - [select for diffs], Tue May 5 00:38:02 2009 UTC (15 years, 1 month ago) by deraadt
Branch: MAIN
Changes since 1.181: +8 -8 lines
Diff to previous 1.181 (colored)

spaces to tabs

Revision 1.181 / (download) - annotate - [select for diffs], Sun May 3 20:20:38 2009 UTC (15 years, 1 month ago) by krw
Branch: MAIN
Changes since 1.180: +2 -2 lines
Diff to previous 1.180 (colored)

Oops. Untested over-optimization slipped in, breaking installs.

Revision 1.180 / (download) - annotate - [select for diffs], Sun May 3 15:03:05 2009 UTC (15 years, 1 month ago) by krw
Branch: MAIN
Changes since 1.179: +6 -7 lines
Diff to previous 1.179 (colored)

A few long standing sh'isms -> ksh'isms.

Revision 1.179 / (download) - annotate - [select for diffs], Sun May 3 14:02:07 2009 UTC (15 years, 1 month ago) by krw
Branch: MAIN
Changes since 1.178: +46 -58 lines
Diff to previous 1.178 (colored)

Simplify and shrink fstab creation code by putting mount point and
partition info into one string separated by the lexically low value
'!' char and sorting those strings. This eliminates an inner loop
over partition info. No user visible change.

Revision 1.178 / (download) - annotate - [select for diffs], Sun May 3 05:13:38 2009 UTC (15 years, 1 month ago) by krw
Branch: MAIN
Changes since 1.177: +5 -13 lines
Diff to previous 1.177 (colored)

Simplify things by putting extra swap partitions in the fstab as
they are discovered rather than keeping a list and appending it to
the end of the fstab. No impact unless you configure extra swap
partitions.

ok deraadt@

Revision 1.177 / (download) - annotate - [select for diffs], Thu Apr 30 01:03:19 2009 UTC (15 years, 1 month ago) by deraadt
Branch: MAIN
Changes since 1.176: +7 -3 lines
Diff to previous 1.176 (colored)

Do not allow the root password to be empty; ok krw after he told me
"But I dislike putting 'Sorry, ' in the messages. We're not sorry. :-)."

Revision 1.176 / (download) - annotate - [select for diffs], Thu Apr 30 01:01:56 2009 UTC (15 years, 1 month ago) by deraadt
Branch: MAIN
Changes since 1.175: +1 -1 lines
Diff to previous 1.175 (colored)

quotes around ? matches; Alexander Hall

Revision 1.175 / (download) - annotate - [select for diffs], Wed Apr 29 22:45:20 2009 UTC (15 years, 1 month ago) by deraadt
Branch: MAIN
Changes since 1.174: +5 -3 lines
Diff to previous 1.174 (colored)

only encrypt passwords if they are set

Revision 1.174 / (download) - annotate - [select for diffs], Wed Apr 29 17:22:49 2009 UTC (15 years, 1 month ago) by deraadt
Branch: MAIN
Changes since 1.173: +3 -3 lines
Diff to previous 1.173 (colored)

Ask for the root password before sshd, because I have caught myself
twice now falling through the question because I am getting too used to
hitting the return key...

Revision 1.173 / (download) - annotate - [select for diffs], Tue Apr 28 21:41:03 2009 UTC (15 years, 1 month ago) by deraadt
Branch: MAIN
Changes since 1.172: +4 -5 lines
Diff to previous 1.172 (colored)

We have no choice but to ask for the timezone information later, so
all the other questions have been congregating down towards the end.
Might as well ask for the root password down there, too.

Revision 1.172 / (download) - annotate - [select for diffs], Sat Apr 25 03:47:35 2009 UTC (15 years, 1 month ago) by deraadt
Branch: MAIN
Changes since 1.171: +3 -3 lines
Diff to previous 1.171 (colored)

We are able to handle the timezone question a few steps earlier, along
with the other questions.

Revision 1.171 / (download) - annotate - [select for diffs], Fri Apr 24 01:04:33 2009 UTC (15 years, 1 month ago) by krw
Branch: MAIN
Changes since 1.170: +1 -9 lines
Diff to previous 1.170 (colored)

Move bsd.mp juggling into relevant MD files. Make bsd.mp a default
selection on multi-processor machines. Make bsd.mp a sanity check
item on multi-processor machines.

ok deraadt@

Revision 1.170 / (download) - annotate - [select for diffs], Thu Apr 23 23:16:34 2009 UTC (15 years, 1 month ago) by deraadt
Branch: MAIN
Changes since 1.169: +2 -3 lines
Diff to previous 1.169 (colored)

configure the network unconditionally.  You have an opportunity to bail
out of this by saying "done" when you get to the first interface.  Then
it will handle the domain / DNS question, but since no interface is setup
it cleverly already skips the default route question.  Another useless
question bites the dust.
ok krw

Revision 1.169 / (download) - annotate - [select for diffs], Thu Apr 23 18:26:14 2009 UTC (15 years, 1 month ago) by deraadt
Branch: MAIN
Changes since 1.168: +11 -21 lines
Diff to previous 1.168 (colored)

Near the end of the installation, prompt for the setup of an initial
user, who will also be placed in wheel.  The setup of that user is
expected to be mostly compatible with what useradd(8) would have done.
krw will probably improve the ksh code in here after this :)

Revision 1.168 / (download) - annotate - [select for diffs], Sun Apr 19 17:56:01 2009 UTC (15 years, 1 month ago) by deraadt
Branch: MAIN
Changes since 1.167: +9 -1 lines
Diff to previous 1.167 (colored)

If hw.ncpufound > 1, have the install script automatically prefer to use
bsd.mp instead of bsd (using -- mv bsd bsd.sp; mv bsd.mp bsd). anyone
who brings up boot.conf is an i386 bigot.
tested on almost all platforms that can do this, ok various people

Revision 1.167 / (download) - annotate - [select for diffs], Mon Apr 13 02:22:12 2009 UTC (15 years, 1 month ago) by krw
Branch: MAIN
Changes since 1.166: +13 -13 lines
Diff to previous 1.166 (colored)

Don't try to read or remove a non-existant /tmp/hosts file. This can
happen if no interfaces are configured during an install. Noticed by
jsing@.

Diff from jsing@, only slightly tweaked.

Revision 1.166 / (download) - annotate - [select for diffs], Fri Apr 10 21:01:32 2009 UTC (15 years, 1 month ago) by krw
Branch: MAIN
Changes since 1.165: +19 -7 lines
Diff to previous 1.165 (colored)

If the md_prep_disklabel routine sets AUTOROOT=y, then don't ask the
user for input. Just plow ahead.

ok deraadt@

Revision 1.165 / (download) - annotate - [select for diffs], Fri Apr 10 18:26:50 2009 UTC (15 years, 1 month ago) by krw
Branch: MAIN
Changes since 1.164: +4 -2 lines
Diff to previous 1.164 (colored)

'rm hosts' -> 'rm -f hosts', since we may have not configured any
interfaces and thus not have a hosts file to remove. Should eliminate
annoying error messages noticed by jsing@.

Revision 1.164 / (download) - annotate - [select for diffs], Sat Mar 14 15:55:39 2009 UTC (15 years, 2 months ago) by krw
Branch: MAIN
Changes since 1.163: +14 -22 lines
Diff to previous 1.163 (colored)

Installed dhclient.conf is now all comments. Installed hosts is
now correct as is, since we don't add info to localhost lines. So
ditch comment-preserving dance through /tmp and just append our
new info to installed files. Shrinks scripts without changing
behaviour.

Revision 1.163 / (download) - annotate - [select for diffs], Sat Mar 14 14:23:05 2009 UTC (15 years, 2 months ago) by krw
Branch: MAIN
Changes since 1.162: +12 -13 lines
Diff to previous 1.162 (colored)

There should only be one ::1 and one 127.0.0.1 entry in the hosts
file.  And 'localhost' don't need no stinkin' domain names.

Insert line(s) with the address(es) of last interface defined instead
of duplicate ::1 and 127.0.0.1 entries, Thus dhcp configured
interfaces may eventually drift away from the value in hosts file.

Much discussed just before tree lock. Time to see what happens.

ok deraadt@

Revision 1.162 / (download) - annotate - [select for diffs], Sat Feb 21 18:07:14 2009 UTC (15 years, 3 months ago) by krw
Branch: MAIN
CVS Tags: OPENBSD_4_5_BASE, OPENBSD_4_5
Changes since 1.161: +8 -8 lines
Diff to previous 1.161 (colored)

Pretty up installed hosts file by using tabs between address and
names. Update copyright year since we are making noticable changes.

Revision 1.161 / (download) - annotate - [select for diffs], Thu Feb 19 02:11:32 2009 UTC (15 years, 3 months ago) by krw
Branch: MAIN
Changes since 1.160: +4 -2 lines
Diff to previous 1.160 (colored)

Third time lucky. Proper use of quotes when comparing the first and
second copies of the entered password will preserve leading and
trailing spaces.

Prodded by dale@. Proper clue pointed out by todd@.

Revision 1.160 / (download) - annotate - [select for diffs], Sun Feb 15 15:56:45 2009 UTC (15 years, 3 months ago) by krw
Branch: MAIN
Changes since 1.159: +1 -5 lines
Diff to previous 1.159 (colored)

Build install media with disktab.shadow already in /tmp, rather
than have the install script copy it there. Shrinks install script,
removes an extra copy of disktab.

ok deraadt@

Revision 1.159 / (download) - annotate - [select for diffs], Thu Jun 26 05:42:03 2008 UTC (15 years, 11 months ago) by ray
Branch: MAIN
CVS Tags: OPENBSD_4_4_BASE, OPENBSD_4_4
Changes since 1.158: +1 -8 lines
Diff to previous 1.158 (colored)

First pass at removing clauses 3 and 4 from NetBSD licenses.

Not sure what's more surprising: how long it took for NetBSD to
catch up to the rest of the BSDs (including UCB), or the amount of
code that NetBSD has claimed for itself without attributing to the
actual authors.

OK deraadt@

Revision 1.158 / (download) - annotate - [select for diffs], Fri Jun 13 04:41:44 2008 UTC (15 years, 11 months ago) by krw
Branch: MAIN
Changes since 1.157: +4 -5 lines
Diff to previous 1.157 (colored)

ksh's arithmetic is 32 bit signed so we can no longer rely on
block counts being small enough to do arithmetic on. Manually
process partition block counts into 'human readable' byte sizes
when asking for confirmation of disk configuration.

Install script now properly displays the size of Yottabyte
partitions.

requested by & ok deraadt@

Revision 1.157 / (download) - annotate - [select for diffs], Sun Jun 1 02:45:59 2008 UTC (16 years ago) by krw
Branch: MAIN
Changes since 1.156: +7 -6 lines
Diff to previous 1.156 (colored)

Don't copy empty files into installed system's /etc. Tweak comment and
mention boot.conf and ttys. No functional change.

Revision 1.156 / (download) - annotate - [select for diffs], Sun Mar 2 21:18:58 2008 UTC (16 years, 3 months ago) by krw
Branch: MAIN
CVS Tags: OPENBSD_4_3_BASE, OPENBSD_4_3
Changes since 1.155: +3 -3 lines
Diff to previous 1.155 (colored)

Keep resolv.conf.shadow around when restarting an install. This
means manually entered DNS server addresses are not lost when
an install is restarted. Restores behaviour unintentionally lost
with r1.127.

ok deraadt@

Revision 1.155 / (download) - annotate - [select for diffs], Mon Feb 11 23:40:03 2008 UTC (16 years, 3 months ago) by krw
Branch: MAIN
Changes since 1.154: +7 -1 lines
Diff to previous 1.154 (colored)

For architectures with an enabled 'console' ttys entry, adjust the
speed of said entry to reflect the speed of the console being used to
install.

For archs with MDSERIAL defined, offer the current device and speed as
the defaults for switching to serial consoles.

Fixes new Sun gear that uses a 115200 console speed and makes for
better defaults without breaking current install processes.

ok dlg@ henning@

Revision 1.154 / (download) - annotate - [select for diffs], Tue Aug 29 01:02:49 2006 UTC (17 years, 9 months ago) by krw
Branch: MAIN
CVS Tags: OPENBSD_4_2_BASE, OPENBSD_4_2, OPENBSD_4_1_BASE, OPENBSD_4_1, OPENBSD_4_0_BASE, OPENBSD_4_0
Changes since 1.153: +1 -2 lines
Diff to previous 1.153 (colored)

Handle site${VERSION}-$(hostname -s).tgz files better so that they
don't get in the way of noticing that all default sets are installed.

Restores the desired behaviour where [done] becomes the default answer
to the "Location of sets?" question once all default sets are
successfully installed.

spotted by & ok deraadt@

Revision 1.153 / (download) - annotate - [select for diffs], Fri Jun 23 21:43:19 2006 UTC (17 years, 11 months ago) by krw
Branch: MAIN
Changes since 1.152: +3 -1 lines
Diff to previous 1.152 (colored)

Add a set siteXY-<hostname>.tgz and make it selected by default. This
allows host specific files to be trivially installed and makes
creating/maintaining large numbers of host specific configurations
much simpler.

Suggested by work being done by Alex Holst, brought to my attention by
mk@ during c2k6.

Name format suggested by henning@, tweaked by deraadt@.

Revision 1.152 / (download) - annotate - [select for diffs], Thu Apr 21 21:41:33 2005 UTC (19 years, 1 month ago) by krw
Branch: MAIN
CVS Tags: OPENBSD_3_9_BASE, OPENBSD_3_9, OPENBSD_3_8_BASE, OPENBSD_3_8
Changes since 1.151: +2 -1 lines
Diff to previous 1.151 (colored)

Create disk device before attempting to disklabel it. Don't keep a
disk which couldn't be created in the selection list.

noticed by deraadt@

Revision 1.151 / (download) - annotate - [select for diffs], Sat Apr 2 14:27:08 2005 UTC (19 years, 2 months ago) by krw
Branch: MAIN
Changes since 1.150: +7 -7 lines
Diff to previous 1.150 (colored)

Scrounge a few characters of whitespace.

Revision 1.150 / (download) - annotate - [select for diffs], Sat Mar 26 01:40:21 2005 UTC (19 years, 2 months ago) by krw
Branch: MAIN
Changes since 1.149: +3 -3 lines
Diff to previous 1.149 (colored)

Start some delayed cleanup and shrinkage. Today: ': ;' -> ':;' in
while statements.

Revision 1.149 / (download) - annotate - [select for diffs], Sat Nov 6 18:05:48 2004 UTC (19 years, 6 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_3_7_BASE, OPENBSD_3_7
Changes since 1.148: +3 -3 lines
Diff to previous 1.148 (colored)

select dd or ed from newly installed filesystem instead, ok krw

Revision 1.148 / (download) - annotate - [select for diffs], Sat Oct 2 18:45:08 2004 UTC (19 years, 8 months ago) by krw
Branch: MAIN
Changes since 1.147: +5 -7 lines
Diff to previous 1.147 (colored)

Minor code cleanup and shrinkage. No functional change.

Revision 1.147 / (download) - annotate - [select for diffs], Fri Jul 30 00:16:30 2004 UTC (19 years, 10 months ago) by krw
Branch: MAIN
CVS Tags: OPENBSD_3_6_BASE, OPENBSD_3_6
Changes since 1.146: +2 -2 lines
Diff to previous 1.146 (colored)

Use '#!/bin/ksh' for install scripts, as we use so many ksh'isms. Some of
which will be disabled for /bin/sh invocations soon.

Requested by millert@.

ok pval@.

Revision 1.146 / (download) - annotate - [select for diffs], Sun Jul 18 01:12:32 2004 UTC (19 years, 10 months ago) by deraadt
Branch: MAIN
Changes since 1.145: +2 -2 lines
Diff to previous 1.145 (colored)

spaces

Revision 1.145 / (download) - annotate - [select for diffs], Sun Jul 4 22:30:25 2004 UTC (19 years, 11 months ago) by krw
Branch: MAIN
Changes since 1.144: +19 -35 lines
Diff to previous 1.144 (colored)

Remove requirement that the 'b' partition on the root disk be
configured during install.

If it is configured it will still be unconditionally used as swap, so
don't let the user set a mount point for it.

Minor white space, commment and verbiage adjustments.

Suggested by many including Mickey, Henning, Todd, and Theo.

ok deraadt@

Revision 1.144 / (download) - annotate - [select for diffs], Sat Jun 26 20:10:17 2004 UTC (19 years, 11 months ago) by krw
Branch: MAIN
Changes since 1.143: +2 -2 lines
Diff to previous 1.143 (colored)

Allow change of default console to first serial device during install. Used in
i386 only at this time.

ok beck@ deraadt@

Revision 1.143 / (download) - annotate - [select for diffs], Fri May 28 22:59:34 2004 UTC (20 years ago) by krw
Branch: MAIN
Changes since 1.142: +4 -2 lines
Diff to previous 1.142 (colored)

Add MDROOTFSOPT handling code to allow non-default newfs options to
be specified for root filesystems. Add MDROOTFSOPT value for luna88k
so installed system can boot.

Tested by Kenji Ayoma.

ok miod@.

Revision 1.142 / (download) - annotate - [select for diffs], Tue Mar 23 02:39:38 2004 UTC (20 years, 2 months ago) by krw
Branch: MAIN
CVS Tags: OPENBSD_3_5_BASE, OPENBSD_3_5
Changes since 1.141: +2 -2 lines
Diff to previous 1.141 (colored)

Update copyrights to 2004.

ok deraadt@.

Revision 1.141 / (download) - annotate - [select for diffs], Thu Mar 18 00:25:12 2004 UTC (20 years, 2 months ago) by krw
Branch: MAIN
Changes since 1.140: +3 -1 lines
Diff to previous 1.140 (colored)

Don't ask for timezone info during an upgrade.

Suggestion by Tom Cosgrove.

ok miod@ millert@ deraadt@.

Revision 1.140 / (download) - annotate - [select for diffs], Thu Dec 4 18:43:38 2003 UTC (20 years, 6 months ago) by deraadt
Branch: MAIN
Changes since 1.139: +3 -3 lines
Diff to previous 1.139 (colored)

ask if sshd should be on by default (default to yes, still); tested by nick

Revision 1.139 / (download) - annotate - [select for diffs], Mon Nov 3 05:16:21 2003 UTC (20 years, 7 months ago) by david
Branch: MAIN
Changes since 1.138: +2 -2 lines
Diff to previous 1.138 (colored)

spelling fix in comments

Revision 1.138 / (download) - annotate - [select for diffs], Fri Sep 26 00:11:25 2003 UTC (20 years, 8 months ago) by krw
Branch: MAIN
Changes since 1.137: +2 -2 lines
Diff to previous 1.137 (colored)

Fix typo: 'Which disk do you wish to initialize??' -> '... initialize?'.

Only appeared when non-boot disks were initialized.

Revision 1.137 / (download) - annotate - [select for diffs], Mon Sep 22 01:31:39 2003 UTC (20 years, 8 months ago) by krw
Branch: MAIN
Changes since 1.136: +6 -14 lines
Diff to previous 1.136 (colored)

Introduce a function ask_yn() to use when asking 'yes or no'
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.

Revision 1.136 / (download) - annotate - [select for diffs], Sun Aug 17 18:18:50 2003 UTC (20 years, 9 months ago) by krw
Branch: MAIN
CVS Tags: OPENBSD_3_4_BASE, OPENBSD_3_4
Changes since 1.135: +2 -2 lines
Diff to previous 1.135 (colored)

Message clarification & cleanup.

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.

Revision 1.135 / (download) - annotate - [select for diffs], Thu Aug 7 19:12:59 2003 UTC (20 years, 10 months ago) by deraadt
Branch: MAIN
Changes since 1.134: +2 -2 lines
Diff to previous 1.134 (colored)

spaces

Revision 1.134 / (download) - annotate - [select for diffs], Thu Jul 3 15:19:01 2003 UTC (20 years, 11 months ago) by krw
Branch: MAIN
Changes since 1.133: +2 -2 lines
Diff to previous 1.133 (colored)

Use numeric comparison operators when testing numeric values.

Revision 1.133 / (download) - annotate - [select for diffs], Wed Jul 2 16:42:19 2003 UTC (20 years, 11 months ago) by krw
Branch: MAIN
Changes since 1.132: +10 -8 lines
Diff to previous 1.132 (colored)

Eliminate cutword(), replacing it with specific code: 'set --' in two
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.

Revision 1.132 / (download) - annotate - [select for diffs], Mon Jun 30 17:49:14 2003 UTC (20 years, 11 months ago) by krw
Branch: MAIN
Changes since 1.131: +5 -3 lines
Diff to previous 1.131 (colored)

Cleanup ask_which() logic.

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.

Revision 1.131 / (download) - annotate - [select for diffs], Fri Jun 27 22:40:40 2003 UTC (20 years, 11 months ago) by krw
Branch: MAIN
Changes since 1.130: +39 -25 lines
Diff to previous 1.130 (colored)

Improve swap partition handling during install/upgrade.

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)

Revision 1.130 / (download) - annotate - [select for diffs], Mon Jun 2 15:46:09 2003 UTC (21 years ago) by deraadt
Branch: MAIN
Changes since 1.129: +1 -7 lines
Diff to previous 1.129 (colored)

licence cleanup; agreement from krw and millert

Revision 1.129 / (download) - annotate - [select for diffs], Sat Dec 14 15:33:34 2002 UTC (21 years, 5 months ago) by krw
Branch: MAIN
CVS Tags: OPENBSD_3_3_BASE, OPENBSD_3_3
Changes since 1.128: +3 -3 lines
Diff to previous 1.128 (colored)

Expunge some trailing whitespace.

From David Krause.

Revision 1.128 / (download) - annotate - [select for diffs], Sun Dec 8 20:24:56 2002 UTC (21 years, 5 months ago) by krw
Branch: MAIN
Changes since 1.127: +6 -6 lines
Diff to previous 1.127 (colored)

Fix botch in last commit: prepend comments to hosts after adding FQDN to
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).

Revision 1.127 / (download) - annotate - [select for diffs], Sun Dec 8 19:30:40 2002 UTC (21 years, 5 months ago) by krw
Branch: MAIN
Changes since 1.126: +67 -50 lines
Diff to previous 1.126 (colored)

Fix & cleanup logic, especially around interrupted installs.

Use value of 'hostname' to store all HOSTNAME and FQDN information.  Elminate
those global variables. For install accept user input as is, but if the short
form hostname is unchanged, save any domain info by not re-setting hostname.
For upgrade just set hostname from /tmp/myname.

Unconditionally create default hosts file in install.sh, rather than doing it
in separate places depending on whether or not the user configures the network.
Always ask if the user wants to edit the hosts file when the network is
configured, but without listing it out.

Don't put 'search' command in resolv.conf as we now set hostnames to include
fully qualified domain names, which will be used to yield local domain name.

Loop asking for the default route until the user enters one that 'route'
accepts or the user explicitly asks for no default route by entering 'none'.

Add FQDN info to hosts file just before saving configuration files to the
installed system. Preserve user added lines - those with aliases or with domain
information in the hostname.

Clean up donetconfig() logic. Delete network config files in install.sh so that
if the user restarts an interrupted install previous network configuration does
not leak into installed system.

Elminiate get_resolv_fqdn(), searching resolv.conf for domain info only when
dhcp was used. get_fqdn() is reduced to looking for domain info in current
hostname, and supplying 'my.domain' if none found.

Add save_comments() and use to preserve useful comments in the installed
/etc/hosts and /etc/dhclient.conf files. Previous logic for dhclient.conf could
cause repeated appending of configuration info rather than just preserving the
comments.

Cleanup logic copying files from /tmp to /mnt/etc, eliminating unneeded
cfgfiles variable. Use wildcards and subshells to shrink code size.

Revision 1.126 / (download) - annotate - [select for diffs], Wed Dec 4 03:39:07 2002 UTC (21 years, 6 months ago) by krw
Branch: MAIN
Changes since 1.125: +9 -4 lines
Diff to previous 1.125 (colored)

Code cleanup & shrinkage.

Redo configure_ifs() to take full advantage of recent code
refactoring, and cleanup code while there.

Move address or dhcp question to after media option handling so that
each question gives immediate feedback. i.e. if the media options
given don't work then say so and exit, and if dhcp is requested
immediately issue the dhcp request. Also allows some code shrinkage.

Eliminate addifconfig() and remount(). The former is folded into
configure_ifs() and the latter's three lines simply replace the call
in install.sh.

Move remount code to before any configuration files are moved to the
installed system.

Revision 1.125 / (download) - annotate - [select for diffs], Tue Dec 3 00:58:35 2002 UTC (21 years, 6 months ago) by krw
Branch: MAIN
Changes since 1.124: +11 -13 lines
Diff to previous 1.124 (colored)

More code consolidation.

Create dhcp_request() and use in configure_ifs() rather than repeat code. When
dhcp is successful, move /etc/dhclient.conf, /etc/resolv.conf.tail to /tmp, and
use normal configuration file installation to put them on the installed system.

Also apply any user specified media options immediately. If they don't compute
then return immediately.

Revision 1.124 / (download) - annotate - [select for diffs], Thu Nov 28 04:50:45 2002 UTC (21 years, 6 months ago) by krw
Branch: MAIN
Changes since 1.123: +5 -3 lines
Diff to previous 1.123 (colored)

Use any existing hostname as the default, as the install could have
been restarted.

Discard any domain information the user supplies.

Revision 1.123 / (download) - annotate - [select for diffs], Thu Nov 28 03:06:30 2002 UTC (21 years, 6 months ago) by deraadt
Branch: MAIN
Changes since 1.122: +8 -8 lines
Diff to previous 1.122 (colored)

spaces

Revision 1.122 / (download) - annotate - [select for diffs], Thu Nov 28 01:54:58 2002 UTC (21 years, 6 months ago) by krw
Branch: MAIN
Changes since 1.121: +4 -4 lines
Diff to previous 1.121 (colored)

Make questions out of requests for user input that were demands.  Use
a standard format of

   <question>? (<extra verbiage>) [<default value>]

Makes things more consistant, and sometimes more terse.

Revision 1.121 / (download) - annotate - [select for diffs], Sun Nov 24 19:09:46 2002 UTC (21 years, 6 months ago) by deraadt
Branch: MAIN
Changes since 1.120: +2 -2 lines
Diff to previous 1.120 (colored)

use 8 rounds for passwd, like login.conf specifies; rob_ses@web.de

Revision 1.120 / (download) - annotate - [select for diffs], Fri Nov 1 00:39:19 2002 UTC (21 years, 7 months ago) by krw
Branch: MAIN
Changes since 1.119: +2 -2 lines
Diff to previous 1.119 (colored)

Cleanup. install_sets() no longer takes a parameter.

Revision 1.119 / (download) - annotate - [select for diffs], Thu Oct 3 00:56:44 2002 UTC (21 years, 8 months ago) by krw
Branch: MAIN
CVS Tags: OPENBSD_3_2_BASE, OPENBSD_3_2
Changes since 1.118: +22 -6 lines
Diff to previous 1.118 (colored)

Divorce system hostname handling from network configuration.

Every system has a name, and thus generated keys with that
name, even if there is no currently configured network.

So, ask for a system hostname before configuring the network.

Eliminate /tmp/myname and just keep hostname set to the lastest name
and FQDN.

Construct /etc/myname from hostname as configuration data is being
saved. Construct /etc/hosts (preserving the informative leading comment
from the /etc/hosts file in etcXX.tgx) at the same time.

Construct an appropriate /etc/hosts file even if the network is not
configured.

During upgrade, if the user enables the network using the existing
configuration, don't ask about the domain name - just use the
configured one.

Take care to handle existing /etc/myname files which do not necessarily
have a FQDN.

Originally problem with hostname handling pointed out by beck@.

ok deraadt@

Revision 1.118 / (download) - annotate - [select for diffs], Sat Sep 28 23:35:12 2002 UTC (21 years, 8 months ago) by krw
Branch: MAIN
Changes since 1.117: +1 -3 lines
Diff to previous 1.117 (colored)

Cleanup/fix/improve question asking.

1) If the user escapes to a shell with '!' or executes a command with
'!foo' at a prompt then repeat the prompt when the shell or command
returns.

2) If ask_which() is passed an empty list of devices , then set resp to
'done' and return. Replaces a couple of checks before calling
ask_which(). Also emit a message about the lack of devices.

3) In ask_which(), delete any trailing blank which rmel() may have
appended to the device list. Replaces a check before calling
ask_which().

4) Remove an unneeded blank line before the 'invalid choice' message
from ask_which().

5) Make the first disk device the default answer when asking for which
disk contains install sets.

A few code/verbiage nits:

1) make _a a local in cutlast().

2) use normal ': ${_defdev:=done}' idiom instead of an or condition in
ask_which.

3) Eliminate an unnecessary blank line/paragraph by putting 3(!)
sentences into a single paragraph when describing process of selecting
install sets.

4) Eliminate another unnecessary blank line between the list of
possible install sources and the question about which one to use.

5) Eliminate another unnecessary blank line before the 'Extract
more sets?' question

6) Eliminate a double blank line after the sanity check error
messages.

ok deraadt@.

Revision 1.117 / (download) - annotate - [select for diffs], Wed Sep 25 12:19:12 2002 UTC (21 years, 8 months ago) by krw
Branch: MAIN
Changes since 1.116: +45 -7 lines
Diff to previous 1.116 (colored)

Try to minimize places where suid programs and devices can live
by implementing the rules:

Only '/' is neither nodev nor nosuid. i.e.  it can obviously *always*
contain devices or setuid programs.

Every other mounted filesystem is nodev. If the user chooses to mount
/dev as a separate filesystem, then on the user's head be it.

The only directories that install puts suid binaries into (as of 3.2)
are:

/sbin
/usr/bin
/usr/sbin
/usr/libexec
/usr/libexec/auth
/usr/X11R6/bin

and ports and users can do who knows what to /usr/local and sub
directories thereof.

So try to ensure that only filesystems that are mounted at or above
these directories can contain suid programs. In the case of
/usr/libexec, give blanket permission for subdirectories.

Note that if *all* the above are split into separate filesystems the
install process will attempt a couple of cross-device links when
installing base32.tgz, and fail.

ok deraadt@.

Revision 1.116 / (download) - annotate - [select for diffs], Tue Sep 24 01:26:15 2002 UTC (21 years, 8 months ago) by krw
Branch: MAIN
Changes since 1.115: +3 -2 lines
Diff to previous 1.115 (colored)

Rejig addel()/rmel() to keep items on a single line, with blanks
separating items.

This allows a compaction of the displayed lines for device selection.

Customize the device selection routine so the actual device type is
shown (disk or CD-ROM). Rename ask_fordev to ask_which so the
invocations (with device type) read better.

Revision 1.115 / (download) - annotate - [select for diffs], Sun Sep 22 22:42:25 2002 UTC (21 years, 8 months ago) by krw
Branch: MAIN
Changes since 1.114: +39 -39 lines
Diff to previous 1.114 (colored)

Do not allow install to proceed until root filesystem can be mounted on
$ROOTDEV and ${ROOTDISK}b can be used for swap.  Also shortens output
generated during (successful) install.

Fix problem with upgrade on systems with many disk devices by
automatically creating devices encountered during the fsck'ing of fstab
filesystems. Problem noted by Dethlef Madsen and Nick Nauwelaerts.

Adjust some verbiage in i386 install.md to make it more consistant.

Reformat welcome message to make sure all lines are <80 characters wide.

Minor cleanups.

Revision 1.114 / (download) - annotate - [select for diffs], Tue Sep 17 12:28:54 2002 UTC (21 years, 8 months ago) by krw
Branch: MAIN
Changes since 1.113: +28 -65 lines
Diff to previous 1.113 (colored)

Ruthlessly expunge unnecessary verbiage and whitespace to make sure
the install example will easily fit on the CD insert at some
reasonable font size. Reword many messages and questions for same
reason.

In addition:

1) Add '...done.' to match 'Installing boot block...'

2) During install, after asking which is the root disk, start
initializing it immediately rather than asking again which disk to
work on.

3) Move munged fstab filesystem mounting to *before* network
initialization so that if you bail out during network initialization
and restart you do not have to go through disk initialization again.
Also puts fsck and mount messages close to each other rather than
spitting out the latter just before root password questions.

4) Make 'usr/obj' nosuid,nodev by default, /home nodev by default.

5) For network interfaces only show the complete list of media options
if the user indicates they want to change the default.

6) Move the question about the ftp server supporting passive ftp to
*after* selecting the ftp server where it is more 'rational' and can
easily be made more concise.

7) Don't bother umount'ing filesystems or stopping the dhclient after
a successful install/upgrade. The next step is a reboot after all.

Some minor code tweaks and comment cleanup while in the area.

Tested in recent snapshots. Suggested by & ok deraadt@.

Revision 1.113 / (download) - annotate - [select for diffs], Tue Aug 27 02:18:34 2002 UTC (21 years, 9 months ago) by krw
Branch: MAIN
Changes since 1.112: +30 -20 lines
Diff to previous 1.112 (colored)

Move general partitioning advice from machine dependant per disk
routine to install.sh so it is displayed only once.

Strongly advise /, /tmp, /var, /usr and /home have their own
disk partitions as requested by deraadt@.

Rather than rely on users not re-selecting an already initialized
disk, just allow them to choose from un-initialized disks.

Move get_root invocation into install.sub as both install.sh and
upgrade.sh did it first thing.

Remove the 'workaround' to a 'vnode aliasing bug' that came in
with the initial import of upgrade.sh from NetBSD. ok millert@.

Rework verbiage in a few places. Clean up logic around looping
through disk units by handling root disk better.

Revision 1.112 / (download) - annotate - [select for diffs], Sun Aug 25 02:13:09 2002 UTC (21 years, 9 months ago) by krw
Branch: MAIN
Changes since 1.111: +61 -39 lines
Diff to previous 1.111 (colored)

More fixes to mount point handling.

1) Correctly sort >10 total partitions.

2) Don't allow user to specify duplicate mount points via
disklabel.

3) Fix mount point checking so that empty mount points
do not confuse logic.

4) Fix mount point checking so that duplicate mount points
from previous disk initialization are correctly detected.

5) Show configured partitions/mount points in partition order
(i.e. sorted by disk and then partition) rather than mount
point order. This seems easier to read to me and reflects the
order of user action. Sort the entries after user approval.

6) Clarify, clean up some verbiage and logic.

Revision 1.111 / (download) - annotate - [select for diffs], Sun Aug 18 21:05:47 2002 UTC (21 years, 9 months ago) by krw
Branch: MAIN
Changes since 1.110: +38 -37 lines
Diff to previous 1.110 (colored)

Fix various mount point problems:

1) Fix 'already mounted' checking so a mount point name can be the same
as the leading substring of a previously specified mount point.
Now you can specify /usr after /usr/obj, and since the mount points
are sorted before writing to fstab, it should work.

This also fixes the error message generated when a requested mount
point matches the leading substring of multiple mount points. e.g.
trying to mount '/' again.

2) Fix fstab sorting so that it works across all initialized disks, not
just on a disk by disk basis.

3) For additional paranoia during multiple disk installs, unset _partitions,
_psizes, and _mount_points before processing a disk. Eliminate individual
blanking of _mount_points entries.

4) Shorten/simplify logic by storing ${DISK} in _partitions entries rather
than always adding it back in when referencing _partitions.

5) Rework verbiage a bit, eliminating the duplicate display of configured
devices before making new filesystems.

Some code clean up, eliminating '{}'s, better loops, ifs, etc.

Appox. 67 bytes net bloat.

Revision 1.110 / (download) - annotate - [select for diffs], Wed Jul 31 13:46:15 2002 UTC (21 years, 10 months ago) by krw
Branch: MAIN
Changes since 1.109: +7 -2 lines
Diff to previous 1.109 (colored)

/tmp/fstab.$DISK is created in install.md, so put back references
to it. Fixes mount point prompts during install.

'Improve' an error message.

Noted by todd@ and jsyn@.

Revision 1.109 / (download) - annotate - [select for diffs], Sun Jul 28 01:14:58 2002 UTC (21 years, 10 months ago) by krw
Branch: MAIN
Changes since 1.108: +49 -39 lines
Diff to previous 1.108 (colored)

New feature request by (most recently) drahn@:

Do not allow the same mountpoint to be specified for >1 disk
partition.

If a mountpoint that has already been specified is entered again an
error message of the form:

Invalid response: sd0a is already being mounted at /var

is emitted. Partitions on both the disk being initialized and
previously initialized disks are checked.

Rework a bit of the logic to simplify and shorten in compensation. e.g.
eliminate references to /tmp/fstab.<disk> as it is never created.

Revision 1.108 / (download) - annotate - [select for diffs], Sun Jul 21 04:57:01 2002 UTC (21 years, 10 months ago) by hugh
Branch: MAIN
Changes since 1.107: +3 -1 lines
Diff to previous 1.107 (colored)

Put a doing...done wrapper around creation of the host.random file
as this takes so long inside simh that people were assuming the
system had hung. Grows install.sh 66 bytes, but krw said ok anyway!

Revision 1.107 / (download) - annotate - [select for diffs], Sat Jul 13 16:32:13 2002 UTC (21 years, 10 months ago) by krw
Branch: MAIN
Changes since 1.106: +2 -4 lines
Diff to previous 1.106 (colored)

Cleanup/Shrinkage.

1) Eliminate more if's in favour of 'cond || stmt' or
   'cond && stmt' constructs.

2) Global _didnet -> DIDNET, make local _nam a local.

3) Display 'DHCP not supported' error every time user
   specifies 'dhcp' but the client is not present.

4) if if_extra is empty, that's ok, so just assign
   $resp to it whether $resp is empty or not.

5) Check for DIDNET inside donetconfig() instead of
   before each call to donetconfig.

6) Eliminate superfluous 'Aborting' comments, and let
   the user draw their own conclusion from getting the
   'Extract more sets' message.

7) Minor code tweaks like not continually assigning
   $resp to a value in a loop, when all we want is
   the final value, and only displaying 'Skipping'
   message in tape installs if we are actually
   skipping files, etc.

Revision 1.106 / (download) - annotate - [select for diffs], Sat Jul 13 13:18:05 2002 UTC (21 years, 10 months ago) by krw
Branch: MAIN
Changes since 1.105: +22 -27 lines
Diff to previous 1.105 (colored)

More cleanup/simplification/shrinkage.

1) Factor out inquiring for a device. ask_fordev()
   now does this for root disk determination, other
   disk initialization, install sets disk or cd
   inquiry. Also ensures cd devices are created on
   the fly like disk devices already were, and
   shortens some verbiage.

2) Just ask for root disk if install is skipping
   disk initialization, rather than doing the
   'df /mnt ...' scan, since 1) we just end up asking
   anyway and 2) everything *should* have been
   umount'ed when previous install was finished or
   interrupted.

3) getrootdisk -> get_rootdisk to conform to
   get_<global> naming convention.

4) Add and use new global ROOTDEV rather than
   constantly adding 'a' to ROOTDISK. ROOTDEV
   default is set in get_rootdisk().

5) Put loop inside get_rootdisk rather than
   always putting one around it. If no rootdisk
   found/specified just exit install/update.

6) Eliminate getanotherdisk since ask_fordev()
   does most of the work.

7) Eliminate parameter to check_fs, just use
   ROOTDEV instead.

8) Some typographical and minor code tweaks.

Revision 1.105 / (download) - annotate - [select for diffs], Mon Jul 1 14:58:42 2002 UTC (21 years, 11 months ago) by krw
Branch: MAIN
Changes since 1.104: +2 -2 lines
Diff to previous 1.104 (colored)

Prevent passwords of the form '-X' from being (mis)interpreted as an
option to encrypt, by terminating option list with '--'. This
generated an error during install and left root with a blank password.

Mentioned a couple of months ago by Adrian Close, and
dhartmei@ prodded me again today.

Revision 1.104 / (download) - annotate - [select for diffs], Sat Jun 29 20:01:34 2002 UTC (21 years, 11 months ago) by krw
Branch: MAIN
Changes since 1.103: +2 -2 lines
Diff to previous 1.103 (colored)

Some cleanup/simplification:

1) Put knowledge of /tmp/fstab in munge_fstab rather
   than redirect input on calls. Check in munge_fstab
   whether /etc/fstab was successfully created, and exit
   install/upgrade with appropriate error if not. This
   error condition is therefore checked on install and upgrade.

2) Don't bother specifying value in exit statements - no one
   is checking whether it is 1, 2, or 0.

3) Put status messages inside check_fs rather than around
   invocation, and exit from check_fs if a fsck fails, rather
   than checking return value and exiting.

4) With above changes, simplify munge_fs/check_fs/mount_fs logic in
   upgrade.sh.

5) Various cosmetic cleanups.

Revision 1.103 / (download) - annotate - [select for diffs], Tue Jun 25 00:31:59 2002 UTC (21 years, 11 months ago) by krw
Branch: MAIN
Changes since 1.102: +1 -13 lines
Diff to previous 1.102 (colored)

Complete yet more of the c2k2 initiated changes. In this round:

1) Centralize selection of install/upgrade media rather than ask
   separately for mounted filesystem. Eliminate separate calls
   to get_localdir in install.sh and upgrade.sh. In install.sh
   this call occurred only if a diskless system was detected, which
   millert@ agreed was a historical relic, i.e. what exactly would
   a diskless workstation be installing to?

2) Check for the presence of any mounted filesystems at the expected
   mount point (/mnt or /mnt2) and emit an error message if none found.

3) Add a '?' option to the pathname question so you can see what
   filesystems are mounted at/below the expected mount point.

4) Rework logic in get_localdir to make flow more logical. e.g. only
   do sane_install() check after the user says to install no more sets;
   if sane_install() fails ask a slightly different question and make
   the default 'y' to install more sets.

5) Rework install_sets() to simplify logic. Don't try to tailor
   list of install media to system, just warn that some may not be
   available and emit useful error messages if the user tries a
   non-available source.

Some verbiage still needs work (amoung other things).

fgsch@ noticed problems with installing from mounted filesystems, forcing me
to finish these changes.

Revision 1.102 / (download) - annotate - [select for diffs], Mon May 20 16:53:57 2002 UTC (22 years ago) by krw
Branch: MAIN
Changes since 1.101: +7 -5 lines
Diff to previous 1.101 (colored)

Eliminate md_questions(). It was used only to control the setting of
machdep.allowaperture. Remove the setting of machdep.allowaperture
from md_installboot().

Add MDXAPERTURE variable to relevant architectures.

Add a new function set_machdep_allowaperture(). It is called *after*
install_sets() (which changes when the X Window question is asked), and
if MDXAPERTURE is present modifies sysctl.conf.

Shrinks overall size for i386, macppc, sparc64 (which used md_questions
for machdep.allowaperture) but increases size a bit for other
architectures since set_machep_allowaperture is in install.sub.

Revision 1.101 / (download) - annotate - [select for diffs], Wed May 15 11:54:34 2002 UTC (22 years ago) by mpech
Branch: MAIN
Changes since 1.100: +2 -2 lines
Diff to previous 1.100 (colored)

Insert entry for /var/tmp to /etc/fstab like /tmp one,i.e. nosuid and nodev
Idea from form@.

millert@, krw@ ok

Revision 1.100 / (download) - annotate - [select for diffs], Tue Apr 30 04:14:18 2002 UTC (22 years, 1 month ago) by krw
Branch: MAIN
Changes since 1.99: +6 -6 lines
Diff to previous 1.99 (colored)

Tighten up installed options on /tmp by adding nosuid,nodev.

Suggested by Ian McWilliam. ok deraadt@.

Revision 1.99 / (download) - annotate - [select for diffs], Sun Apr 28 20:41:15 2002 UTC (22 years, 1 month ago) by krw
Branch: MAIN
Changes since 1.98: +9 -9 lines
Diff to previous 1.98 (colored)

Remove superfluous '{}' in variable references that are all alone in a
string. i.e. "${a}" -> "$a". Save the {} form for strings where
variables are mixed with text.

Remove superfluous X's. e.g. "X$resp" = "Xdone" -> "$resp" = "done".

Change last few '[ "$v" = "" ]' or equivalents to '[ -z "$v" ]'.

Revision 1.98 / (download) - annotate - [select for diffs], Sun Apr 28 14:44:01 2002 UTC (22 years, 1 month ago) by krw
Branch: MAIN
Changes since 1.97: +5 -9 lines
Diff to previous 1.97 (colored)

Change getresp() into ask().

ask() takes 2 parameters. The first one is the question to
ask the user, and the 2nd is the default answer.

Shrinks and makes the code clearer.

From espie@ with some tweaking, ok deraadt@.

Revision 1.97 / (download) - annotate - [select for diffs], Fri Apr 26 02:14:23 2002 UTC (22 years, 1 month ago) by krw
Branch: MAIN
Changes since 1.96: +20 -13 lines
Diff to previous 1.96 (colored)

Improve use of sed in various places, eliminating unnecessary
calls to grep and file redirections.

Eliminate function firstchar(). Rework of partition gathering
code removes the only use.

Remove the usual extraneous 'X's and {}'s in the code being
worked on.

From espie@ with slight modifications. ok espie@ millert@

Revision 1.96 / (download) - annotate - [select for diffs], Sat Apr 20 13:42:52 2002 UTC (22 years, 1 month ago) by krw
Branch: MAIN
Changes since 1.95: +4 -12 lines
Diff to previous 1.95 (colored)

Split out a new function askpass() and as a result
greatly simplify both getresp() and the code around
obtaining passwords. Shrinks, simplifies and
makes the code clearer.

From espie@.

ok deraadt@ and espie@.

Revision 1.95 / (download) - annotate - [select for diffs], Fri Apr 12 03:24:02 2002 UTC (22 years, 1 month ago) by millert
Branch: MAIN
CVS Tags: OPENBSD_3_1_BASE, OPENBSD_3_1
Changes since 1.94: +12 -9 lines
Diff to previous 1.94 (colored)

Sort mount points when generating fstab file.  This prevents problems
when people specify, e.g. /usr/local before /usr.  deraadt@ OK

Revision 1.94 / (download) - annotate - [select for diffs], Fri Apr 12 02:24:40 2002 UTC (22 years, 1 month ago) by deraadt
Branch: MAIN
Changes since 1.93: +2 -2 lines
Diff to previous 1.93 (colored)

kbd setting code for the installer.  smat@acm.org, miod, and krw.  Minimal
last minute tweaks to it by me, but you can trust me, right?

Revision 1.93 / (download) - annotate - [select for diffs], Tue Apr 9 01:01:19 2002 UTC (22 years, 1 month ago) by krw
Branch: MAIN
Changes since 1.92: +11 -9 lines
Diff to previous 1.92 (colored)

More reorganizations, fixes and shrinkage.

a) Make [ -z "$var" ] standard idiom, replacing
   many variants on [ X"$var" = X"" ].

b) Factor out three large chunks of repeated code
   for finding sets, getting user to select sets
   and then installing the sets. This creates
   get_sets_list(), get_get_files_list() and
   install_get_files_list().

c) Eliminate unneeded dir_has_sets() function.

d) Indent last large functions that were not
   properly indented.

e) Replace most if not all 'test' invocations
   with [], replacing a few if statements along
   the way.

f) Use ${MODE} a lot more to make messages appear
   more relevant to process.

g) Fix erroneous display of $local_sets_dir so
   the error for a non-existant dir actually displays
   the user input, not an empty string.

h) Eliminate the 'list' option in selecting sets. It
   was not possible to actually select anything except
   what was already displayed, so bring verbiage and
   options into line with code.

i) Replace a number of '\"' and "\'" with just plain
   's or "s as appropriate.

j) Replace ".  " with ". ".

k) Use some more "OpenBSD {$VERSION_MAJOR}.${VERSION_MINOR}"
   to make more messages correct and current.

l) Various typos fixed.

Net shrinkage approximately 2K.

ok millert@ deraadt@

Revision 1.92 / (download) - annotate - [select for diffs], Fri Apr 5 02:51:59 2002 UTC (22 years, 2 months ago) by krw
Branch: MAIN
Changes since 1.91: +22 -95 lines
Diff to previous 1.91 (colored)

Abstract out common startup and finishing code from install.sh
and upgrade.sh, putting it into install.sub.

Replace groups of echo's with here documents.

Eliminate bare echo's with embedded \n's.

Abstract repeated verbiage into display_* functions, also eliminating
a backslash orgy when showing the ftp/http server location. This
also makes the verbiage consistant across ftp, cd, etc. installs.

Try hard to make file selection screen fit on one screen.

Fix default in 'File name?' prompt so it contains the first
non-selected set.

Some minor wording adjustment, typos, etc.

Net shrinkage of about 1.5K.

Revision 1.91 / (download) - annotate - [select for diffs], Tue Apr 2 01:25:34 2002 UTC (22 years, 2 months ago) by krw
Branch: MAIN
Changes since 1.90: +18 -26 lines
Diff to previous 1.90 (colored)

Do not copy /etc/mygate to install'ed systems if dhcp is specified
for one or more network interfaces.

Rework timezone logic to shrink it and make it more clear. Don't
bother checking for /usr/share/zoneinfo as it is never there, just
look for /mnt/usr/share/zoneinfo.

Eliminate spurious early call to get_timezone() that
(accidentally?)  made GMT the default timezone during
installs. Instead rely on the /etc/localtime that is installed
from etcXX.gz. Currently this means the default timezone is the
historically resonant US/Pacific.

Ideas if not code details ok deraadt@ and millert@

Revision 1.90 / (download) - annotate - [select for diffs], Sun Mar 31 15:30:42 2002 UTC (22 years, 2 months ago) by krw
Branch: MAIN
Changes since 1.89: +22 -18 lines
Diff to previous 1.89 (colored)

naddy@ pointed out that in the two situations

case WORD

and

var=WORD

Bourne and related/descendant shells such as our sh do *not* do
field splitting or globbing on WORD. Thus we can eliminate a large
number of unnecessary '"'s in case statements and variable
assignments.

This is a lightly adapted version of naddy's diff, to take account
of changes in the scripts since he generated it.

Revision 1.89 / (download) - annotate - [select for diffs], Sun Mar 31 03:05:04 2002 UTC (22 years, 2 months ago) by krw
Branch: MAIN
Changes since 1.88: +7 -10 lines
Diff to previous 1.88 (colored)

This omnibus diff does a number of cleanups:

1) Move the 'executed' code at the top of install.sub
   to the end, so that it can successfully use .md
   functions.

2) Get _DKDEVS once only, and get _CDDEVS at the same
   time (see (1))

3) Clean up calls to getresp so that
      a) no '"'s used on constants
      b) '"'s always used for variables
      c) never use {} for variables
      d) ensure parameter passed matches default shown
         in any preceeding []

4) Try to put '"'s around directory names

5) Replace a couple of instances of using []s around
   a prompt comment instead of ()s

6) Reduce some code by putting $_DKDEVS inside
   here documents, rather than echo'ing it

7) eliminate an unused variable _directory

8) eliminate a couple of while RESP="" loops which
   never loop because a non-null default is provided
   to getresp

9) move some code into mount_a_disk to make logic
   clearer

10) eliminate a couple of extra blanks in prompts

11) eliminate ALLSETS and UPGRSETS by just removing
    'etc' from THESETS in upgrade.sh

12) Indent a couple of smaller functions

ok deraadt@

Revision 1.88 / (download) - annotate - [select for diffs], Sat Mar 30 01:29:18 2002 UTC (22 years, 2 months ago) by deraadt
Branch: MAIN
Changes since 1.87: +23 -33 lines
Diff to previous 1.87 (colored)

shrink 599 more bytes:  cleanups to "case" and such; ok krw

Revision 1.87 / (download) - annotate - [select for diffs], Sat Mar 30 00:50:57 2002 UTC (22 years, 2 months ago) by krw
Branch: MAIN
Changes since 1.86: +5 -5 lines
Diff to previous 1.86 (colored)

Squeeze a few bytes out of the installation scripts by using
standard __EOT as here document delimiter.

Remove unnecessary escaping of __EOT.

Could be/Should be extended to .md scripts and other non-miniroot
architectures.

Concept approved a *long* time ago by deraadt@ and millert@ but
never got out of my tree.

Revision 1.86 / (download) - annotate - [select for diffs], Tue Mar 19 12:16:13 2002 UTC (22 years, 2 months ago) by krw
Branch: MAIN
Changes since 1.85: +5 -2 lines
Diff to previous 1.85 (colored)

Save more dhclient configuration info during installation.

In particular

a) save dhclient.leases so the lease obtained during installation
is retained.

b) create /etc/resolv.conf.tail with 'lookup file bind' so that
the resolv.conf files created by dhclient have the same settings
as the default resolv.conf we install. i.e. use the /etc/hosts
file before trying bind.

ok millert@

Revision 1.85 / (download) - annotate - [select for diffs], Sun Mar 17 03:04:47 2002 UTC (22 years, 2 months ago) by krw
Branch: MAIN
Changes since 1.84: +2 -2 lines
Diff to previous 1.84 (colored)

Examine correct fields in mount(8) output to determine if root
is nfs mounted, i.e. install is running on a diskless machine.

ok millert@

Revision 1.84 / (download) - annotate - [select for diffs], Mon Mar 4 13:59:52 2002 UTC (22 years, 3 months ago) by krw
Branch: MAIN
Changes since 1.83: +2 -2 lines
Diff to previous 1.83 (colored)

Update Copyright(c)'s to 2002

Revision 1.83 / (download) - annotate - [select for diffs], Sun Mar 3 00:43:37 2002 UTC (22 years, 3 months ago) by krw
Branch: MAIN
Changes since 1.82: +17 -10 lines
Diff to previous 1.82 (colored)

Cleanup/Improve trap handling.

a) Add /var/run to the filesystem created when the installation media
   boots. This allows the creation and use of the dhclient.pid file.
   Synchronize all mtree.conf files in architectures using miniroot.

b) Rework the traps used in upgrade.sh and install.sh so that HUP,
   INT, QUIT, TERM and EXIT all invoke a cleanup function that kills an
   active dhclient, unmounts all filesystems and fsck's -p all devices
   in /etc/fstab, or just /mnt if /etc/fstab is not present.

c) Make sure the actions of the cleanup function are visible, thus
   eliminating the long delay with no feedback at the end of the
   upgrade/install script, after the congratulatory message.

d) Reduce manual parsing of fstab files by using umount -a to
   unmount all mounted filesystems.

e) Since the new cleanup function tries to unmount all filesystems,
   use the presence of /etc/fstab, rather than a difference between
   `df /` and `df /mnt`, to determine if an install is being restarted
   in a state where disk initialization can be skipped.

f) Change munge_fs, check_fs, mount_fs, remount_fs so that they
   all 'know' about /etc/fstab rather than passing the same
   parameter in all the time.

g) Use input redirection on munge_fs to read correct file, rather
   than passing a file name as a parameter.

h) Indent code for various smaller functions.

i) Eliminate some subshell usage to simplify code further.

j) Display pretty messages during fsck -p to clearly indicate success
   or failure of fsck, rather than just dumping fsck output.

k) Always run mount_fs in install.sh, even if disk initialization is
   being skipped, because the trap should have unmounted all filesystems
   when the last run terminated.

ok weingart@ millert@

Revision 1.82 / (download) - annotate - [select for diffs], Sun Dec 23 16:54:04 2001 UTC (22 years, 5 months ago) by krw
Branch: MAIN
Changes since 1.81: +2 -3 lines
Diff to previous 1.81 (colored)

Some minor typographical adjustments:

a) Indent encode_for_url() in install.sub with tabs not spaces
b) delete a couple of extra blank lines
c) delete a few unnecessary ';'s at the end of lines
d) delete a few unnecessary '"'s around values assigned to resp (e.g.
   'resp="X"' to 'resp=X'

Revision 1.81 / (download) - annotate - [select for diffs], Sun Nov 25 19:40:51 2001 UTC (22 years, 6 months ago) by krw
Branch: MAIN
Changes since 1.80: +7 -4 lines
Diff to previous 1.80 (colored)

Add capability to accept & correctly process a root password with
trailing spaces during install.

Do not make the previously entered first password value the default
value if passwords do not match the first time.

Update Copyright (ok deraadt@).

Revision 1.80 / (download) - annotate - [select for diffs], Sun Nov 18 22:48:58 2001 UTC (22 years, 6 months ago) by krw
Branch: MAIN
Changes since 1.79: +8 -4 lines
Diff to previous 1.79 (colored)

Purge more (last?) comments from install scripts by removing all
comments that, being on the end of code lines, cannot be stripped
automatically.

Just delete unhelpful ones, and move the rest onto separate lines
where they can be stripped.

Also remove a duplicated initialization of ROOTDISK.

In total, reduces script size on floppy by 1117 bytes, making room
for coming improvements.

Revision 1.79 / (download) - annotate - [select for diffs], Sun Oct 14 02:35:57 2001 UTC (22 years, 7 months ago) by millert
Branch: MAIN
CVS Tags: OPENBSD_3_0_BASE, OPENBSD_3_0
Changes since 1.78: +3 -3 lines
Diff to previous 1.78 (colored)

Use double quotes around the password variable--should close PR 2114

Revision 1.78 / (download) - annotate - [select for diffs], Sat Jun 23 19:44:45 2001 UTC (22 years, 11 months ago) by deraadt
Branch: MAIN
Changes since 1.77: +1 -13 lines
Diff to previous 1.77 (colored)

argh.  stop using kernfs, using dmesg using sysctl.  encode ARCH into
install.md at build time.  remove some crud.  and the icing on the cake:
skip testing all this until next week

Revision 1.77 / (download) - annotate - [select for diffs], Fri Apr 20 01:55:51 2001 UTC (23 years, 1 month ago) by krw
Branch: MAIN
CVS Tags: OPENBSD_2_9_BASE, OPENBSD_2_9
Changes since 1.76: +1 -26 lines
Diff to previous 1.76 (colored)

Cleanup, new features, shrinkage.

Remove chunk of commented out, unused code.

Add _didnet=1 to enable_network() so that ftp upgrade
does not ask for network information it already has.

Tell a user that selects the http installation method
that the files will be downloaded via http.

Suppress all 'softdep' options in fstab_shadow so
there are no warnings when the filesystems are
mounted.

Suppress all non-ffs (including nfs, ufs) filesystems
from fstab_shadow. Ufs was never used to install
OpenBSD.

Suppress all 'noauto' filesystems from fstab_shadow.

Reword some comments and messages, esp. the one
just before the offer to edit fstab. Punch up the
fact that the fstab will not be saved, mention
that non-ffs and noauto filesystems will be
ignored.

Move

   /usr/X11R6/lib/X11/{rstart,twm,xkb,xsm,xinit}

directories to

   /usr/X11R6/lib/X11/XF3{rstart,twm,xkb,xsm,xinit}

and replace with links. Links can be overwritten
during upgrade. Directories can't. This enables the
upgrade from XFree86 3.x to XFree86 4.x.

ok deraadt@ millert@

Revision 1.76 / (download) - annotate - [select for diffs], Mon Apr 16 19:43:27 2001 UTC (23 years, 1 month ago) by krw
Branch: MAIN
Changes since 1.75: +3 -3 lines
Diff to previous 1.75 (colored)

Fix a couple of nits: delete some unnecessary commas and
only print a 'Done.' for fsck'ing if fsck'ing is actually
attempted.

ok deraadt@

Revision 1.75 / (download) - annotate - [select for diffs], Mon Mar 26 14:46:55 2001 UTC (23 years, 2 months ago) by todd
Branch: MAIN
Changes since 1.74: +3 -3 lines
Diff to previous 1.74 (colored)

spelling

Revision 1.74 / (download) - annotate - [select for diffs], Fri Jun 16 03:19:42 2000 UTC (23 years, 11 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_2_8_BASE, OPENBSD_2_8
Changes since 1.73: +1 -77 lines
Diff to previous 1.73 (colored)

ssl package no longer needed (will be tested)

Revision 1.73 / (download) - annotate - [select for diffs], Thu Jun 1 21:01:28 2000 UTC (24 years ago) by millert
Branch: MAIN
Changes since 1.72: +2 -2 lines
Diff to previous 1.72 (colored)

Add missing -n flag to getresp; noted by maurice@ivo.ig.net

Revision 1.72 / (download) - annotate - [select for diffs], Sun May 7 17:08:26 2000 UTC (24 years, 1 month ago) by millert
Branch: MAIN
CVS Tags: OPENBSD_2_7_BASE, OPENBSD_2_7
Changes since 1.71: +2 -2 lines
Diff to previous 1.71 (colored)

Add -n flag to getresp, indicating shell escapes are not to be allowed
Don't show gre interfaces when prompting user for an ether device

Revision 1.71 / (download) - annotate - [select for diffs], Sun Apr 30 19:10:01 2000 UTC (24 years, 1 month ago) by millert
Branch: MAIN
Changes since 1.70: +2 -1 lines
Diff to previous 1.70 (colored)

If the site tarball included a file /install.site (upgrade.site if we
are upgrading not installing) then execute it chroot'd to /mnt.
This allows people to customize the install procedure in a simple
yet flexible manner.

Revision 1.70 / (download) - annotate - [select for diffs], Sun Mar 19 01:14:03 2000 UTC (24 years, 2 months ago) by espie
Branch: MAIN
Changes since 1.69: +2 -1 lines
Diff to previous 1.69 (colored)

populateusrlocal: create the right hierarchy under /usr/local
right before unmounting the new system.
Beats having mtree files around every package...

Revision 1.69 / (download) - annotate - [select for diffs], Sat Oct 16 19:01:21 1999 UTC (24 years, 7 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_2_6_BASE, OPENBSD_2_6
Changes since 1.68: +4 -140 lines
Diff to previous 1.68 (colored)

in any situation where network config is needed, if the network is not configured, configure it then

Revision 1.68 / (download) - annotate - [select for diffs], Fri Oct 15 16:55:00 1999 UTC (24 years, 7 months ago) by millert
Branch: MAIN
Changes since 1.67: +37 -16 lines
Diff to previous 1.67 (colored)

o Support separate USA and International versions of libssl
o add support for passing in wildcards to designate what should
  get pre-selected in the file selector and use it for libssl.

Revision 1.67 / (download) - annotate - [select for diffs], Fri Oct 15 15:16:01 1999 UTC (24 years, 7 months ago) by deraadt
Branch: MAIN
Changes since 1.66: +2 -2 lines
Diff to previous 1.66 (colored)

typo

Revision 1.66 / (download) - annotate - [select for diffs], Thu Oct 14 17:29:04 1999 UTC (24 years, 7 months ago) by deraadt
Branch: MAIN
Changes since 1.65: +7 -7 lines
Diff to previous 1.65 (colored)

libssl*.t*z -> ssl*.t*z

Revision 1.65 / (download) - annotate - [select for diffs], Thu Oct 14 17:19:42 1999 UTC (24 years, 7 months ago) by deraadt
Branch: MAIN
Changes since 1.64: +18 -6 lines
Diff to previous 1.64 (colored)

flesh out ssl messages

Revision 1.64 / (download) - annotate - [select for diffs], Thu Oct 14 17:17:46 1999 UTC (24 years, 7 months ago) by millert
Branch: MAIN
Changes since 1.63: +9 -8 lines
Diff to previous 1.63 (colored)

o When doing an ftp/http install where all the info has already been entered
  give the user the option of just using the old info instead of re-prompting.
o Do network setup before grabbing libssl via ftp/http if it has not
  already been setup.

Revision 1.63 / (download) - annotate - [select for diffs], Fri Oct 8 03:54:13 1999 UTC (24 years, 8 months ago) by millert
Branch: MAIN
Changes since 1.62: +3 -4 lines
Diff to previous 1.62 (colored)

When making timezone link just say what it is doing, don't say
"doing...done" since it takes no noticable time...

Revision 1.62 / (download) - annotate - [select for diffs], Sat Sep 25 22:48:45 1999 UTC (24 years, 8 months ago) by deraadt
Branch: MAIN
Changes since 1.61: +2 -2 lines
Diff to previous 1.61 (colored)

no default

Revision 1.61 / (download) - annotate - [select for diffs], Thu Sep 23 21:33:43 1999 UTC (24 years, 8 months ago) by aaron
Branch: MAIN
Changes since 1.60: +2 -2 lines
Diff to previous 1.60 (colored)

Formatting, typo, and grammar fixes.

Revision 1.60 / (download) - annotate - [select for diffs], Thu Sep 23 19:02:20 1999 UTC (24 years, 8 months ago) by deraadt
Branch: MAIN
Changes since 1.59: +42 -0 lines
Diff to previous 1.59 (colored)

first cut at ssl chroot package install

Revision 1.59 / (download) - annotate - [select for diffs], Thu Sep 23 19:00:34 1999 UTC (24 years, 8 months ago) by deraadt
Branch: MAIN
Changes since 1.58: +21 -21 lines
Diff to previous 1.58 (colored)

various printing nits

Revision 1.58 / (download) - annotate - [select for diffs], Fri Sep 3 18:55:29 1999 UTC (24 years, 9 months ago) by deraadt
Branch: MAIN
Changes since 1.57: +2 -0 lines
Diff to previous 1.57 (colored)

md_questions() interface allows asking questions before sets

Revision 1.57 / (download) - annotate - [select for diffs], Fri Sep 3 18:54:03 1999 UTC (24 years, 9 months ago) by deraadt
Branch: MAIN
Changes since 1.56: +1 -13 lines
Diff to previous 1.56 (colored)

remove a question

Revision 1.56 / (download) - annotate - [select for diffs], Sun Aug 15 09:53:36 1999 UTC (24 years, 9 months ago) by millert
Branch: MAIN
Changes since 1.55: +16 -27 lines
Diff to previous 1.55 (colored)

o When clearing a variable, do ``foo='', not ``foo=""'' to save 2 bytes.
  There are other places where double quotes are used unnecessarily as well
o Kill md_copy_kernel() and check_kernel() since the kernel is now a 'set'
o Add support for shell escapes from any prompt
o Consolidate post-install_sets sanity checks and put them in sane_install().
o install_sets() now calls sane_install() to do the sanity checks and won't
  let you continue until things are sane (as far as it can determine).

Revision 1.55 / (download) - annotate - [select for diffs], Fri Jul 30 00:31:27 1999 UTC (24 years, 10 months ago) by deraadt
Branch: MAIN
Changes since 1.54: +5 -4 lines
Diff to previous 1.54 (colored)

leave async mode before installboot is run...

Revision 1.54 / (download) - annotate - [select for diffs], Mon Jul 19 00:57:46 1999 UTC (24 years, 10 months ago) by deraadt
Branch: MAIN
Changes since 1.53: +4 -1 lines
Diff to previous 1.53 (colored)

create /var/db/host.random at install time

Revision 1.53 / (download) - annotate - [select for diffs], Sat Apr 10 04:38:30 1999 UTC (25 years, 1 month ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_2_5_BASE, OPENBSD_2_5
Changes since 1.52: +2 -2 lines
Diff to previous 1.52 (colored)

spelling

Revision 1.52 / (download) - annotate - [select for diffs], Sat Apr 10 04:09:22 1999 UTC (25 years, 1 month ago) by millert
Branch: MAIN
Changes since 1.51: +2 -2 lines
Diff to previous 1.51 (colored)

Add -q flag to newfs and use it in the install

Revision 1.51 / (download) - annotate - [select for diffs], Thu Apr 8 06:16:15 1999 UTC (25 years, 2 months ago) by deraadt
Branch: MAIN
Changes since 1.50: +3 -20 lines
Diff to previous 1.50 (colored)

clean ramdisk /tmp a bit more before running MAKEDEV

Revision 1.50 / (download) - annotate - [select for diffs], Wed Apr 7 22:59:27 1999 UTC (25 years, 2 months ago) by deraadt
Branch: MAIN
Changes since 1.49: +19 -18 lines
Diff to previous 1.49 (colored)

skip that swapon stuff, now that pax is about to become less leaky

Revision 1.49 / (download) - annotate - [select for diffs], Wed Apr 7 08:47:34 1999 UTC (25 years, 2 months ago) by deraadt
Branch: MAIN
Changes since 1.48: +37 -33 lines
Diff to previous 1.48 (colored)

save bytes; move swapon question

Revision 1.48 / (download) - annotate - [select for diffs], Wed Apr 7 06:09:22 1999 UTC (25 years, 2 months ago) by deraadt
Branch: MAIN
Changes since 1.47: +14 -5 lines
Diff to previous 1.47 (colored)

For low-memory machines, help people by putting in enough swapon support, so
that people can do a boot, disklabel, reboot, boot, disklabel, swapon, ....
and finish their install.

Revision 1.47 / (download) - annotate - [select for diffs], Wed Apr 7 05:58:04 1999 UTC (25 years, 2 months ago) by deraadt
Branch: MAIN
Changes since 1.46: +5 -4 lines
Diff to previous 1.46 (colored)

cannot swapon in 2.5 installer.  the swap partitions must exist at kernel
boot time, the later user-entered disklabel does not take effect correctly.
next release...

Revision 1.46 / (download) - annotate - [select for diffs], Thu Apr 1 21:24:22 1999 UTC (25 years, 2 months ago) by deraadt
Branch: MAIN
Changes since 1.45: +2 -4 lines
Diff to previous 1.45 (colored)

remove twiddle; tmp/fstab.*

Revision 1.45 / (download) - annotate - [select for diffs], Thu Apr 1 04:14:08 1999 UTC (25 years, 2 months ago) by millert
Branch: MAIN
Changes since 1.44: +5 -1 lines
Diff to previous 1.44 (colored)

Use /tmp/fstab.DISK if it exists to preload mountpoints

Revision 1.44 / (download) - annotate - [select for diffs], Sun Feb 28 06:50:33 1999 UTC (25 years, 3 months ago) by deraadt
Branch: MAIN
Changes since 1.43: +5 -1 lines
Diff to previous 1.43 (colored)

if swapon exists, use it to add root swap partition

Revision 1.43 / (download) - annotate - [select for diffs], Mon Nov 9 03:54:52 1998 UTC (25 years, 6 months ago) by millert
Branch: MAIN
Changes since 1.42: +1 -2 lines
Diff to previous 1.42 (colored)

Remove labelmoredisks(), nothing uses it anymore and most install.md's
don't provide a real md_labeldisk() anyway.

Revision 1.42 / (download) - annotate - [select for diffs], Wed Oct 28 17:51:14 1998 UTC (25 years, 7 months ago) by millert
Branch: MAIN
Changes since 1.41: +3 -3 lines
Diff to previous 1.41 (colored)

Move md_copy_kernel after install_sets and add check_kernel (which
should probably be used instead of md_copy_kernel once I am sure
nothing actually uses md_copy_kernel to copy the kernel any more).

Revision 1.41 / (download) - annotate - [select for diffs], Tue Oct 13 21:23:30 1998 UTC (25 years, 7 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_2_4_BASE, OPENBSD_2_4
Changes since 1.40: +2 -2 lines
Diff to previous 1.40 (colored)

whack resolv.conf properly; bug seen by jason

Revision 1.40 / (download) - annotate - [select for diffs], Sun Oct 11 02:50:47 1998 UTC (25 years, 7 months ago) by deraadt
Branch: MAIN
Changes since 1.39: +3 -3 lines
Diff to previous 1.39 (colored)

prettier prompts

Revision 1.39 / (download) - annotate - [select for diffs], Wed Oct 7 02:40:45 1998 UTC (25 years, 8 months ago) by deraadt
Branch: MAIN
Changes since 1.38: +6 -1 lines
Diff to previous 1.38 (colored)

append script-formed dhclient.conf to installed one if necessary

Revision 1.38 / (download) - annotate - [select for diffs], Mon Sep 28 13:37:54 1998 UTC (25 years, 8 months ago) by deraadt
Branch: MAIN
Changes since 1.37: +2 -1 lines
Diff to previous 1.37 (colored)

if no default route, set it to "none"

Revision 1.37 / (download) - annotate - [select for diffs], Mon Sep 28 13:28:35 1998 UTC (25 years, 8 months ago) by deraadt
Branch: MAIN
Changes since 1.36: +17 -74 lines
Diff to previous 1.36 (colored)

toast the obviously untested nfs changes

Revision 1.36 / (download) - annotate - [select for diffs], Mon Sep 28 13:19:48 1998 UTC (25 years, 8 months ago) by deraadt
Branch: MAIN
Changes since 1.35: +2 -2 lines
Diff to previous 1.35 (colored)

typo

Revision 1.35 / (download) - annotate - [select for diffs], Mon Sep 28 12:34:51 1998 UTC (25 years, 8 months ago) by deraadt
Branch: MAIN
Changes since 1.34: +14 -14 lines
Diff to previous 1.34 (colored)

fix resolver setup

Revision 1.34 / (download) - annotate - [select for diffs], Mon Sep 28 12:34:06 1998 UTC (25 years, 8 months ago) by deraadt
Branch: MAIN
Changes since 1.33: +74 -17 lines
Diff to previous 1.33 (colored)

nfs root patches; todd@

Revision 1.33 / (download) - annotate - [select for diffs], Sat Sep 26 21:41:23 1998 UTC (25 years, 8 months ago) by deraadt
Branch: MAIN
Changes since 1.32: +11 -3 lines
Diff to previous 1.32 (colored)

proper spacing of dns queries

Revision 1.32 / (download) - annotate - [select for diffs], Fri Sep 25 02:23:52 1998 UTC (25 years, 8 months ago) by deraadt
Branch: MAIN
Changes since 1.31: +18 -11 lines
Diff to previous 1.31 (colored)

multiple IP addresses permitted for DNS servers

Revision 1.31 / (download) - annotate - [select for diffs], Thu Sep 24 21:52:10 1998 UTC (25 years, 8 months ago) by deraadt
Branch: MAIN
Changes since 1.30: +6 -3 lines
Diff to previous 1.30 (colored)

parse /etc/resolv.conf if it exists...

Revision 1.30 / (download) - annotate - [select for diffs], Wed Sep 23 06:51:20 1998 UTC (25 years, 8 months ago) by deraadt
Branch: MAIN
Changes since 1.29: +11 -4 lines
Diff to previous 1.29 (colored)

if default route already set (dhcp?) use it. otherwise use /etc/mygate..
otherwise we have no default route... in any case, prompt.

Revision 1.29 / (download) - annotate - [select for diffs], Thu Sep 17 00:49:15 1998 UTC (25 years, 8 months ago) by deraadt
Branch: MAIN
Changes since 1.28: +3 -3 lines
Diff to previous 1.28 (colored)

pretty up MAKEDEV run

Revision 1.28 / (download) - annotate - [select for diffs], Tue Sep 15 21:48:27 1998 UTC (25 years, 8 months ago) by deraadt
Branch: MAIN
Changes since 1.27: +6 -0 lines
Diff to previous 1.27 (colored)

add dhclient support; jbi130@mail.usask.ca and I

Revision 1.27 / (download) - annotate - [select for diffs], Fri Sep 11 22:45:53 1998 UTC (25 years, 8 months ago) by millert
Branch: MAIN
Changes since 1.26: +1 -2 lines
Diff to previous 1.26 (colored)

mi get_ifdevs()

Revision 1.26 / (download) - annotate - [select for diffs], Mon Jul 13 23:23:19 1998 UTC (25 years, 10 months ago) by deraadt
Branch: MAIN
Changes since 1.25: +2 -2 lines
Diff to previous 1.25 (colored)

make users aware of what "making devices" entails

Revision 1.25 / (download) - annotate - [select for diffs], Mon Jun 8 02:01:15 1998 UTC (26 years ago) by jason
Branch: MAIN
Changes since 1.24: +3 -3 lines
Diff to previous 1.24 (colored)

Move `md_copy_kernel' to earlier in the file to prevent warning
about missing kernel.

Revision 1.24 / (download) - annotate - [select for diffs], Tue Jun 2 02:22:18 1998 UTC (26 years ago) by millert
Branch: MAIN
Changes since 1.23: +2 -2 lines
Diff to previous 1.23 (colored)

Don't use given password as default when prompting for passwd a second
time; matter@superlink.net

Revision 1.23 / (download) - annotate - [select for diffs], Sat Apr 11 09:47:27 1998 UTC (26 years, 1 month ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_2_3_BASE, OPENBSD_2_3
Changes since 1.22: +29 -1 lines
Diff to previous 1.22 (colored)

make user enter root password during install phase

Revision 1.22 / (download) - annotate - [select for diffs], Sat Mar 28 21:40:45 1998 UTC (26 years, 2 months ago) by deraadt
Branch: MAIN
Changes since 1.21: +2 -2 lines
Diff to previous 1.21 (colored)

oops

Revision 1.21 / (download) - annotate - [select for diffs], Sat Mar 28 21:06:51 1998 UTC (26 years, 2 months ago) by deraadt
Branch: MAIN
Changes since 1.20: +30 -1 lines
Diff to previous 1.20 (colored)

copyrights

Revision 1.20 / (download) - annotate - [select for diffs], Thu Mar 12 08:13:48 1998 UTC (26 years, 2 months ago) by deraadt
Branch: MAIN
Changes since 1.19: +15 -9 lines
Diff to previous 1.19 (colored)

various prompt and message changes

Revision 1.19 / (download) - annotate - [select for diffs], Sat Jan 10 02:22:56 1998 UTC (26 years, 4 months ago) by deraadt
Branch: MAIN
Changes since 1.18: +86 -72 lines
Diff to previous 1.18 (colored)

support installing to multiple disks; cyxob@isl.vtu.lt
after install is done, if /bsd or /bin/cat do not exist, complain that the
kernel or baseXX.tar distributions did not get installed; deraadt

Revision 1.18 / (download) - annotate - [select for diffs], Mon Nov 10 20:56:32 1997 UTC (26 years, 6 months ago) by deraadt
Branch: MAIN
Changes since 1.17: +2 -1 lines
Diff to previous 1.17 (colored)

init resolv.conf in "lookup file bind" mode

Revision 1.16.2.1 / (download) - annotate - [select for diffs], Thu Oct 30 05:43:47 1997 UTC (26 years, 7 months ago) by millert
Branch: OPENBSD_2_2
Changes since 1.16: +56 -36 lines
Diff to previous 1.16 (colored) next main 1.17 (colored)

Merge in 1.16 to 1.17 from the trunk;
nice mount point chooser

Revision 1.17 / (download) - annotate - [select for diffs], Thu Oct 30 05:23:44 1997 UTC (26 years, 7 months ago) by millert
Branch: MAIN
Changes since 1.16: +56 -36 lines
Diff to previous 1.16 (colored)

nice mount point chooser

Revision 1.16 / (download) - annotate - [select for diffs], Fri Oct 17 12:21:02 1997 UTC (26 years, 7 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_2_2_BASE
Branch point for: OPENBSD_2_2
Changes since 1.15: +18 -17 lines
Diff to previous 1.15 (colored)

oops

Revision 1.15 / (download) - annotate - [select for diffs], Fri Oct 17 12:05:56 1997 UTC (26 years, 7 months ago) by deraadt
Branch: MAIN
Changes since 1.14: +98 -99 lines
Diff to previous 1.14 (colored)

clarify significantly. in many situations, put more effort into remembering
previous answers to the questions, so that it is easier to abort and restart
the install script.

Revision 1.14 / (download) - annotate - [select for diffs], Fri Oct 17 04:20:59 1997 UTC (26 years, 7 months ago) by deraadt
Branch: MAIN
Changes since 1.13: +2 -2 lines
Diff to previous 1.13 (colored)

clarify hostname prompt

Revision 1.13 / (download) - annotate - [select for diffs], Tue Sep 23 22:39:25 1997 UTC (26 years, 8 months ago) by niklas
Branch: MAIN
Changes since 1.12: +2 -2 lines
Diff to previous 1.12 (colored)

Typo, fixes passno botch in / entry

Revision 1.12 / (download) - annotate - [select for diffs], Sat May 17 21:16:46 1997 UTC (27 years ago) by millert
Branch: MAIN
CVS Tags: OPENBSD_2_1_BASE, OPENBSD_2_1
Changes since 1.11: +7 -1 lines
Diff to previous 1.11 (colored)

Set ROOTDISK based on /mnt when restarting install.  Noticed by Per.

Revision 1.11 / (download) - annotate - [select for diffs], Wed May 14 21:22:06 1997 UTC (27 years ago) by millert
Branch: MAIN
Changes since 1.10: +4 -4 lines
Diff to previous 1.10 (colored)

md_machine_arch must be done after md_makerootwritable (for /kern)

Revision 1.10 / (download) - annotate - [select for diffs], Wed May 14 21:07:59 1997 UTC (27 years ago) by millert
Branch: MAIN
Changes since 1.9: +5 -1 lines
Diff to previous 1.9 (colored)

Now calls md_machine_arch() which needs to be added to everyone's
install.md.

Revision 1.9 / (download) - annotate - [select for diffs], Tue May 13 18:22:18 1997 UTC (27 years ago) by millert
Branch: MAIN
Changes since 1.8: +5 -4 lines
Diff to previous 1.8 (colored)

Explicately mention what editor is being used.

Revision 1.8 / (download) - annotate - [select for diffs], Thu May 8 15:48:19 1997 UTC (27 years, 1 month ago) by tholo
Branch: MAIN
Changes since 1.7: +4 -2 lines
Diff to previous 1.7 (colored)

Don't try to copy disktab.shadow if it does not exist

Revision 1.7 / (download) - annotate - [select for diffs], Sat May 3 23:06:01 1997 UTC (27 years, 1 month ago) by tholo
Branch: MAIN
Changes since 1.6: +5 -5 lines
Diff to previous 1.6 (colored)

Disable twiddle() as it causes problems on some architectures
Actually install machine dependant sets if there are any specified
Special-case a set named "kernel" so that it will copy "bsd" to the root
disk

Revision 1.6 / (download) - annotate - [select for diffs], Fri May 2 20:56:17 1997 UTC (27 years, 1 month ago) by grr
Branch: MAIN
Changes since 1.5: +188 -154 lines
Diff to previous 1.5 (colored)

allow install to be restarted in many cases without blowing away everything already extracted and move the ftp extract further in the direction of user friendly

Revision 1.5 / (download) - annotate - [select for diffs], Wed Apr 30 23:56:05 1997 UTC (27 years, 1 month ago) by grr
Branch: MAIN
Changes since 1.4: +35 -12 lines
Diff to previous 1.4 (colored)

clean up sparc mini-root stuff and eliminate some mysteries and surprises therein

Revision 1.4 / (download) - annotate - [select for diffs], Wed Apr 30 18:52:43 1997 UTC (27 years, 1 month ago) by niklas
Branch: MAIN
Changes since 1.3: +2 -1 lines
Diff to previous 1.3 (colored)

We run OpenBSD. we also want vim acting as vi.

Revision 1.3 / (download) - annotate - [select for diffs], Thu Sep 5 21:26:39 1996 UTC (27 years, 9 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_2_0_BASE, OPENBSD_2_0
Changes since 1.2: +80 -101 lines
Diff to previous 1.2 (colored)

sync to netbsd

Revision 1.2 / (download) - annotate - [select for diffs], Thu Mar 28 21:48:18 1996 UTC (28 years, 2 months ago) by niklas
Branch: MAIN
Changes since 1.1: +24 -18 lines
Diff to previous 1.1 (colored)

From NetBSD: merge of 960317

Revision 1.1 / (download) - annotate - [select for diffs], Sun Jan 7 13:22:50 1996 UTC (28 years, 5 months ago) by deraadt
Branch: MAIN

update from netbsd

This form allows you to request diff's between any two revisions of a file. You may select a symbolic revision name using the selection box or you may type in a numeric name using the type-in text box.