OpenBSD CVS

CVS log for src/distrib/miniroot/install.sub


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

Request diff between arbitrary revisions


Default branch: MAIN


Revision 1.1266 / (download) - annotate - [select for diffs], Tue Jul 9 14:47:21 2024 UTC (3 months, 2 weeks ago) by krw
Branch: MAIN
CVS Tags: OPENBSD_7_6_BASE, OPENBSD_7_6, HEAD
Changes since 1.1265: +4 -9 lines
Diff to previous 1.1265 (colored)

Removing 'softdep' options from fstab entries during upgrade is no longer
necessary as 'softdep' is now a no-op.

ok beck@ sthen@

Revision 1.1265 / (download) - annotate - [select for diffs], Sat Jun 15 15:05:15 2024 UTC (4 months, 1 week ago) by florian
Branch: MAIN
Changes since 1.1264: +6 -2 lines
Diff to previous 1.1264 (colored)

Install BUILDINFO if available.

We already keep /var/db/installed.SHA256 for sysupgrade(8) as a cheap
check to not install the same snapshot over and over again. With
/mnt/var/db/installed.BUILDINFO we can ensure that we are not
installing an older snapshot over a newer snapshot.

Intentionally not yet committing the sysupgrade(8) bits so that we
exercise the sysupgrade(8) / install.sub interaction as it will happen
during the 7.5 -> 7.6 transition. I.e. a newer install.sub getting
installed by an older sysupgrade(8).

deraadt@ likes it.

Revision 1.1264 / (download) - annotate - [select for diffs], Sun May 12 19:47:14 2024 UTC (5 months, 2 weeks ago) by kn
Branch: MAIN
Changes since 1.1263: +7 -2 lines
Diff to previous 1.1263 (colored)

Rerun installboot(8) after fw_update(8) to pick up Apple boot firmware

Firmware is fetched after bootstraps are installed, i.e. on fresh installs
apple-boot is not there yet when installboot ought to place it onto the EFI
System Partition.

Rerun --only on Apple silicon-- to replace Asahi u-boot and boot straight
into ours, nicely visible my different logo.

Input sthen deraadt

Revision 1.1263 / (download) - annotate - [select for diffs], Fri Mar 15 17:31:21 2024 UTC (7 months, 1 week ago) by kn
Branch: MAIN
Changes since 1.1262: +5 -11 lines
Diff to previous 1.1262 (colored)

Backout "Move code into new stop_watchdog()"

An upgrade stalled on me, either my testing was flawed or my diff is...
Having stop_watchdog() is fine, but calling it in a different place has
is apparently too subtle for me to get right.

Revision 1.1262 / (download) - annotate - [select for diffs], Fri Mar 15 16:29:32 2024 UTC (7 months, 1 week ago) by kn
Branch: MAIN
Changes since 1.1261: +12 -6 lines
Diff to previous 1.1261 (colored)

Move code into new stop_watchdog()

We have {reset,start}_watchdog() which are only used in unattended upgrade
code, but stopping the background timer is done inline for all upgrades,
incl. interactive ones.

Relocate it out of the very end of do_upgrade() right after its only caller
and limit it to unattended upgrades to match where/how the timer is started.

OK afresh1

Revision 1.1261 / (download) - annotate - [select for diffs], Tue Mar 5 19:47:58 2024 UTC (7 months, 3 weeks ago) by kn
Branch: MAIN
CVS Tags: OPENBSD_7_5_BASE, OPENBSD_7_5
Changes since 1.1260: +2 -2 lines
Diff to previous 1.1260 (colored)

prune clang13 libLLVM;  OK sthen

Revision 1.1260 / (download) - annotate - [select for diffs], Mon Feb 19 13:53:03 2024 UTC (8 months, 1 week ago) by kn
Branch: MAIN
Changes since 1.1259: +6 -6 lines
Diff to previous 1.1259 (colored)

Avoid passphrase in temporary file

bioctl(8) uses readpassphrase(3) RPP_REQUITE_TTY, so always pass stdin,
but only use it over TTY with -s in unattended mode.

Prodding afresh1 sthen
"much better" sthen

Revision 1.1259 / (download) - annotate - [select for diffs], Sun Feb 11 21:56:10 2024 UTC (8 months, 2 weeks ago) by kn
Branch: MAIN
Changes since 1.1258: +9 -7 lines
Diff to previous 1.1258 (colored)

Enable disk encryption in unattended installations

Interactively keeps using bioctl(8)'s own prompt, in unattended mode
ask_passphrase() ensures non-empty responses or fails.

Unlike user passwords, autoinstall(8) only supports plaintext passphrases:
    Encrypt the root disk with a (p)assphrase or (k)eydisk = passphrase
    New passphrase = secret
Make sure to trust the install network or use a pre-configured key disk:
    Encrypt the root disk with a (p)assphrase or (k)eydisk = keydisk
    Which disk contains the key disk = sd2
    Which sd2 partition is the key disk = a

initial diff from Chris Narkiewicz
OK afresh1
Feedback sthen

Revision 1.1258 / (download) - annotate - [select for diffs], Fri Jan 26 16:35:58 2024 UTC (9 months ago) by sthen
Branch: MAIN
Changes since 1.1257: +3 -1 lines
Diff to previous 1.1257 (colored)

remove /mnt/usr/include/c++/v1 before extracting sets, it changed from
a file to a dir with the libc++ update to 16.  ok deraadt phessler

Revision 1.1257 / (download) - annotate - [select for diffs], Tue Oct 24 18:03:53 2023 UTC (12 months ago) by naddy
Branch: MAIN
Changes since 1.1256: +2 -1 lines
Diff to previous 1.1256 (colored)

add fallback IPv6 address for ftplist1.openbsd.org; ok phessler@

Revision 1.1256 / (download) - annotate - [select for diffs], Thu Oct 19 02:39:06 2023 UTC (12 months, 1 week ago) by kn
Branch: MAIN
Changes since 1.1255: +45 -4 lines
Diff to previous 1.1255 (colored)

Support encrypting the root disk with a key disk

Extend the yes/no question to no/passphrase/keydisk and have users pick an
existing, preformated RAID partition;  no support (yet) for creating one.

OK tb afresh1

Revision 1.1255 / (download) - annotate - [select for diffs], Mon Aug 21 14:33:55 2023 UTC (14 months, 1 week ago) by kn
Branch: MAIN
CVS Tags: OPENBSD_7_4_BASE, OPENBSD_7_4
Changes since 1.1254: +2 -5 lines
Diff to previous 1.1254 (colored)

No need to make_dev() existing root device in disk crypto question

Since r1.1245 encrypt_root() happens immediately after get_rootinfo().
the latter creates device files for the root disk (and aborts if make_dev()
fails), so encrypt_root()'s call on the softraid chunk is purely redundant.

Hoist _chunk definition into declaration while here.

Revision 1.1254 / (download) - annotate - [select for diffs], Mon Aug 21 08:59:18 2023 UTC (14 months, 1 week ago) by kn
Branch: MAIN
Changes since 1.1253: +3 -6 lines
Diff to previous 1.1253 (colored)

Remove retry loop crutch around disk passphrase prompt

bioctl(8) now retries itself on mismatch so the installer continues until
the passphrase is confirmed correctly (like for the root password) instead
of bailing out after three failed attempts.

Revision 1.1253 / (download) - annotate - [select for diffs], Thu Aug 10 17:09:34 2023 UTC (14 months, 2 weeks ago) by kn
Branch: MAIN
Changes since 1.1252: +2 -2 lines
Diff to previous 1.1252 (colored)

Always create new softraid CRYPTO volume, do not reuse existing one

The bioctl(8) command to create new and unlock old volumes is the same.
Use `-C force' to prevent reuse, which happens with, e.g. aborted/restarted
encrypted installations past the question or installations onto an old disk.

OK naddy sthen deraadt

Revision 1.1252 / (download) - annotate - [select for diffs], Wed Aug 2 08:51:16 2023 UTC (14 months, 3 weeks ago) by kn
Branch: MAIN
Changes since 1.1251: +2 -2 lines
Diff to previous 1.1251 (colored)

Simplify disk encryption question

The yes/no question was mistaken as actual passphrase prompt and/or details
in parentheses were taken as option list (despite the lack of commas).

Unmention the only disk encryption mechanism we support and simply ask
whether to protect the root disk with a passphrase or not (still yes/no).

Prodded by solene, feedback from many
Wording from naddy, similar wording from sthen
OK naddy sthen deraadt afresh1

Revision 1.1251 / (download) - annotate - [select for diffs], Sat Jul 8 15:01:09 2023 UTC (15 months, 3 weeks ago) by kn
Branch: MAIN
Changes since 1.1250: +4 -1 lines
Diff to previous 1.1250 (colored)

Floppies don't have bioctl(8)

The installer always checks for softraid using it, skip if unavailable.

Apply the usual idiom in encrypt_root() to silence stderr noise.

Do so in do in get_softraid_chunks() as well which is always called in
get_dkdevs_unitialized() and finish_up();  get_softraid_chunks() discards
stderr and both users still do the right thing on bioctl failure/empty
output from get_dkdevs_unitialized(), but there's no point in trying plus
the idiom clarifies how this code is indeed used on floppies.

Found and tested by krw
OK deraadt krw

Revision 1.1250 / (download) - annotate - [select for diffs], Sun Jun 18 15:17:38 2023 UTC (16 months, 1 week ago) by deraadt
Branch: MAIN
Changes since 1.1249: +3 -3 lines
Diff to previous 1.1249 (colored)

accept 'a' as shortcut for 'autoconf'; ok op afresh1 kn

Revision 1.1249 / (download) - annotate - [select for diffs], Tue Jun 6 09:35:44 2023 UTC (16 months, 3 weeks ago) by kn
Branch: MAIN
Changes since 1.1248: +3 -17 lines
Diff to previous 1.1248 (colored)

Fold disk crypto question '?' text into prompt

Since this question moved after the root disk one and '?' stopped listing disks,
hoist the implementation details in order to drop the custom answer and reuse
existing ask_yn(), thus

	Encrypt the root disk? (yes, no or '?' for details) [no] ?
	Create a passphrase protected CRYPTO softraid volume to be used as root disk.
	Encrypt the root disk? (yes, no or '?' for details) [no]
becomes
	Encrypt the root disk? (passphrase CRYPTO softraid) [no]

Prodded by afresh1

Revision 1.1248 / (download) - annotate - [select for diffs], Wed May 24 20:04:05 2023 UTC (17 months ago) by naddy
Branch: MAIN
Changes since 1.1247: +5 -5 lines
Diff to previous 1.1247 (colored)

replace "$(cat file)" with the ksh construct "$(<file)"

ok kn@ millert@

Revision 1.1247 / (download) - annotate - [select for diffs], Mon May 22 23:32:31 2023 UTC (17 months, 1 week ago) by kn
Branch: MAIN
Changes since 1.1246: +2 -2 lines
Diff to previous 1.1246 (colored)

Drop unused md_prep_fdisk() argument in disk crypto question handler

It takes just one, the disk;  the second snuck from earlier development into
the intial r1.1231 commit.

Revision 1.1246 / (download) - annotate - [select for diffs], Sat May 20 20:00:28 2023 UTC (17 months, 1 week ago) by kn
Branch: MAIN
Changes since 1.1245: +2 -2 lines
Diff to previous 1.1245 (colored)

typofix message in previous

Revision 1.1245 / (download) - annotate - [select for diffs], Sat May 20 19:10:25 2023 UTC (17 months, 1 week ago) by kn
Branch: MAIN
Changes since 1.1244: +16 -20 lines
Diff to previous 1.1244 (colored)

Ask for disk crypto after root disk question

    Encrypt the root disk? (disk, no or '?' for details) [no]
    Which disk is the root disk? ('?' for details) [sdN]
becomes
    Which disk is the root disk? ('?' for details) [sd0]
    Encrypt the root disk? (yes, no or '?' for details) [no]

so that answering 'sd0' at this point during installation behaves the same
as before the new question:  specifying the root disk.

Users no longer deal with two (softraid chunk sd0, root disk sd1), but just
one disk as before, while sdN are dealt with transparently.

Code also gets simpler and should enable more improvements soon.

Feedback OK afresh1

Revision 1.1244 / (download) - annotate - [select for diffs], Tue May 2 15:55:58 2023 UTC (17 months, 3 weeks ago) by deraadt
Branch: MAIN
Changes since 1.1243: +2 -2 lines
Diff to previous 1.1243 (colored)

Absolutely astounding that custom code was written for the softraid case
to require "no", instead of "n" or "no" which works at every other damn prompt
in the installer.  This seems to be an artifact of relentlessly pushing people
towards softraid by default, and I think that is a bit nasty and pushy.

Revision 1.1243 / (download) - annotate - [select for diffs], Tue Apr 25 14:20:13 2023 UTC (18 months ago) by kn
Branch: MAIN
Changes since 1.1242: +1 -3 lines
Diff to previous 1.1242 (colored)

drop empty lines around disk crypto '?' help text

Revision 1.1242 / (download) - annotate - [select for diffs], Mon Apr 17 13:59:16 2023 UTC (18 months, 1 week ago) by kn
Branch: MAIN
Changes since 1.1241: +3 -3 lines
Diff to previous 1.1241 (colored)

Indent interface and disk listings

'?' output to list available answers could better distuingish from questions
and other lines, like sets selection does with four leading spaces.

OK deraadt

Revision 1.1241 / (download) - annotate - [select for diffs], Fri Apr 7 13:48:42 2023 UTC (18 months, 3 weeks ago) by kn
Branch: MAIN
Changes since 1.1240: +7 -2 lines
Diff to previous 1.1240 (colored)

Default 'Is the disk partition alrady mounted?' to 'no' on install

For installation, no partitions whatsoever are mounted, so 'yes' is always
wrong unless the user manually mounted stuff before that question.

No change for upgrade, where partitions on the root disk are mounted.

Idea from naddy, diff from Mikhail (mp39590 AT gmail)
Tweaks from me
OK op afresh1

Revision 1.1240 / (download) - annotate - [select for diffs], Fri Apr 7 09:40:18 2023 UTC (18 months, 3 weeks ago) by kn
Branch: MAIN
Changes since 1.1239: +12 -3 lines
Diff to previous 1.1239 (colored)

Nail the root disk default in the guided disk encryption case

Save the softraid volume's device and make it root disk default, being the
only legit choice in this case;  this gets it always right on systems with
multiple physical disks.

All other install/upgrade cases keep picking the first available [sw]d* disk
as root disk default.

OK afresh1

Revision 1.1239 / (download) - annotate - [select for diffs], Sun Apr 2 00:58:07 2023 UTC (18 months, 3 weeks ago) by kn
Branch: MAIN
Changes since 1.1238: +9 -9 lines
Diff to previous 1.1238 (colored)

Rename get_softraid_{disks -> chunk}() and CRYPTO{DISK -> CHUNK}

"disk" can mean both "chunk" and "volume" and a future diff for better
softraid volumes handling will benefit from this distinction.

No functional change.

Revision 1.1238 / (download) - annotate - [select for diffs], Sat Apr 1 23:24:46 2023 UTC (18 months, 3 weeks ago) by kn
Branch: MAIN
Changes since 1.1237: +5 -4 lines
Diff to previous 1.1237 (colored)

Limit IFS scope to effect parsing code only

Set to split `hw.disknames' strings is neat, but functionn-wide means the
bsort() invocation honours it, i.e. it'll output newlines not spaces.

Break the one-liner into the same multi-line idom occuring elsewhere and
contain IFS in the subshell that needs it.

This was never visible due how the output of was consumed by the shell.

The only visual, but otherwise effectless bug due to this appeared with the
new disk encryption question double-quoting get_dkdevs() output, i.e.
multiple disks printed across multiple lines;  this yields one, as inteded.

OK afresh1

Revision 1.1237 / (download) - annotate - [select for diffs], Wed Mar 29 17:40:24 2023 UTC (19 months ago) by kn
Branch: MAIN
Changes since 1.1236: +2 -2 lines
Diff to previous 1.1236 (colored)

Quote possible 'none' answer as part of help text after question

'Default IPv4 route?' takes an IP or this word, not no IP at all.
All other questions already quote their 'none', 'done', etc. answers.

No behaviour change for autoinstall(8) files, questions end after the
qestion mark and potential answers/help in parentheses comes after that.

Revision 1.1236 / (download) - annotate - [select for diffs], Mon Mar 27 06:15:43 2023 UTC (19 months ago) by tb
Branch: MAIN
Changes since 1.1235: +8 -4 lines
Diff to previous 1.1235 (colored)

Revert r1.1235, "simplify final MAKEDEV call"

While MAKEDEV accepts multiple args, it complains loudly on repeated args.
It is silent when trying to create a single already existing device.
This is probably a bug in MAKEDEV.

Revision 1.1235 / (download) - annotate - [select for diffs], Sat Mar 25 18:27:28 2023 UTC (19 months ago) by kn
Branch: MAIN
Changes since 1.1234: +4 -8 lines
Diff to previous 1.1234 (colored)

simplify final MAKEDEV call

No need to loop here, the script takes multiple args.

OK tb afresh1

Revision 1.1234 / (download) - annotate - [select for diffs], Fri Mar 10 10:33:40 2023 UTC (19 months, 2 weeks ago) by kn
Branch: MAIN
CVS Tags: OPENBSD_7_3_BASE, OPENBSD_7_3
Changes since 1.1233: +10 -3 lines
Diff to previous 1.1233 (colored)

Fix error on installer abort/exit

^C during questiong yields
	/install: /tmp/cppid: cannot open $(<) input

The trap handler must first test existence, then read the PID file.
Quote like other PID file constructs in install.sub do.

Use newlines to make the trap function readable.

OK miod

Revision 1.1233 / (download) - annotate - [select for diffs], Thu Mar 9 19:49:57 2023 UTC (19 months, 2 weeks ago) by naddy
Branch: MAIN
Changes since 1.1232: +2 -2 lines
Diff to previous 1.1232 (colored)

remove obsolete libLLVM.so.[0-6].0 during upgrade

ok kn@ deraadt@

Revision 1.1232 / (download) - annotate - [select for diffs], Wed Mar 8 11:52:20 2023 UTC (19 months, 3 weeks ago) by kn
Branch: MAIN
Changes since 1.1231: +11 -9 lines
Diff to previous 1.1231 (colored)

Treat WEP like WPA:  only offer if supported

WEP does not work with our bwfm(4) and it shows:
    Which network interface do you wish to configure? (or 'done') [bse0] bwfm0
    ifconfig: SIOCS80211NWKEY: Operation not supported by device
    Access point? (ESSID, 'any', list# or '?') [any] 2
    Security protocol? (O)pen, (W)EP, WPA-(P)SK [O]

Handle the error and disable (W)EP unless the driver has it.

No objections from anyone.

Revision 1.1231 / (download) - annotate - [select for diffs], Tue Mar 7 17:29:42 2023 UTC (19 months, 3 weeks ago) by kn
Branch: MAIN
Changes since 1.1230: +56 -1 lines
Diff to previous 1.1230 (colored)

Initial support for guided disk encryption

One new question to cover the most common use case, such that manual setup
in (S)hell or '!' prior to install is no longer required:

    Encrypt the root disk? (disk, 'no' or '?' for details) [no] ?

    Create a passphrase protected CRYPTO softraid volume to be used as root disk.

    Available disks are: sd0.
    Encrypt the root disk? (disk, 'no' or '?' for details) [no]

Use of keydisk or different disciplines are not covered.
Only asked in interactive installations;  no autoinstall(8) or upgrades.
Only reachable on i386, amd64, sparc64 and riscv64 for now (arm64 WIP).

Tested by cheloha naddy and a few users
Feedback from cheloha deraadt claudio
OK cheloha
"get it in now" deraadt

Revision 1.1230 / (download) - annotate - [select for diffs], Tue Feb 21 12:56:50 2023 UTC (20 months ago) by kn
Branch: MAIN
Changes since 1.1229: +7 -7 lines
Diff to previous 1.1229 (colored)

Have disk and string list helpers print trailing newlins consistently

In practise, omitting \n is pointless in get_*devs*(), addel() and rmel()
as they are all all used in such a way that the shell always ensures a
trailing \n anyway.
(This might have been needed with the old recursive bsort(), but not now.)

The one exception being the case of a ramdisk with no disks, which revealed
\n mishandling in the root disk question where it ought to print "none"
instead of an empty list of available disks (since inception in r1.1114):
	Available disks are: .
	Which disk is the root disk? ('?' for details) ?

OK afresh1

Revision 1.1229 / (download) - annotate - [select for diffs], Sun Feb 19 23:46:22 2023 UTC (20 months, 1 week ago) by kn
Branch: MAIN
Changes since 1.1228: +2 -2 lines
Diff to previous 1.1228 (colored)

Improve media disk question default

Sets on an unmounted disk partition are most likely to be on install media,
e.g. CD or USB stick.

Default 'Which disk contains the install media?' to the first disk that is
a) not the root disk and b) not a disk with softraid chunks (hosting the
root disk, for example).

This makes it point at the right disk in most setups.
All disks remain valid answers, this is only about the default.

OK afresh1

Revision 1.1228 / (download) - annotate - [select for diffs], Thu Feb 16 18:10:28 2023 UTC (20 months, 1 week ago) by kn
Branch: MAIN
Changes since 1.1227: +12 -23 lines
Diff to previous 1.1227 (colored)

Rewrite bsort() from hand-rolled recursive to simpler iterative reusing code

ksh(1) can sort itself and addel() ensures uniqueness, so reuse both to get
a much simpler shell version of `sort -u' that is bug-for-bug compatible
with the old one but shorter and easier to tweak/reason about.

OK afresh1

Revision 1.1227 / (download) - annotate - [select for diffs], Thu Feb 9 10:38:41 2023 UTC (20 months, 2 weeks ago) by kn
Branch: MAIN
Changes since 1.1226: +4 -2 lines
Diff to previous 1.1226 (colored)

Do not ask to initialize disks with softraid chunks

Skip chunk devices in the 'Which disk do you wish to initialize?' question.
Touching sd0, e.g. after a root on softraid sd1 install on sd0, will fail.

get_dkdevs_uninitialized() is used once, in interactive installs, right
after root disk setup, iff multiple disks exist.

Tested as part of a bigger diff by a few
OK cheloha

Revision 1.1226 / (download) - annotate - [select for diffs], Fri Feb 3 15:28:04 2023 UTC (20 months, 3 weeks ago) by kn
Branch: MAIN
Changes since 1.1225: +8 -8 lines
Diff to previous 1.1225 (colored)

Define get_softraid_disks() before get_dkdevs*() so they can use it

Revision 1.1225 / (download) - annotate - [select for diffs], Fri Feb 3 14:18:56 2023 UTC (20 months, 3 weeks ago) by kn
Branch: MAIN
Changes since 1.1224: +6 -6 lines
Diff to previous 1.1224 (colored)

Make softraid helper return disk not device names

get_softraid_chunks() yields full device names with labels, e.g. "sd0a",
but the installer largely deals with disk names "sd0".

The only user of this, MAKEDEV, behaves identically with either form.

Rename to get_softraid_disks(), clarify comments and return disk names
so it can be reused without pattern matching or stripping labels.

OK afresh1

Revision 1.1224 / (download) - annotate - [select for diffs], Thu Feb 2 13:29:16 2023 UTC (20 months, 3 weeks ago) by kn
Branch: MAIN
Changes since 1.1223: +9 -2 lines
Diff to previous 1.1223 (colored)

Move existing softraid check into reusable function

No behaviour change, but get_softraid_chunks() reads much clearer.

The root disk is checked to be a softraid volume;  if so, devices for each
chunks are created to make installboot work later.

bioctl accepts "sd1" and "softraid0", the latter prints all volumes.
Output is identical if sd1 is the only volume.

OK afresh1

Revision 1.1223 / (download) - annotate - [select for diffs], Sat Jan 28 18:44:31 2023 UTC (20 months, 4 weeks ago) by phessler
Branch: MAIN
Changes since 1.1222: +3 -1 lines
Diff to previous 1.1222 (colored)

create enough wskbd* device nodes at runtime in the ramdisk so we can set
the keyboard layout on all of them during install.

tested with a Thinkpad X13s with a silly amount of kezboards connected.

OK miod@ kn@

Revision 1.1222 / (download) - annotate - [select for diffs], Wed Jan 18 10:30:20 2023 UTC (21 months, 1 week ago) by kn
Branch: MAIN
Changes since 1.1221: +2 -2 lines
Diff to previous 1.1221 (colored)

Typofix array length syntax, spotted by afresh1

Revision 1.1221 / (download) - annotate - [select for diffs], Tue Jan 17 16:22:56 2023 UTC (21 months, 1 week ago) by kn
Branch: MAIN
Changes since 1.1220: +4 -1 lines
Diff to previous 1.1220 (colored)

Add debug FUNCS_ONLY knob

Hacking on the installer while running it is a lot easier when you can
inspect or run functions directly without paging the whole script or
poking around in it with ed.

install.sub is already structured so that all functions come first,
then MD code, then actual commands.

Copy FUNCS_ONLY from rc.subr(8) so you can drop out any time and hack around
more conveniently:

	Available disks are: sd0 sd1.
	Which disk is the root disk? ('?' for details) [sd0] !
	Type 'exit' to return to install.
	test# FUNCS_ONLY=1 . /install.sub
	test# typeset -f get_dkdevs
	get_dkdevs() {
	    echo $(scan_disknames "${MDDKDEVS:-/^[sw]d[0-9][0-9]* /s/ .*//p}")
	}
	test# get_dkdevs
	sd0 sd1
	test#

This requires the sourcing shell to be ksh(1) or sh(1) with 'strict Bourne
shell mode' disabled.  '!' is ksh now, but the initial (S)hell answer still
lands in a strict (default) sh(1) -- that can/should be fixed separately.

OK deraadt

Revision 1.1220 / (download) - annotate - [select for diffs], Tue Jan 17 16:14:23 2023 UTC (21 months, 1 week ago) by kn
Branch: MAIN
Changes since 1.1219: +5 -1 lines
Diff to previous 1.1219 (colored)

Skip all interface config questions when there are none

Even without any interfaces the installer still asks for one and only
continues when the only possible answer 'done' is provided.

That means one mandatory but useless answer during installations like
	# vmctl start -c -d ./install72.img -d ./disk.img test
	...
	System hostname? (short form, e.g. 'foo') test

	Available network interfaces are:  .
	Network interface to configure? (name, lladdr, '?', or 'done')
	A response is required.
	Network interface to configure? (name, lladdr, '?', or 'done') ?
	Available network interfaces are:  .
	Network interface to configure? (name, lladdr, '?', or 'done') done
	DNS domain name? (e.g. 'example.com') [my.domain]
	...

Skip it when there is no viable answer:
	# vmctl start -c -d ./install72.img -d ./disk.img test
	...
	System hostname? (short form, e.g. 'foo') test

	DNS domain name? (e.g. 'example.com') [my.domain]
	...

OK deraadt

Revision 1.1219 / (download) - annotate - [select for diffs], Thu Jan 12 15:03:23 2023 UTC (21 months, 2 weeks ago) by kn
Branch: MAIN
Changes since 1.1218: +2 -2 lines
Diff to previous 1.1218 (colored)

On '!', drop into a proper ksh(1) instead of a limited sh(1) lacking
arithmetic expression `(( ... ))' and more.

OK deraadt

Revision 1.1218 / (download) - annotate - [select for diffs], Fri Dec 23 00:40:58 2022 UTC (22 months ago) by afresh1
Branch: MAIN
Changes since 1.1217: +54 -8 lines
Diff to previous 1.1217 (colored)

Allow configuring interfaces by lladdr in installer

This modifies the installer question, auto install scripts may need updating.

Allows answering ? to the interface question to list allowed lladdrs
and allows answering with one of them to configure the interface.
Reconfiguring by either name/unit or lladdr will clear the previous config.

Many suggestions from kn@
finish it @deraadt

Revision 1.1217 / (download) - annotate - [select for diffs], Fri Dec 16 17:47:34 2022 UTC (22 months, 1 week ago) by tb
Branch: MAIN
Changes since 1.1216: +4 -4 lines
Diff to previous 1.1216 (colored)

drop a total of 93 trailing spaces from three lines

Revision 1.1216 / (download) - annotate - [select for diffs], Fri Dec 16 04:04:25 2022 UTC (22 months, 1 week ago) by afresh1
Branch: MAIN
Changes since 1.1215: +20 -6 lines
Diff to previous 1.1215 (colored)

Prioritize lladdr over name/unit in hostname.if processing

When needed, lladdr is more precise and enduring.

Suggested by deraadt@
Many improvments and OK kn@

Revision 1.1215 / (download) - annotate - [select for diffs], Mon Dec 5 20:12:00 2022 UTC (22 months, 3 weeks ago) by afresh1
Branch: MAIN
Changes since 1.1214: +10 -1 lines
Diff to previous 1.1214 (colored)

Add support configuring hostname.if(5) by lladdr

Original implementation by martijn@
Feedback and suggestions from kn@, sthen@, claudio@, florian@, and deraadt@.

ok deraadt

Revision 1.1214 / (download) - annotate - [select for diffs], Sun Nov 6 21:32:54 2022 UTC (23 months, 3 weeks ago) by kn
Branch: MAIN
Changes since 1.1213: +6 -3 lines
Diff to previous 1.1213 (colored)

Skip MD post-install bits on upgrades

Upgrades are noiser on macppc (and loongson and octeon) than on other
architectures because boot firmware changes and/or tips to complete an
OpenBSD installation are always printed, even though they are not needed
after an upgrade.

OK deraadt

Revision 1.1213 / (download) - annotate - [select for diffs], Wed Oct 19 08:24:14 2022 UTC (2 years ago) by kn
Branch: MAIN
Changes since 1.1212: +14 -15 lines
Diff to previous 1.1212 (colored)

Get rid of useless/confusing subshell

Other function, same stuff like r1.1210 except here there `>/dev/null 2>&1'
hammer is required to silence the ls(1) test.

The make_dev() call is no longer silenced now but does not print on stdout
anyway;  if making the device fails we'd like to know.

Otherwise if probing the disk fails it continues to be silenced.

(cvs diff -w -U1)
	|@@ -2311,3 +2311,2 @@ is_rootdisk() {
	|
	|-	(
	| 		make_dev $_d
	|@@ -2322,6 +2321,6 @@ is_rootdisk() {
	| 			umount /mnt
	|-		fi
	|+	fi >/dev/null 2>&1
	| 		rm -f /dev/{r,}$_d?
	|+
	| 		return $_rc
	|-	) >/dev/null 2>&1
	| }

OK halex

Revision 1.1212 / (download) - annotate - [select for diffs], Sun Oct 16 08:47:20 2022 UTC (2 years ago) by kn
Branch: MAIN
Changes since 1.1211: +2 -2 lines
Diff to previous 1.1211 (colored)

Leave installurl handling to syspatch(8)

When upgrading to releases, the installer fills rc.firsttime(8) with
a syspatch(8) snippet possibly displaying available patches.

That snippet itself checks for a release version as well as an existent
installurl(5) file as a precondition for syspatch, see the diff below.

syspatch, however, has code to fallback to cdn.o.o without a valid URL:

286	_MIRROR=$(while read _line; do _line=${_line%%#*}; [[ -n ${_line} ]] &&
287		print -r -- "${_line}"; done </etc/installurl | tail -1) 2>/dev/null
288	[[ ${_MIRROR} == @(file|ftp|http|https)://* ]] ||
289		_MIRROR=https://cdn.openbsd.org/pub/OpenBSD
290	_MIRROR="${_MIRROR}/syspatch/${_KERNV[0]}/$(machine)"


Furthermore, the installer actively sets a working URL if needed, in the
same finish_up() function shortly before placing the syspatch snippet:

2842	# Create /etc/installurl if it does not yet exist.
2843	if [[ ! -f /mnt/etc/installurl ]]; then
2844		echo "${INSTALL_URL:-https://cdn.openbsd.org/pub/OpenBSD}" \
2845			>/mnt/etc/installurl
2846	fi

So one of the following is true for installurl:
1. exists but has no valid URL, then syspatch falls back to cdn.o.o
2. exists and has a  valid URL, then syspatch uses that
3. does not exist so the installer creates it with cdn.o.o, see 2.

In the unlikely case that the install/upgrade finishes, i.e. installurl
does exist, but gets removed or truncated before rc.firsttime runs, the
existing check would actually prevent syspatch from running even though
it copes with such files.

So just remove the useless check.

OK aja

Revision 1.1211 / (download) - annotate - [select for diffs], Mon Oct 10 11:04:17 2022 UTC (2 years ago) by kn
Branch: MAIN
Changes since 1.1210: +3 -3 lines
Diff to previous 1.1210 (colored)

Discard stdout/err only where needed in check_unattendedupgrade()

We should be fine silencing only the test condition which produces legit
output and warnings.

All else produces no output and should not error out;  if it does, those
warnings should be printed and fixed.

Feedback OK halex

Revision 1.1210 / (download) - annotate - [select for diffs], Wed Oct 5 19:30:47 2022 UTC (2 years ago) by kn
Branch: MAIN
Changes since 1.1209: +13 -14 lines
Diff to previous 1.1209 (colored)

Get rid of useless/confusing subshell

This function's style is a bit off:  it wraps the body in a subshell to
discard all stdout/err at once, but still uses return inside it.

1. A command list (using {}) would be enough here as it groups like a
   subshell but avoids spawning another shell;
2. discarding stdout/err at the end of an if block works the same
   (effecting both condition and body) and saves one level of indent;
3. return inside a subshell inside a function does NOT return from the
   function but merely exits the subshell;  this is easily misread.

Saving a fork and indent and improving readability boils down to this
(cvs diff -wU1):

	|@@ -3320,3 +3317,2 @@ check_unattendedupgrade() {
	| 	_d=${_d%% *}
	|-	(
	| 		if [[ -n $_d ]]; then
	|@@ -3331,5 +3327,5 @@ check_unattendedupgrade() {
	| 			rm -f /dev/{r,}$_d?
	|-		fi
	|+	fi >/dev/null 2>&1
	|+
	| 		return $_rc
	|-	) > /dev/null 2>&1
	| }

OK halex

Revision 1.1209 / (download) - annotate - [select for diffs], Tue Oct 4 19:59:10 2022 UTC (2 years ago) by kn
Branch: MAIN
Changes since 1.1208: +5 -7 lines
Diff to previous 1.1208 (colored)

Replace temporary file with variable

On supported -release systems, syspatch(8) -c is run from rc.firsttime(8)
and the list of patches it pretty-printed if non-empty.

-c output fits into a shell variable, not needing a temporary file, which
is also what usr.sbin/syspatch/syspatch.sh does internally.

OK millert

Revision 1.1208 / (download) - annotate - [select for diffs], Tue Oct 4 19:34:44 2022 UTC (2 years ago) by kn
Branch: MAIN
Changes since 1.1207: +5 -5 lines
Diff to previous 1.1207 (colored)

sh(1) is not make(1), use newlines inside double quotes

sh(1) happily accepts newlines inside double quotes just like in scripts:

        $ sh -c "echo foo
	echo bar"
	foo
	bar

So no need to squash things into a single line as usually done inside make
targets where each makefile line is considered its own script unless
continued with trailing backslashes.

OK millert

Revision 1.1207 / (download) - annotate - [select for diffs], Tue Sep 27 12:28:25 2022 UTC (2 years, 1 month ago) by kn
Branch: MAIN
Changes since 1.1206: +11 -11 lines
Diff to previous 1.1206 (colored)

Avoid escaping inside here documents

The delimiter can be quoted (single or double) to disable parameter, command
and arithmetic expansion inside the here document:

	$ cat <<__EOT
	echo $(echo foo)
	__EOT
	echo foo

	$ cat <<'__EOT'
	echo $(echo foo)
	__EOT
	echo $(echo foo)

Do the latter to be able to write the here document/file content exactly as
it would end up in output/rc.firsttime, making it easier to read.

To be more consistent and explicit, switch the remaining here documents with
pure plain text (no shell expansion, etc.) to quoted delimiters.

OK millert

Revision 1.1206 / (download) - annotate - [select for diffs], Tue Sep 27 12:22:29 2022 UTC (2 years, 1 month ago) by kn
Branch: MAIN
Changes since 1.1205: +2 -3 lines
Diff to previous 1.1205 (colored)

simpler ftplist[0-9].o.o removal

We read /tmp/i/hosts line-wise to fill /mnt/etc/hosts and remove the tmp
file immediately afterwards, so just skip ftplist entries inside the loop
with a slightly easier to read ksh pattern rather than purge the tmp file
up-front with sed(1).

This is also a tiny bit more robust should the ftplist entries ever be added
with a tab as separator instead of a space and/or an alias since the sed
one-liner hardcodes a single space and expects no alias whereas ksh's read
takes any amount of whitespace between _addr and _hn while not caring about
optional aliases.

Comment is obvious so zap it.

OK millert

Revision 1.1205 / (download) - annotate - [select for diffs], Mon Sep 19 15:40:36 2022 UTC (2 years, 1 month ago) by florian
Branch: MAIN
CVS Tags: OPENBSD_7_2_BASE, OPENBSD_7_2
Changes since 1.1204: +4 -5 lines
Diff to previous 1.1204 (colored)

Symlink chosen time zone file to /etc/localtime so that we don't need
to use a time zone path that's not relative to /usr/share/zoneinfo.
Hopefully we can limit tzset(3) to only look at zone info files in
/usr/share/zoneinfo, soon.
OK millert, deraadt

Revision 1.1204 / (download) - annotate - [select for diffs], Tue Aug 23 16:08:09 2022 UTC (2 years, 2 months ago) by kn
Branch: MAIN
Changes since 1.1203: +1 -6 lines
Diff to previous 1.1203 (colored)

Remove unused partition type patterns from disk_has() helper

softraid(4) patterns were never used since import in 2015
and only one out of APFS patterns are used.

Feedback on APFS krw
OK krw

Revision 1.1203 / (download) - annotate - [select for diffs], Tue Jul 26 00:38:42 2022 UTC (2 years, 3 months ago) by kn
Branch: MAIN
Changes since 1.1202: +3 -3 lines
Diff to previous 1.1202 (colored)

Zap unused bridge command skipping

netstart(8) lost bridge specific functionality in 2009.

	$ grep bridge /etc/netstart
	# interfaces (or bridges), add default routes and return.

This is dead unreached code.

OK deraadt
CVt: ----------------------------------------------------------------------

Revision 1.1202 / (download) - annotate - [select for diffs], Tue Jun 28 12:10:08 2022 UTC (2 years, 4 months ago) by sthen
Branch: MAIN
Changes since 1.1201: +4 -3 lines
Diff to previous 1.1201 (colored)

Don't ask the vlan question unless another network interface exists. ok deraadt

Avoids a confusing question when no supported network devices is found, i.e.

"Available network interfaces are: vlan0.
Which network interface do you wish to configure? (or 'done') [vlan0]"

Revision 1.1201 / (download) - annotate - [select for diffs], Mon Jun 27 13:48:38 2022 UTC (2 years, 4 months ago) by deraadt
Branch: MAIN
Changes since 1.1200: +2 -2 lines
Diff to previous 1.1200 (colored)

install script no longer creates a dhclient.conf under any circumstances,
so we do not need to copy it to the new system.

Revision 1.1200 / (download) - annotate - [select for diffs], Mon Jun 27 11:01:41 2022 UTC (2 years, 4 months ago) by sthen
Branch: MAIN
Changes since 1.1199: +19 -19 lines
Diff to previous 1.1199 (colored)

Move rc.firsttime additions before some slower jobs run from install.sub.
Reduces the risk of post-upgrade steps (sysmerge -b etc) being missed if
there was some issue with those jobs e.g. fw_update or reorder_kernel
triggering watchdog or an impatient admin to reboot the system. ok florian@

Revision 1.1199 / (download) - annotate - [select for diffs], Mon May 16 00:27:46 2022 UTC (2 years, 5 months ago) by deraadt
Branch: MAIN
Changes since 1.1198: +2 -2 lines
Diff to previous 1.1198 (colored)

use a safer idiom for reading pid from file before killing
pointed out by kn, tested in snaps for a week

Revision 1.1198 / (download) - annotate - [select for diffs], Mon May 9 22:43:57 2022 UTC (2 years, 5 months ago) by deraadt
Branch: MAIN
Changes since 1.1197: +1 -2 lines
Diff to previous 1.1197 (colored)

delete ftplist2 (the old ftplist IP address). We've talked loudly about a
more distributed way of doing something smart and failovery, but this
annotation in the script isn't helping.

Revision 1.1197 / (download) - annotate - [select for diffs], Mon May 9 22:42:53 2022 UTC (2 years, 5 months ago) by deraadt
Branch: MAIN
Changes since 1.1196: +35 -17 lines
Diff to previous 1.1196 (colored)

In a couple places, use set -m to cause subshells to gain process
groups, and then kill the process group instead of the ksh pid. Some
of these processes contain sleep, which kept running, and in some
cases retained stderr (or other fd) and confused parent processes.
In some cases, add manual wait.  Finally, store the pid (nee pgrp)
in /tmp/xxpid files rather than variables, since there is a bit
of recursion and sub-shell confusion happening, and we have confused
ourselves at least twice with these pid variables not being in scope.
ok beck, with florian, ok kn
In snaps for almost a week.  A few more tweaks may come in a while.

Revision 1.1196 / (download) - annotate - [select for diffs], Thu May 5 20:07:23 2022 UTC (2 years, 5 months ago) by florian
Branch: MAIN
Changes since 1.1195: +13 -12 lines
Diff to previous 1.1195 (colored)

Fix watchdog in the installer.

We only had one watchdog running that triggered after 30 minutes. If
an unattended upgrade (e.g. started by sysupgrade(8)) took longer than
this in total, the machine would reboot half way through an upgrade.
The intention was that the watchdog would be reset after each set
download and after each set installation. But this never worked
correctly because the actual upgrade ran in a sub-shell and WDPID was
not visible.
To fix this we first need to export WDPID to make it visible in the
sub-shell. Then reset_watchdog was guarded by $UU && reset_watchdog,
but UU wasn't visible either. But we can't export it because we would
enter a loop. We can just use the fact that WDPID is not empty to
restart the watchdog.
Lastly the watchdog process would keep stderr and stdout open. This
made the tee(1) hang that is collecting the autoupgrade log that is
mailed to root.
As a simplification, we don't need to run the watchdog as a
co-process, we don't want to communicate with it, we can just run it
in the background.
Problem reported by stsp
With & OK deraadt
OK millert

Revision 1.1195 / (download) - annotate - [select for diffs], Tue May 3 11:48:47 2022 UTC (2 years, 5 months ago) by krw
Branch: MAIN
Changes since 1.1194: +2 -2 lines
Diff to previous 1.1194 (colored)

Rework display of partition types, removing unnecessary trailing
blanks in the arrays of type names, simplifying the code and
making better use of printf().

Along the way discover that "APFS Recovery" fits, so nuke the
annoying "AFPS Recovry" contraction.

No intentional functional change.

Some "APFS Recovery" nits pointed out by jsg@

Revision 1.1194 / (download) - annotate - [select for diffs], Fri Apr 22 17:25:10 2022 UTC (2 years, 6 months ago) by deraadt
Branch: MAIN
Changes since 1.1193: +3 -3 lines
Diff to previous 1.1193 (colored)

checking for /mnt and /root in is_rootdisk() is excessively zealous,
the remaining directory list is good enough
ok sthen

Revision 1.1193 / (download) - annotate - [select for diffs], Mon Mar 28 18:53:40 2022 UTC (2 years, 7 months ago) by kettenis
Branch: MAIN
CVS Tags: OPENBSD_7_1_BASE, OPENBSD_7_1
Changes since 1.1192: +3 -2 lines
Diff to previous 1.1192 (colored)

Running getty(8) on /dev/console when using a glass console interferes with
running Xorg in a way that isn't fully understood.  So change the arm64
install.md to munge /etc/ttys to enable the ttyC0 entry if we detect that
wsdisplay0 is the console and make sure the code in install.sub that
does the actual munging disables the console entry before enabling another
entry to prevent running two getty(8) processes on (effectively) the same
device.

ok deraadt@

Revision 1.1192 / (download) - annotate - [select for diffs], Sun Feb 6 11:29:18 2022 UTC (2 years, 8 months ago) by visa
Branch: MAIN
Changes since 1.1191: +2 -1 lines
Diff to previous 1.1191 (colored)

Allow installation on a disk with a GPT.

OK krw@

Revision 1.1191 / (download) - annotate - [select for diffs], Sat Jan 29 20:17:58 2022 UTC (2 years, 8 months ago) by deraadt
Branch: MAIN
Changes since 1.1190: +8 -7 lines
Diff to previous 1.1190 (colored)

ftplist management moves to a different IP.  It would be nice if this
could operate in parallel to a few different IPs, but such code has
not been written yet.

Revision 1.1190 / (download) - annotate - [select for diffs], Sun Jan 16 04:43:34 2022 UTC (2 years, 9 months ago) by jsg
Branch: MAIN
Changes since 1.1189: +3 -3 lines
Diff to previous 1.1189 (colored)

spelling

Revision 1.1189 / (download) - annotate - [select for diffs], Tue Jan 11 00:58:32 2022 UTC (2 years, 9 months ago) by deraadt
Branch: MAIN
Changes since 1.1188: +7 -1 lines
Diff to previous 1.1188 (colored)

If the install media contains non-free /*firmware*.tgz files, use fw_update
to install them.  This lets users usb-lift firmware on a preloaded install70.img
image like this:
    # vnconfig install70.img
    vnd0
    # (mount /dev/vnd0a /mnt && cd /mnt && fw_update -F iwm iwx iwn intel)
    # umount /mnt && vnconfig -u vnd0
The firmwares are installed after the sets, then all network drivers are
re-configured in the hope that new firmwares have showed up.  The install
script continues to attempt a network firmware install, which might pull/update
additional firmwares.
work done with afresh1

Revision 1.1188 / (download) - annotate - [select for diffs], Tue Jan 11 00:48:45 2022 UTC (2 years, 9 months ago) by deraadt
Branch: MAIN
Changes since 1.1187: +23 -17 lines
Diff to previous 1.1187 (colored)

Split 2nd half of enable_network() into a sub-function enable_ifs().
This is the piece which loops over hostname.* files and runs ifconfig
like the inner loop of base /etc/netstart

Revision 1.1187 / (download) - annotate - [select for diffs], Wed Jan 5 16:35:35 2022 UTC (2 years, 9 months ago) by deraadt
Branch: MAIN
Changes since 1.1186: +4 -2 lines
Diff to previous 1.1186 (colored)

Use new shell-based fw_update(8)
with afresh1

Revision 1.1186 / (download) - annotate - [select for diffs], Tue Dec 7 04:13:22 2021 UTC (2 years, 10 months ago) by deraadt
Branch: MAIN
Changes since 1.1185: +3 -3 lines
Diff to previous 1.1185 (colored)

Two of the umount -f are not neccessary, and only risk leaving
filesystems in bad shape.  The other -f are special, and I haven't
though through them yet.
discussed with florian and tb a while back

Revision 1.1185 / (download) - annotate - [select for diffs], Thu Dec 2 17:18:39 2021 UTC (2 years, 10 months ago) by deraadt
Branch: MAIN
Changes since 1.1184: +7 -5 lines
Diff to previous 1.1184 (colored)

unmount real root partition from /mnt before the cgi/random actions
which run asyncronously and can grab vnodes race to make the umount fail
spuriously
problem seen and diagnosed by Yuichiro NAITO
ok florian

Revision 1.1184 / (download) - annotate - [select for diffs], Tue Nov 2 16:54:01 2021 UTC (2 years, 11 months ago) by kn
Branch: MAIN
Changes since 1.1183: +28 -7 lines
Diff to previous 1.1183 (colored)

Remove "!" escape handling from WEP/WPA passphrase questions

Answering any question (except user password prompts) with "!" drops to
the shell ("!foo" executes "foo" immediately), but this is an obviously
bad idea for the wifi passphrase questions in case the magic words start
with... an "!":

	WPA passphrase? (will echo) !2345678
	/install: 2345678: not found
	WPA passphrase? (will echo)

Adapt the existing password prompt code into a new self-contained
ask_passphrase() which prompts only once and echos its input (like the
passphrase question has been doing all the time), doing no input parsing
whatsoever (as with user passwords):

	WPA passphrase? (will echo) !2345678
	IPv4 address for bwfm0? (or 'autoconf' or 'none') [autoconf]

Reported by Pasi-Pekka Karppinen <ppkarppi AT icloud DOT com>, thanks!
Feedback tb (wifi passphrases should still be printed)
OK deraadt

Revision 1.1183 / (download) - annotate - [select for diffs], Sun Oct 24 12:32:42 2021 UTC (3 years ago) by kn
Branch: MAIN
Changes since 1.1182: +7 -7 lines
Diff to previous 1.1182 (colored)

Use ifconfig(8)'s "join" command by default

Its adoption went quite well, so install "join" rather than the old "nwid"
in new hostname.if(5) files and follow this trend in our wifi manuals.

OK deraadt sthen

Revision 1.1182 / (download) - annotate - [select for diffs], Sun Oct 24 10:11:24 2021 UTC (3 years ago) by kn
Branch: MAIN
Changes since 1.1181: +2 -3 lines
Diff to previous 1.1181 (colored)

Fall back to HTTP for fetching automatically

Drop the "Unable to connect using https. Use http instead?" question as it
does not provide any security benefit;  SHA256.sig is used to verify sets.

Do provide an informative message iff the fallback happened such that
installations/upgrades that cannot Get/Verify first but Install directly
can be aborted in lack of SHA256.sig, i.e. sets were fetched over HTTP and
verification would be skipped.

Discussed with deraadt tb
OK deraadt

Revision 1.1181 / (download) - annotate - [select for diffs], Sat Oct 23 14:49:06 2021 UTC (3 years ago) by kn
Branch: MAIN
Changes since 1.1180: +3 -3 lines
Diff to previous 1.1180 (colored)

dhclient -> dhcp in comment

Revision 1.1180 / (download) - annotate - [select for diffs], Sun Oct 17 13:20:46 2021 UTC (3 years ago) by kn
Branch: MAIN
Changes since 1.1179: +2 -2 lines
Diff to previous 1.1179 (colored)

Disambiguate "autoconf" handling now that it is used for IPv4 as well

This was the last mention of "dhcp" in our manuals except for
hostname.if(5) documenting it as an "inet autoconf" alias;  everything has
been converted to modern syntax now (hopefully).

OK jmc

Revision 1.1179 / (download) - annotate - [select for diffs], Sun Oct 17 02:05:40 2021 UTC (3 years ago) by kn
Branch: MAIN
Changes since 1.1178: +2 -2 lines
Diff to previous 1.1178 (colored)

Install "autoconf" as proper "inet autoconf" in hostname.if(5) files

OK aja

Revision 1.1178 / (download) - annotate - [select for diffs], Mon Sep 13 11:49:21 2021 UTC (3 years, 1 month ago) by robert
Branch: MAIN
CVS Tags: OPENBSD_7_0_BASE, OPENBSD_7_0
Changes since 1.1177: +5 -2 lines
Diff to previous 1.1177 (colored)

introduce /etc/bsd.re-config which can be used to configure the kernel
using config(8);

the contents of this configuration file will be fed to config(8) after
kernel relinking is done, so on the next boot the new kernel will have
all the configuration changes set by the user

this comes handy if you still want to use KARL while making changes
to the GENERIC kernel

diff from Paul de Weerd with input from several developers

Revision 1.1177 / (download) - annotate - [select for diffs], Mon Sep 13 05:17:04 2021 UTC (3 years, 1 month ago) by robert
Branch: MAIN
Changes since 1.1176: +2 -2 lines
Diff to previous 1.1176 (colored)

check the installer's /tmp/i/hostname.* files for a configured IP address
so that configurations without a broadcast address are detected as well

ok sthen@

Revision 1.1176 / (download) - annotate - [select for diffs], Wed Sep 8 13:16:53 2021 UTC (3 years, 1 month ago) by kn
Branch: MAIN
Changes since 1.1175: +28 -11 lines
Diff to previous 1.1175 (colored)

Backout "Merge sysupgrade watchdog and prompt timeout code"
(commitid 0SH0ijktpPPcSctj)

"/autoinstall[2697]: start_timeout: not found" during non-interactive
upgrade, e.g. sysupgrade(8).

Reported by Joel Carnat <joel at carnat dot net>, thanks.

Revision 1.1175 / (download) - annotate - [select for diffs], Sun Aug 29 13:31:52 2021 UTC (3 years, 1 month ago) by kn
Branch: MAIN
Changes since 1.1174: +8 -24 lines
Diff to previous 1.1174 (colored)

Merge sysupgrade watchdog and prompt timeout code

Provide TIMOUT_{ACTION,PERIOD_SEC} in {start,stop,reset}_timeout() to have
install.sub and dot.profile use the same mnemonic helpers.

Revision 1.1174 / (download) - annotate - [select for diffs], Sun Aug 29 13:05:43 2021 UTC (3 years, 1 month ago) by kn
Branch: MAIN
Changes since 1.1173: +3 -4 lines
Diff to previous 1.1173 (colored)

Stop parsing unsupported dhcp-options(5)

dhcpleased(8) does not support everything dhclient(8) did,
so stop pretending.

OK florian

Revision 1.1173 / (download) - annotate - [select for diffs], Tue Aug 24 21:50:09 2021 UTC (3 years, 2 months ago) by bluhm
Branch: MAIN
Changes since 1.1172: +4 -3 lines
Diff to previous 1.1172 (colored)

Fix automatic upgrade after fetching response file with dhcp.

When the auto upgrader tried to fetch the sets, sometimes ftp did
not find any.  The interface was down and had no address.  As
autoconf was not cleared, the upgrade's static netstart and dhcpleased
both tried to configure the interface, which cannot work.

Disable dhcp with "ifconfig inet -autoconf" in get_responsefile()
after it is not used anymore.

OK florian@

Revision 1.1172 / (download) - annotate - [select for diffs], Mon Aug 9 13:56:17 2021 UTC (3 years, 2 months ago) by sthen
Branch: MAIN
Changes since 1.1171: +6 -1 lines
Diff to previous 1.1171 (colored)

handle "inet autoconf" in ramdisk, same as /etc/netstart
ok florian deraadt

Revision 1.1171 / (download) - annotate - [select for diffs], Fri Aug 6 07:06:34 2021 UTC (3 years, 2 months ago) by sthen
Branch: MAIN
Changes since 1.1170: +4 -4 lines
Diff to previous 1.1170 (colored)

As tim@ spotted, a use of V4_AUTOCONF crept in when the variable name
was actually V4_DHCPCONF from previous use. Rename all of the V4_DHCPCONF
to V4_AUTOCONF so everything uses the new name. ok and reminder about
the installer from tb@

Revision 1.1170 / (download) - annotate - [select for diffs], Mon Aug 2 01:29:26 2021 UTC (3 years, 2 months ago) by kn
Branch: MAIN
Changes since 1.1169: +8 -2 lines
Diff to previous 1.1169 (colored)

Leave resolv.conf to resolvd if it learned nameservers

During install (not upgrade) the installer parses resolv.conf looking for
nameservers, FQDN and domain information;  it also prompts for nameservers
if none were found.

If DHCP is used and nameservers were found, resolv.conf gets recreated from
scratch.

Under dhclient(8) this was fine, but resolvd(8) persists learned proposals
across such file modifications and resolv.conf will thus contain a mix
between managed and manual entries -- stale duplicates which users have to
remove manually.

Do not touch resolv.conf anymore in case resolvd knows better and thus
provide a clean file for installations.

OK florian

Revision 1.1169 / (download) - annotate - [select for diffs], Tue Jul 20 11:20:09 2021 UTC (3 years, 3 months ago) by kn
Branch: MAIN
Changes since 1.1168: +8 -9 lines
Diff to previous 1.1168 (colored)

Simplify DHCP lease file parer after switch to dhcpleased

dhcpleased(8)'s lease files are much simpler than dhclient.leases(5):
- exactly one lease per file (not many)
- only option lines (not statement, declaration, etc.)
- every option/value is separated by a single ": " (no optional leading
  "option ")
- values are not quoted or escaped (like dhclient does)

lease_value() is hard to read, mostly because it strips optional double
quotes around option values as was required with dhclient.

dhclient VIS_ALL's values if they contain backticks, backslashes and
other characters, otherwise it VIS_SAFE's (and optionally quotes them).

dhcpleased VIS_SAFE's all value strings equally.

All install.sub users of lease_value() quote its output so they should
be safe without any special unescaping as previously done.

OK florian

Revision 1.1168 / (download) - annotate - [select for diffs], Sun Jul 18 15:18:49 2021 UTC (3 years, 3 months ago) by deraadt
Branch: MAIN
Changes since 1.1167: +14 -20 lines
Diff to previous 1.1167 (colored)

Remove hackery around /tmp/i/resolv.conf*.  In particular "lookup file bind"
is required because of TLS servername for contacting ftp.openbsd.org, and
there is no point doing that in resolv.conf.tail because it is no longer used.
ok florian kn

Revision 1.1167 / (download) - annotate - [select for diffs], Fri Jul 16 15:25:31 2021 UTC (3 years, 3 months ago) by florian
Branch: MAIN
Changes since 1.1166: +25 -41 lines
Diff to previous 1.1166 (colored)

Switch from dhclient to dhcpleased in the installer.
More cleanup is needed from a real ksh hacker, but looks already
pretty good to kn.

OK deraadt

Revision 1.1166 / (download) - annotate - [select for diffs], Mon Jul 5 13:56:24 2021 UTC (3 years, 3 months ago) by jca
Branch: MAIN
Changes since 1.1165: +4 -4 lines
Diff to previous 1.1165 (colored)

Don't use a non-standard empty statement in while loops

Empty statements accepted by ksh(1) pointed out by millert@, use of this
non-standard grammar in the installer pointed out by halex@.
ok halex@ millert@

Revision 1.1165 / (download) - annotate - [select for diffs], Thu Jun 3 15:05:55 2021 UTC (3 years, 4 months ago) by krw
Branch: MAIN
Changes since 1.1164: +4 -1 lines
Diff to previous 1.1164 (colored)

Recognize the Apple APFS GPT partition types seen on Apple M1 boxen.

ok kettenis@

Revision 1.1164 / (download) - annotate - [select for diffs], Mon May 3 11:34:55 2021 UTC (3 years, 5 months ago) by sthen
Branch: MAIN
Changes since 1.1163: +2 -1 lines
Diff to previous 1.1163 (colored)

remove old gcc/g++ binaries at update time; covers the most common case
where people will run into problems on amd64 now we don't build gcc.
(the gcc-lib files are already removed by bsd.rd upgrades, and gcc/g++
don't work without them).

Revision 1.1163 / (download) - annotate - [select for diffs], Fri Mar 19 23:52:55 2021 UTC (3 years, 7 months ago) by kn
Branch: MAIN
CVS Tags: OPENBSD_6_9_BASE, OPENBSD_6_9
Changes since 1.1162: +2 -2 lines
Diff to previous 1.1162 (colored)

Remove libLLVM.so.2.0 on upgrade

It is over a year old and corresponds to LLVM 8.0.0 after the
"-msvr4-struct-return" ABI change;  saves 47M (on amd64).

OK deraadt

Revision 1.1162 / (download) - annotate - [select for diffs], Fri Mar 12 11:32:03 2021 UTC (3 years, 7 months ago) by kn
Branch: MAIN
Changes since 1.1161: +9 -1 lines
Diff to previous 1.1161 (colored)

Emulate "[inet] autoconf" hostname.if(5) lines with "dhcp"

With dhcpleased(8) in base, netstart(8) and ifconfig(8) understand both
"autoconf" and "inet autoconf" lines in hostname.if(5) files to signal the
new daemon.

The installer however currently has only dhclient(8), hence manual upgrades
with "[inet] autoconf" instead of "dhcp" in hostname.if files would fail to
establish IPv4 connectivity.

Make install.sub's netstart clone treat autoconf lines like old fashioned
dhcp lines such users^Wearly testers of the new approach don't get stuck in
nyetwork land.

Note that this is only relevant for manual upgrades;  installation always
creates working hostname.if files and automated upgrades with sysupgrade(8)
do not care about network/hostname.if files.

Idea from deraadt
OK deraadt krw ajacoutot

Revision 1.1161 / (download) - annotate - [select for diffs], Sat Jan 30 18:21:06 2021 UTC (3 years, 8 months ago) by krw
Branch: MAIN
Changes since 1.1160: +2 -2 lines
Diff to previous 1.1160 (colored)

Add dhclient.conf back to list of "installed network configuration
files during upgrade".

Mistakenly removed during dhclient.conf cleanup of r1.1050.

Revision 1.1160 / (download) - annotate - [select for diffs], Wed Dec 23 17:22:07 2020 UTC (3 years, 10 months ago) by krw
Branch: MAIN
Changes since 1.1159: +16 -5 lines
Diff to previous 1.1159 (colored)

Allow the provision of dhclient(8) options on 'dhcp' lines in hostname.if(5)
files.

Usual man page help & ok jmc@

Revision 1.1159 / (download) - annotate - [select for diffs], Mon Dec 21 16:52:49 2020 UTC (3 years, 10 months ago) by krw
Branch: MAIN
Changes since 1.1158: +4 -3 lines
Diff to previous 1.1158 (colored)

Avoid issuing pointless 'ifconfig <if> up' when processing 'dhcp' in
hostname.if files. dhclient(8) does that itself. Part of the
"further script optimizations" promised in r1.200 of netstart.

Tested & ok gnezdo@

Revision 1.1158 / (download) - annotate - [select for diffs], Fri Dec 11 12:34:11 2020 UTC (3 years, 10 months ago) by bluhm
Branch: MAIN
Changes since 1.1157: +28 -1 lines
Diff to previous 1.1157 (colored)

There is a race in dhclient(8) privsep.  The parent process may
return before the interface address and route are set in the kernel.
The auto installer script runs a ftp(1) command immediatelty after
that, it fails without a local address.  Before calling ftp, wait
until the address appears in ifconfig(8) output and dhclient leases
file.  This makes autoinstall more reliable.
discussed with patrick@; input and OK krw@

Revision 1.1157 / (download) - annotate - [select for diffs], Sun Nov 29 20:54:33 2020 UTC (3 years, 10 months ago) by tb
Branch: MAIN
Changes since 1.1156: +15 -7 lines
Diff to previous 1.1156 (colored)

Fix previous: use correct version of netstart and installer bits.

Revision 1.1156 / (download) - annotate - [select for diffs], Sun Nov 29 20:14:06 2020 UTC (3 years, 10 months ago) by deraadt
Branch: MAIN
Changes since 1.1155: +10 -9 lines
Diff to previous 1.1155 (colored)

Add support for !command to mygate, so that netstart has a late opportunity
to perform network configuration (for example, "!route source -ifp em0")
Split mygate and myname manual pages (how did anyone ever believe these
are related), and perform hostname configuration much earlier in rc.
discussed with benno, claudio, jmc, etc etc, last version of !command
parser by tb

Revision 1.1155 / (download) - annotate - [select for diffs], Tue Sep 22 15:38:59 2020 UTC (4 years, 1 month ago) by florian
Branch: MAIN
CVS Tags: OPENBSD_6_8_BASE, OPENBSD_6_8
Changes since 1.1154: +7 -2 lines
Diff to previous 1.1154 (colored)

When doing unattended upgrade (i.e. sysupgrade(8)) on systems with
multiple root disks, do the upgrade on the one with auto_upgrade.conf
present.
use case pointed out by, test & OK kettenis

Revision 1.1154 / (download) - annotate - [select for diffs], Tue May 26 16:21:00 2020 UTC (4 years, 5 months ago) by florian
Branch: MAIN
Changes since 1.1153: +3 -27 lines
Diff to previous 1.1153 (colored)

In the first version of sysupgrade(8) I made the mistake of generating
auto_upgrade.conf in bsd.rd instead of sysupgrade(8) itself.
ajacoutot@ fixed this, but had to introduce a bunch of compat code in
bsd.rd.
It is time to retire this. Only 6.5-current contained this flaw,
sysupgrade(8)ing from there to -current will no longer work but we
never made any promises that it would anyway.
OK deraadt, ajacoutot

Revision 1.1153 / (download) - annotate - [select for diffs], Fri May 22 13:38:43 2020 UTC (4 years, 5 months ago) by kn
Branch: MAIN
Changes since 1.1152: +2 -2 lines
Diff to previous 1.1152 (colored)

Revert the following commit as it breaks hostname.if(5) lines with a
backslash at the end for line continuation

Breaking long lines into multiple ones must still be possible and does
require to treat the backslash as an escape character.

Breakage reported by Mark Patruck <mark at wrapped dot cx >, thanks!

---
distrib/miniroot/install.sub revision 1.1151
etc/netstart revision 1.203
date: 2020/05/21 11:54:41;  author: kn;  state: Exp;  lines: +2 -2;
Do not treat backslashe as an escape character in hostname.if(5) lines

ifstart() should always pass such lines unaltered, especially if they
contain "nwid" or "description" lines with arbitrary strings.

<bsdlisten at gmail dot com> reported SSIDs such as "Mike's" during
installation end as broken;  this was because the installer escaped
the single quote using backslashes which ended up being treated as
escape characters much later during hostname.if parsing in netstart(8).

Ok deraadt

Revision 1.1152 / (download) - annotate - [select for diffs], Thu May 21 13:42:02 2020 UTC (4 years, 5 months ago) by kn
Branch: MAIN
Changes since 1.1151: +2 -3 lines
Diff to previous 1.1151 (colored)

Fix stripcom() description wrt. comments not on their own line

Neither netstart's nor install.sub's (subtly different) implementations
remove trailing comments on lines not starting as a comment, e.g.,
lines like "up #not down" go through unaltered and without "#not down"
being removed.

Only lines *beginning* with the comment sign ("#") are stripped.

No functional change, just updating function descriptions.

Revision 1.1151 / (download) - annotate - [select for diffs], Thu May 21 11:54:41 2020 UTC (4 years, 5 months ago) by kn
Branch: MAIN
Changes since 1.1150: +2 -2 lines
Diff to previous 1.1150 (colored)

Do not treat backslashe as an escape character in hostname.if(5) lines

ifstart() should always pass such lines unaltered, especially if they
contain "nwid" or "description" lines with arbitrary strings.

<bsdlisten at gmail dot com> reported SSIDs such as "Mike's" during
installation end as broken;  this was because the installer escaped
the single quote using backslashes which ended up being treated as
escape characters much later during hostname.if parsing in netstart(8).

Ok deraadt

Revision 1.1150 / (download) - annotate - [select for diffs], Sun Apr 5 15:15:42 2020 UTC (4 years, 6 months ago) by krw
Branch: MAIN
CVS Tags: OPENBSD_6_7_BASE, OPENBSD_6_7
Changes since 1.1149: +9 -8 lines
Diff to previous 1.1149 (colored)

Make FFS2 the default filesystem type on installs except for landisk,
luna88k and sgi.

ok otto@ deraadt@ (for diff with same effect)

Revision 1.1149 / (download) - annotate - [select for diffs], Fri Mar 6 21:14:20 2020 UTC (4 years, 7 months ago) by gkoehler
Branch: MAIN
Changes since 1.1148: +2 -2 lines
Diff to previous 1.1148 (colored)

Remove libLLVM.so.1.0

Revision 1.1148 / (download) - annotate - [select for diffs], Sat Feb 29 07:31:34 2020 UTC (4 years, 7 months ago) by otto
Branch: MAIN
Changes since 1.1147: +3 -2 lines
Diff to previous 1.1147 (colored)

Next step in prepping for ffs2 installs: introduce a new install script var
MDFSOPT and add a missing prototype.

Revision 1.1147 / (download) - annotate - [select for diffs], Sun Feb 2 20:33:52 2020 UTC (4 years, 8 months ago) by krw
Branch: MAIN
Changes since 1.1146: +1 -5 lines
Diff to previous 1.1146 (colored)

Tweak dhclient(8) timing defaults depending on SMALL rather than using
/dev/stdin to fake a dhclient.conf file during install. Simplifies and
shortens install.sub code. Allows further restrictions to be applied
to '-c' specified files.

Revision 1.1146 / (download) - annotate - [select for diffs], Sun Jan 26 10:47:07 2020 UTC (4 years, 9 months ago) by krw
Branch: MAIN
Changes since 1.1145: +1 -2 lines
Diff to previous 1.1145 (colored)

No need to specify "initial-interval 1;" in the dhclient.conf used
during installation. This is the default value.

Revision 1.1145 / (download) - annotate - [select for diffs], Sat Oct 19 13:14:23 2019 UTC (5 years ago) by tb
Branch: MAIN
Changes since 1.1144: +2 -2 lines
Diff to previous 1.1144 (colored)

Determine the OS version in a way that won't break after 9.9.
Do it the same way in all three copies of the code.

Based on a patch from Chris Waddey.
with & ok ajacoutot

Revision 1.1144 / (download) - annotate - [select for diffs], Tue Oct 1 02:11:41 2019 UTC (5 years ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_6_6_BASE, OPENBSD_6_6
Changes since 1.1143: +15 -16 lines
Diff to previous 1.1143 (colored)

People who've upgraded repeatedly have observed /usr is getting a bit
tight.  At upgrade time (just before new sets hit the disk) we can prune
some potentially unused clang, gcc, and perl pieces.  This seems to help.
(This is an improvement on a previous strategy)
discussed with sthen and tb, tested by kmos, in snaps for 2 days
This strategy ins't perfect, and people should consider fresh installs once
in a while, or more strict pruning especially of /usr/lib/lib*.so

Revision 1.1143 / (download) - annotate - [select for diffs], Sun Sep 22 08:38:57 2019 UTC (5 years, 1 month ago) by ajacoutot
Branch: MAIN
Changes since 1.1142: +22 -9 lines
Diff to previous 1.1142 (colored)

Add code to handle future sysupgrade(8) change where the tool will be
responsible for creating auto_upgrade.conf.
No behavior change intended.

While here, add missing `-x' to usage().

tested by and ok florian@, ok deraadt@

Revision 1.1142 / (download) - annotate - [select for diffs], Thu Sep 19 12:18:46 2019 UTC (5 years, 1 month ago) by semarie
Branch: MAIN
Changes since 1.1141: +4 -1 lines
Diff to previous 1.1141 (colored)

reset watchdog timeout between each installation of sets (and no just between fetch&verify)

ok sthen@

Revision 1.1141 / (download) - annotate - [select for diffs], Sat Sep 14 11:38:46 2019 UTC (5 years, 1 month ago) by kn
Branch: MAIN
Changes since 1.1140: +6 -7 lines
Diff to previous 1.1140 (colored)

Support quoted SSIDs

Instead of ignoring SSIDs containing whitespaces, slightly adjust the
commands to take everything in between 'nwid ' and ' chan' as SSID; if it
has double quotes at start *and* end, simply remove those.

This enables users to select networks such as "Unitymedia WifiSpot" and
"FRITZ!Box 7490" for example which are common among the quoted ones at
least in germany.

The only SSIDs known to break this are those containing " chan " as this
substring is used as delimiter.  Picking "some chan 4 me" would therefore
result in _nwid being assigned '"some' (literal double quote), but that
seems reasonably acceptable compared to the current behaviour.

Input rpe
"Yes please" stsp

Revision 1.1140 / (download) - annotate - [select for diffs], Wed Aug 21 17:39:30 2019 UTC (5 years, 2 months ago) by kn
Branch: MAIN
Changes since 1.1139: +2 -2 lines
Diff to previous 1.1139 (colored)

Lower syspugrade timeout to 30 minutes

The previous mechanism used a single timeout for the entire upgrade which
was kept when introducing the per-set watchdog.

Half an hour now seems more sensible to safely catch the biggest sets on
slow hardware, so avoid needlessly stalling (failed) upgrades for too long.

OK sthen deraadt

Revision 1.1139 / (download) - annotate - [select for diffs], Wed Aug 14 19:32:41 2019 UTC (5 years, 2 months ago) by naddy
Branch: MAIN
Changes since 1.1138: +8 -9 lines
Diff to previous 1.1138 (colored)

Clean up clean_old():
* Remove syspatch files from the installed system and not the ramdisk.
* Directly try to remove the old files without superfluous check.
* Use an extended glob to match /usr/lib/gcc-lib contents that don't
belong to this OS version.
* For /usr/lib/clang, set an array to the expansion of the glob, which is
an alphabetically sorted list, drop the last element, and rm the rest.

ok tb@

Revision 1.1138 / (download) - annotate - [select for diffs], Tue Aug 13 07:47:40 2019 UTC (5 years, 2 months ago) by kn
Branch: MAIN
Changes since 1.1137: +24 -3 lines
Diff to previous 1.1137 (colored)

Reset sysupgrade watchdog upon every set installation

Instead of having a single timeout for the entire upgrade, start anew right
before extracting each set's tarball.

Do so by replacing the background job with a proper co-process that gets
killed and restarted (reset), analogue to the dmesg listener in interactive
mode.

Prompted by and OK sthen
OK deraadt

Revision 1.1137 / (download) - annotate - [select for diffs], Sun Aug 11 13:32:41 2019 UTC (5 years, 2 months ago) by kn
Branch: MAIN
Changes since 1.1136: +4 -4 lines
Diff to previous 1.1136 (colored)

Typofixes in comments

OK sthen

Revision 1.1136 / (download) - annotate - [select for diffs], Tue Aug 6 10:07:45 2019 UTC (5 years, 2 months ago) by sthen
Branch: MAIN
Changes since 1.1135: +2 -2 lines
Diff to previous 1.1135 (colored)

raise the watchdog for sysupgrade-initiated updates from 30m to 45m.
on my anoncvs server it takes about 20m already to untar sets, which is
a bit close to the limit for my liking (we only want to trigger the
watchdog if things are *really* stuck; if it's still proceeding then
rebooting mid-upgrade can leave things in a worse state).

we can probably do something smarter (e.g. reset the watchdog after
untarring each set) but this is an easier-to-test initial improvement.

ok florian deraadt kn

Revision 1.1135 / (download) - annotate - [select for diffs], Tue May 14 14:27:49 2019 UTC (5 years, 5 months ago) by ajacoutot
Branch: MAIN
Changes since 1.1134: +16 -5 lines
Diff to previous 1.1134 (colored)

Revert my recent sysupgrade changes; it broke unattended upgrades for
espie@. Need to look deeper.

Revision 1.1134 / (download) - annotate - [select for diffs], Mon May 13 23:18:22 2019 UTC (5 years, 5 months ago) by naddy
Branch: MAIN
Changes since 1.1133: +2 -2 lines
Diff to previous 1.1133 (colored)

Add tee(1) to the ramdisk filesystem and use it to provide both a
moving progress bar during auto upgrade/install and a clean log
afterwards.  ok deraadt@

Revision 1.1133 / (download) - annotate - [select for diffs], Mon May 13 02:26:42 2019 UTC (5 years, 5 months ago) by ajacoutot
Branch: MAIN
Changes since 1.1132: +5 -16 lines
Diff to previous 1.1132 (colored)

Fix usage() (missing '-x').
Adapt to recent sysupgrade(8) change

ok florian@ kmos@ kn@

Revision 1.1132 / (download) - annotate - [select for diffs], Sat May 11 19:11:19 2019 UTC (5 years, 5 months ago) by krw
Branch: MAIN
Changes since 1.1131: +33 -15 lines
Diff to previous 1.1131 (colored)

Repair and improve v6 default route selection.

Should fix autoinstalls, suppress pointless questions, allow section
of 'none' via a number, etc.

Issues first reported by reyk@

Testing & ok florian

Revision 1.1131 / (download) - annotate - [select for diffs], Fri May 10 20:47:54 2019 UTC (5 years, 5 months ago) by reyk
Branch: MAIN
Changes since 1.1130: +2 -2 lines
Diff to previous 1.1130 (colored)

Improve error message of "Question has no answer in response file".

It didn't always print the actual question so it was hard to debug
problems in the autoinstall(8) script.

OK florian@

Revision 1.1130 / (download) - annotate - [select for diffs], Fri May 10 15:38:19 2019 UTC (5 years, 5 months ago) by krw
Branch: MAIN
Changes since 1.1129: +23 -37 lines
Diff to previous 1.1129 (colored)

Always make the default answer 'dhcp' on unconfigured interfaces.
Allow 'dhcp' even if the install media lacks /sbin/dhclient.

Great simplification of code.

ok florian@

Revision 1.1129 / (download) - annotate - [select for diffs], Thu May 9 22:38:42 2019 UTC (5 years, 5 months ago) by krw
Branch: MAIN
Changes since 1.1128: +3 -3 lines
Diff to previous 1.1128 (colored)

Don't ignore configured netmask/prefixlen on restarting
an install. Use the info as default answers in
relevant questions.

Revision 1.1128 / (download) - annotate - [select for diffs], Thu May 9 21:55:26 2019 UTC (5 years, 5 months ago) by krw
Branch: MAIN
Changes since 1.1127: +18 -15 lines
Diff to previous 1.1127 (colored)

Simplify v4_config() and v6_config() by getting updated information
via [v4|v6]_info() after calling ifconfig.

As a side effect 'inet' lines in hostname.if will always use the
hex format for the netmask, i.e. as displayed by ifconfig(8).

Revision 1.1127 / (download) - annotate - [select for diffs], Thu May 9 21:06:09 2019 UTC (5 years, 5 months ago) by naddy
Branch: MAIN
Changes since 1.1126: +9 -6 lines
Diff to previous 1.1126 (colored)

sysupgrade already verifies all sets, so eliminate redundant
verification by the installer:

Verification is triggered by the presence of SHA256.sig.
In sysupgrade, remove SHA256.sig once the signature has been verified.
Compare SHA256 against a stored copy from the previous install/upgrade.

In the installer, stash away a copy of SHA256 and move that code
into install_files() where the sets are actually processed.
Confirm in the response file that we want to proceed without
verifying the sets.

ok florian@ tj@

Revision 1.1126 / (download) - annotate - [select for diffs], Thu May 9 18:19:28 2019 UTC (5 years, 5 months ago) by krw
Branch: MAIN
Changes since 1.1125: +19 -19 lines
Diff to previous 1.1125 (colored)

Stop tromping over the saved interface configuration when
invalid address or netmask/prefixlen values are entered.

Keeps the presented default values sane in the face of
cats or otherunintended keyboard events.

Revision 1.1125 / (download) - annotate - [select for diffs], Thu May 9 17:32:07 2019 UTC (5 years, 5 months ago) by krw
Branch: MAIN
Changes since 1.1124: +18 -20 lines
Diff to previous 1.1124 (colored)

Shuffle code to make v4_config() and v6_config() look even
more like each other.

Revision 1.1124 / (download) - annotate - [select for diffs], Thu May 9 16:59:25 2019 UTC (5 years, 5 months ago) by krw
Branch: MAIN
Changes since 1.1123: +10 -8 lines
Diff to previous 1.1123 (colored)

Shuffle code a bit to consistently call 'ifconfig $_if [-inet|-inet6]' to
completely clear existing configurations after restarting an install.

Revision 1.1123 / (download) - annotate - [select for diffs], Thu May 9 06:00:55 2019 UTC (5 years, 5 months ago) by krw
Branch: MAIN
Changes since 1.1122: +1 -8 lines
Diff to previous 1.1122 (colored)

Don't forget about previous dhcp configuration attempts
when restarting an install. Even if the original dhcp
attempt did not successfully get a lease and configure
the interface.

ok beck@ florian@

Revision 1.1122 / (download) - annotate - [select for diffs], Wed May 8 23:23:06 2019 UTC (5 years, 5 months ago) by krw
Branch: MAIN
Changes since 1.1121: +16 -13 lines
Diff to previous 1.1121 (colored)

Move the magic ping6 IPv6 default router discovery so we probe all
relevant interfaces at once, and ask for a user decision right after
we ask for the IPv4 default route.

ok florian@

Revision 1.1121 / (download) - annotate - [select for diffs], Wed May 8 15:53:31 2019 UTC (5 years, 5 months ago) by florian
Branch: MAIN
Changes since 1.1120: +7 -1 lines
Diff to previous 1.1120 (colored)

cleanup after unattended upgrade

tweak & OK kmos, OK semarie

Revision 1.1120 / (download) - annotate - [select for diffs], Fri May 3 20:38:15 2019 UTC (5 years, 5 months ago) by krw
Branch: MAIN
Changes since 1.1119: +28 -34 lines
Diff to previous 1.1119 (colored)

Bring v6_config() into the modern age. Remember
'autoconf' if install restarts. Be more
careful to keep things clean. Remove unnecessary
checks left over from rtsol days.

Started by claudio@ noticing 'autoconf' is not
remembered.

ok florian@ kn@ (mostly)

Revision 1.1119 / (download) - annotate - [select for diffs], Thu May 2 06:19:33 2019 UTC (5 years, 5 months ago) by florian
Branch: MAIN
Changes since 1.1118: +6 -1 lines
Diff to previous 1.1118 (colored)

Keep SHA256.sig around on the installed / upgraded system.
It seems like sysupgrade(8) could use this to figure out if a new
snapshot is available.

Revision 1.1118 / (download) - annotate - [select for diffs], Mon Apr 29 23:50:34 2019 UTC (5 years, 6 months ago) by krw
Branch: MAIN
Changes since 1.1117: +7 -14 lines
Diff to previous 1.1117 (colored)

Make v[46]_info() return all the interface flags instead of just
deducing that the interface is up or down. Check for "UP," in the
returned flags where a return value of UP was used previously.

ok kn@ with feedback/optimizations to be pondered further.

Revision 1.1117 / (download) - annotate - [select for diffs], Thu Apr 25 17:18:52 2019 UTC (5 years, 6 months ago) by florian
Branch: MAIN
Changes since 1.1116: +2 -2 lines
Diff to previous 1.1116 (colored)

Move the expected set location to /home/_sysupgrade.
We found that /home/upgrade is a too common name and this will be in
line with the upcomming sysupgrade(8) utility.
discussed with deraadt@

Revision 1.1116 / (download) - annotate - [select for diffs], Wed Apr 24 18:11:00 2019 UTC (5 years, 6 months ago) by florian
Branch: MAIN
Changes since 1.1115: +7 -2 lines
Diff to previous 1.1115 (colored)

In unattended mode do a reboot even if things go wrong and
additionally install a watchdog to do a reboot after 30 minutes if the
script gets completely stuck.

A half upgraded system that reboots at least gives us a chance that it
will come back and we can fix it. Just having it sit there isn't
helping anyone.

It would be nicer if the watchdog were kernel based...
OK deraadt

Revision 1.1115 / (download) - annotate - [select for diffs], Wed Apr 24 15:59:22 2019 UTC (5 years, 6 months ago) by florian
Branch: MAIN
Changes since 1.1114: +34 -2 lines
Diff to previous 1.1114 (colored)

Perform unattended upgrade if /bsd.upgrade is present.
Sets are expected to be in /home/upgrade.
Original idea, input & OK deraadt

Revision 1.1114 / (download) - annotate - [select for diffs], Mon Apr 22 05:36:42 2019 UTC (5 years, 6 months ago) by florian
Branch: MAIN
Changes since 1.1113: +15 -3 lines
Diff to previous 1.1113 (colored)

When upgrading only prompt for disks that contain a root partition.

With this the question "Which disk is the root disk" has the correct
default in case of full disk encryption. Before it would list sd0 sd1
with sd0 being the backing store and sd1 the unlocked disk.

This is a step towards fully unattended upgrades running completely on
defaults (i.e. no need for an autoinstall(8) answer file).

In the past there have been concernes that we should not touch any odd
disk without the operator telling us as there might be bugs lurking.
It is early enough in the cycle to find out for sure.

input halex, kn
"just commit it" deraadt

Revision 1.1113 / (download) - annotate - [select for diffs], Tue Apr 2 08:51:49 2019 UTC (5 years, 6 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_6_5_BASE, OPENBSD_6_5
Changes since 1.1112: +2 -1 lines
Diff to previous 1.1112 (colored)

After upgrade time, delete contents of /var/syspatch.  Either
we are on a release (and the rollbacks are meaningless) or it's a snapshot
(and they are even more meaningless)
It appears the first syspatch of a release does that cleaning, but why not
get ahead..
ok phessler

Revision 1.1112 / (download) - annotate - [select for diffs], Tue Apr 2 01:40:40 2019 UTC (5 years, 6 months ago) by deraadt
Branch: MAIN
Changes since 1.1111: +14 -1 lines
Diff to previous 1.1111 (colored)

After upgrade, cleanup old clang and gcc compoents.
Test by phessler

Revision 1.1111 / (download) - annotate - [select for diffs], Sat Mar 2 17:33:18 2019 UTC (5 years, 7 months ago) by tb
Branch: MAIN
Changes since 1.1110: +5 -3 lines
Diff to previous 1.1110 (colored)

On upgrade, only clean up the library relinking kits when we know
that a new one will be installed (i.e., base*.tgz was selected).

'makes sense' deraadt

Revision 1.1110 / (download) - annotate - [select for diffs], Mon Feb 11 17:51:53 2019 UTC (5 years, 8 months ago) by deraadt
Branch: MAIN
Changes since 1.1109: +3 -1 lines
Diff to previous 1.1109 (colored)

During upgrade, remove all library relink files (to save space)
discussed with sthen

Revision 1.1109 / (download) - annotate - [select for diffs], Mon Jan 21 23:06:28 2019 UTC (5 years, 9 months ago) by jsg
Branch: MAIN
Changes since 1.1108: +2 -2 lines
Diff to previous 1.1108 (colored)

lenght -> length

Revision 1.1108 / (download) - annotate - [select for diffs], Mon Jan 21 02:53:51 2019 UTC (5 years, 9 months ago) by phessler
Branch: MAIN
Changes since 1.1107: +9 -8 lines
Diff to previous 1.1107 (colored)

when installing over wifi, move nwid and wpakey/nwkey to be on the same line

(a later step will move to using join in config files, but since not all
adapters support join (due to them not using the net80211 framework), that
requires more work and testing.)

OK krw@ halex@

Revision 1.1107 / (download) - annotate - [select for diffs], Sun Jan 20 21:13:56 2019 UTC (5 years, 9 months ago) by tb
Branch: MAIN
Changes since 1.1106: +3 -4 lines
Diff to previous 1.1106 (colored)

Remove the "done." dance around checking for syspatches to avoid
ugliness in case an error occurs.

ok ajacoutot

Revision 1.1106 / (download) - annotate - [select for diffs], Wed Jan 16 23:50:37 2019 UTC (5 years, 9 months ago) by ajacoutot
Branch: MAIN
Changes since 1.1105: +2 -2 lines
Diff to previous 1.1105 (colored)

When installing a few months after a new release is out, the syspatch(8) check
at first boot may display a large amount of patches to install (one per line).
This kind of overflows the display, so use column(1) to reduce the amount of
lines.

prodded by and ok deraadt@

Revision 1.1105 / (download) - annotate - [select for diffs], Sun Jan 13 16:37:29 2019 UTC (5 years, 9 months ago) by deraadt
Branch: MAIN
Changes since 1.1104: +5 -5 lines
Diff to previous 1.1104 (colored)

spelling error fixes; from Claus Assmann

Revision 1.1104 / (download) - annotate - [select for diffs], Sat Sep 22 09:12:36 2018 UTC (6 years, 1 month ago) by fcambus
Branch: MAIN
CVS Tags: OPENBSD_6_4_BASE, OPENBSD_6_4
Changes since 1.1103: +10 -10 lines
Diff to previous 1.1103 (colored)

Harmonize spacing after ellipses in displayed messages.

We were using spacing after ellipses in an inconsistent way in the
installer. Standardize on using "... " everywhere and take into account
the cursor position while we are waiting for the task to complete: the
cursor is now always positioned after the last dot, and the space is
added when displaying completion confirmation.

While there, also take cursor position into account in vfs_shutdown(),
and remove the extra leading space before ticks in dhclient.

OK deraadt@

Revision 1.1103 / (download) - annotate - [select for diffs], Tue Sep 18 17:43:40 2018 UTC (6 years, 1 month ago) by naddy
Branch: MAIN
Changes since 1.1102: +11 -6 lines
Diff to previous 1.1102 (colored)

The dmesg buffer is sufficiently large now that using the accumulated
output from several boots in the dmesg listener can overflow the
ramdisk, so use only one boot's worth of dmesg in the listener.
sed(1) expression from kn@.  ok deraadt@

Revision 1.1102 / (download) - annotate - [select for diffs], Wed Aug 29 11:30:48 2018 UTC (6 years, 2 months ago) by krw
Branch: MAIN
Changes since 1.1101: +2 -2 lines
Diff to previous 1.1101 (colored)

Historically /etc/netstart (and the equivalent code in the install
script) did 'ifconfig <if> down' before starting dhclient(8). This was
a way of ensuring old running copies of dhclient were killed before a
new one started. Current dhclient does not need this assist, so change
"ifconfig <if> down" to "ifconfig <if> up" pending further script
optimizations.

Similar to a 2014 attempt by halex@. Prompted by a misc@ report
from Kristjan Komlosi reporting hanging diskless setups.

ok halex@ kn@

Revision 1.1101 / (download) - annotate - [select for diffs], Wed Aug 22 16:53:36 2018 UTC (6 years, 2 months ago) by tb
Branch: MAIN
Changes since 1.1100: +4 -3 lines
Diff to previous 1.1100 (colored)

Let /etc/installurl default to cdn.openbsd.org if it doesn't exist and no
official mirror was used. This way, people doing installs without network
access also get working pkg_add and syspatch experience out of the box.

Idea from tj
ok halex, job (who made it all possible), deraadt

Revision 1.1100 / (download) - annotate - [select for diffs], Sun Aug 19 20:35:51 2018 UTC (6 years, 2 months ago) by tb
Branch: MAIN
Changes since 1.1099: +2 -3 lines
Diff to previous 1.1099 (colored)

There was some misunderstanding about which mirror to use.
Back this out for now.

Revision 1.1099 / (download) - annotate - [select for diffs], Sun Aug 19 20:01:38 2018 UTC (6 years, 2 months ago) by tb
Branch: MAIN
Changes since 1.1098: +4 -3 lines
Diff to previous 1.1098 (colored)

If /etc/installurl doesn't exist, install a default one pointing to
cdn.openbsd.org.  This way, people doing installs without network
access also get working pkg_add and syspatch experience out of the box.

Idea from tj, supported by deraadt and job
ok halex

Revision 1.1098 / (download) - annotate - [select for diffs], Tue Jul 10 14:22:36 2018 UTC (6 years, 3 months ago) by rpe
Branch: MAIN
Changes since 1.1097: +34 -18 lines
Diff to previous 1.1097 (colored)

Tweak comments and explain some not so obvious things.

Revision 1.1097 / (download) - annotate - [select for diffs], Tue Jul 10 09:33:34 2018 UTC (6 years, 3 months ago) by halex
Branch: MAIN
Changes since 1.1096: +4 -4 lines
Diff to previous 1.1096 (colored)

simplify and properly quote the loading of soii key generation material,
and move it into enable_network()

ok florian tb, long ago

Revision 1.1096 / (download) - annotate - [select for diffs], Mon Jul 9 16:12:23 2018 UTC (6 years, 3 months ago) by rpe
Branch: MAIN
Changes since 1.1095: +11 -11 lines
Diff to previous 1.1095 (colored)

Rename the THESETS variable to ALLSETS because it holds the list
of all legitimate OpenBSD set files. That helps to better understand
the code in context.

OK halex krw tb

Revision 1.1095 / (download) - annotate - [select for diffs], Mon Jul 9 13:45:54 2018 UTC (6 years, 3 months ago) by rpe
Branch: MAIN
Changes since 1.1094: +9 -8 lines
Diff to previous 1.1094 (colored)

Explain in more detail, how select_sets() is involved when the current bsd.rd
is used to download/verify/install a bsd.rd of a new release.

Revision 1.1094 / (download) - annotate - [select for diffs], Mon Jul 9 12:32:30 2018 UTC (6 years, 3 months ago) by rpe
Branch: MAIN
Changes since 1.1093: +6 -4 lines
Diff to previous 1.1093 (colored)

Explain in more detail, what sane_install() actually does.

Revision 1.1093 / (download) - annotate - [select for diffs], Mon Jul 9 11:57:05 2018 UTC (6 years, 3 months ago) by rpe
Branch: MAIN
Changes since 1.1092: +10 -6 lines
Diff to previous 1.1092 (colored)

Extend the v4_defroute() function description and make the fallback to
the previous default route more obvious by using an if-then-else block.

Revision 1.1092 / (download) - annotate - [select for diffs], Mon Jul 9 11:19:46 2018 UTC (6 years, 3 months ago) by rpe
Branch: MAIN
Changes since 1.1091: +13 -14 lines
Diff to previous 1.1091 (colored)

Comments and function descriptions.

Revision 1.1091 / (download) - annotate - [select for diffs], Mon Jul 9 10:23:05 2018 UTC (6 years, 3 months ago) by rpe
Branch: MAIN
Changes since 1.1090: +18 -25 lines
Diff to previous 1.1090 (colored)

Improve comments and function descriptions.

Revision 1.1090 / (download) - annotate - [select for diffs], Mon Jul 9 08:25:08 2018 UTC (6 years, 3 months ago) by rpe
Branch: MAIN
Changes since 1.1089: +8 -8 lines
Diff to previous 1.1089 (colored)

Comments

Revision 1.1089 / (download) - annotate - [select for diffs], Sun Jul 8 21:25:59 2018 UTC (6 years, 3 months ago) by rpe
Branch: MAIN
Changes since 1.1088: +39 -39 lines
Diff to previous 1.1088 (colored)

The AUTO variable is a boolean indicating whether or not autoinstall is active
Rename AUTO to AI so "AI" is used consistently throuhout the installer script
for autoinstall releated variables.

OK krw tb

Revision 1.1088 / (download) - annotate - [select for diffs], Sun Jul 8 19:59:37 2018 UTC (6 years, 3 months ago) by rpe
Branch: MAIN
Changes since 1.1087: +5 -11 lines
Diff to previous 1.1087 (colored)

Compact the function description.
Turn the ask_until from type Korn shell to Bourne/POSIX mode.
Use : instead of true in the while-loop to be consistent.

OK krw halex tb

Revision 1.1087 / (download) - annotate - [select for diffs], Sun Jul 8 13:42:46 2018 UTC (6 years, 3 months ago) by rpe
Branch: MAIN
Changes since 1.1086: +2 -2 lines
Diff to previous 1.1086 (colored)

Whitespace

Revision 1.1086 / (download) - annotate - [select for diffs], Sat Jul 7 14:39:23 2018 UTC (6 years, 3 months ago) by rpe
Branch: MAIN
Changes since 1.1085: +4 -4 lines
Diff to previous 1.1085 (colored)

Always quote both parameters of ask() which picks the question and
default answer parameters via $1 and $2.

OK tb

Revision 1.1085 / (download) - annotate - [select for diffs], Sat Jul 7 14:35:06 2018 UTC (6 years, 3 months ago) by rpe
Branch: MAIN
Changes since 1.1084: +2 -2 lines
Diff to previous 1.1084 (colored)

Make sure the question parameter is set to be able to search for an answer
in the response file.

OK krw tb

Revision 1.1084 / (download) - annotate - [select for diffs], Sat Jul 7 13:11:47 2018 UTC (6 years, 3 months ago) by rpe
Branch: MAIN
Changes since 1.1083: +4 -10 lines
Diff to previous 1.1083 (colored)

Compact function description.

Revision 1.1083 / (download) - annotate - [select for diffs], Sat Jul 7 12:54:33 2018 UTC (6 years, 3 months ago) by rpe
Branch: MAIN
Changes since 1.1082: +5 -5 lines
Diff to previous 1.1082 (colored)

Trim function description by leaving out parts that are already
explained for _ask(). Give a hint why _ask() is called from within
a while-loop.

Revision 1.1082 / (download) - annotate - [select for diffs], Sat Jul 7 10:26:28 2018 UTC (6 years, 3 months ago) by rpe
Branch: MAIN
Changes since 1.1081: +8 -5 lines
Diff to previous 1.1081 (colored)

Be more precise explaining that _ask() captures user responses
interactively and also from the response file.

Revision 1.1081 / (download) - annotate - [select for diffs], Sat Jul 7 09:25:00 2018 UTC (6 years, 3 months ago) by rpe
Branch: MAIN
Changes since 1.1080: +6 -10 lines
Diff to previous 1.1080 (colored)

Tweak comments

Revision 1.1080 / (download) - annotate - [select for diffs], Fri Jul 6 21:07:46 2018 UTC (6 years, 3 months ago) by rpe
Branch: MAIN
Changes since 1.1079: +9 -13 lines
Diff to previous 1.1079 (colored)

Improve the description of another rather esoteric piece of shell script code.

Revision 1.1079 / (download) - annotate - [select for diffs], Fri Jul 6 20:13:42 2018 UTC (6 years, 3 months ago) by rpe
Branch: MAIN
Changes since 1.1078: +8 -5 lines
Diff to previous 1.1078 (colored)

Tweak comments and explain, why HTTP_SETDIR is made known to the webserver
where the response file is downloaded from.

Revision 1.1078 / (download) - annotate - [select for diffs], Fri Jul 6 19:42:01 2018 UTC (6 years, 3 months ago) by rpe
Branch: MAIN
Changes since 1.1077: +11 -6 lines
Diff to previous 1.1077 (colored)

Tweak comments and spacing.

Revision 1.1077 / (download) - annotate - [select for diffs], Fri Jul 6 19:16:28 2018 UTC (6 years, 3 months ago) by rpe
Branch: MAIN
Changes since 1.1076: +5 -11 lines
Diff to previous 1.1076 (colored)

Tweak comment

Revision 1.1076 / (download) - annotate - [select for diffs], Mon Jul 2 20:47:46 2018 UTC (6 years, 3 months ago) by rpe
Branch: MAIN
Changes since 1.1075: +5 -5 lines
Diff to previous 1.1075 (colored)

Be more precise in the function description and rename _iflist to
_if_list to be consistent with other similar cases.

Revision 1.1075 / (download) - annotate - [select for diffs], Mon Jul 2 20:21:29 2018 UTC (6 years, 3 months ago) by rpe
Branch: MAIN
Changes since 1.1074: +3 -2 lines
Diff to previous 1.1074 (colored)

more descriptive comment

Revision 1.1074 / (download) - annotate - [select for diffs], Mon Jul 2 19:47:28 2018 UTC (6 years, 3 months ago) by rpe
Branch: MAIN
Changes since 1.1073: +3 -2 lines
Diff to previous 1.1073 (colored)

Be more precise about the expected input.

Revision 1.1073 / (download) - annotate - [select for diffs], Mon Jul 2 19:11:56 2018 UTC (6 years, 3 months ago) by rpe
Branch: MAIN
Changes since 1.1072: +2 -2 lines
Diff to previous 1.1072 (colored)

Quote first parameter of isin().

Revision 1.1072 / (download) - annotate - [select for diffs], Sun Jul 1 21:00:18 2018 UTC (6 years, 3 months ago) by rpe
Branch: MAIN
Changes since 1.1071: +6 -6 lines
Diff to previous 1.1071 (colored)

Comments

Revision 1.1071 / (download) - annotate - [select for diffs], Sun Jul 1 20:45:22 2018 UTC (6 years, 3 months ago) by rpe
Branch: MAIN
Changes since 1.1070: +17 -10 lines
Diff to previous 1.1070 (colored)

Explain and demystify some darker corners of the installer script.

Revision 1.1070 / (download) - annotate - [select for diffs], Sat Jun 16 16:08:50 2018 UTC (6 years, 4 months ago) by rpe
Branch: MAIN
Changes since 1.1069: +10 -7 lines
Diff to previous 1.1069 (colored)

Allow to enter a DUID as answer to the "Which disk is the root disk?"
question during upgrade.

suggested by abieber
positive feedback deraadt krw
ok tb abieber

Revision 1.1069 / (download) - annotate - [select for diffs], Sat Jun 16 15:56:51 2018 UTC (6 years, 4 months ago) by rpe
Branch: MAIN
Changes since 1.1068: +3 -3 lines
Diff to previous 1.1068 (colored)

Zap whitespaces

found by deraadt

Revision 1.1068 / (download) - annotate - [select for diffs], Tue May 29 20:37:22 2018 UTC (6 years, 5 months ago) by kettenis
Branch: MAIN
Changes since 1.1067: +2 -1 lines
Diff to previous 1.1067 (colored)

When adjusting the speed of a 'console' tty entry, also change entries
with a default speed of 115200 since that is what we have on armv7 and arm64.

ok benno@, tb@

Revision 1.1067 / (download) - annotate - [select for diffs], Mon May 7 10:44:01 2018 UTC (6 years, 5 months ago) by tb
Branch: MAIN
Changes since 1.1066: +2 -2 lines
Diff to previous 1.1066 (colored)

Fix http install with proxy, which was broken since URL redirection was
made sticky.

Found and fix suggested by joshua megerman () iwco com, thanks!
Tested & ok rpe

Revision 1.1066 / (download) - annotate - [select for diffs], Thu Mar 15 17:43:54 2018 UTC (6 years, 7 months ago) by anton
Branch: MAIN
CVS Tags: OPENBSD_6_3_BASE, OPENBSD_6_3
Changes since 1.1065: +3 -2 lines
Diff to previous 1.1065 (colored)

Always ensure to output a newline after checking for available syspatches.
Otherwise, if syspatch exits 1 any subsequent output will end up on the same
line during boot. Discovered while upgrading from current today since we're in
release mode.

Discussed with and ok tb@

Revision 1.1065 / (download) - annotate - [select for diffs], Wed Feb 21 20:02:37 2018 UTC (6 years, 8 months ago) by rpe
Branch: MAIN
Changes since 1.1064: +2 -2 lines
Diff to previous 1.1064 (colored)

Delete the kernel link kit tgz after extraction to align with the
libexec/reorder_kernel script.

OK tb

Revision 1.1064 / (download) - annotate - [select for diffs], Wed Feb 21 19:54:25 2018 UTC (6 years, 8 months ago) by rpe
Branch: MAIN
Changes since 1.1063: +9 -1 lines
Diff to previous 1.1063 (colored)

If there is one interface, and it is configured via dhcp, and the lease
contains both domain-name and domain-search options make sure to use the
first domain-name entry (there might be multiple).

This issue was noticed by Raf Czlonka, thanks for reporting
Discussed with, tested and OK krw

Revision 1.1063 / (download) - annotate - [select for diffs], Sun Feb 18 01:50:04 2018 UTC (6 years, 8 months ago) by kn
Branch: MAIN
Changes since 1.1062: +2 -3 lines
Diff to previous 1.1062 (colored)

Simplify interface listing.

Discussed with tb, rpe, feedback from and OK halex.

Revision 1.1062 / (download) - annotate - [select for diffs], Sun Feb 18 00:43:16 2018 UTC (6 years, 8 months ago) by rpe
Branch: MAIN
Changes since 1.1061: +4 -1 lines
Diff to previous 1.1061 (colored)

Create interfaces before processing the hostname.if file in ifstart().

This ensures, that IPv6 is configured for dynamically created network
interfaces like 'vlan' which would otherwise not yet exist at the time
parse_hn_line() checks for IPv6 capability of an interface before
applying the inet6 configuration from the hostname.if.

Found out, tested and OK naddy

Revision 1.1061 / (download) - annotate - [select for diffs], Sat Feb 17 19:05:41 2018 UTC (6 years, 8 months ago) by rpe
Branch: MAIN
Changes since 1.1060: +5 -5 lines
Diff to previous 1.1060 (colored)

Since rev 1.543 of dhclient it sends the 'host-name' by default.

- remove the leftover _hn variable from dhcp_request()
- remove the "$_name" parameter when using dhcp_request() in v4_config()
- change comments of v{4,6}_config() to reflect the purpose of _name

OK krw tb

Revision 1.1060 / (download) - annotate - [select for diffs], Wed Feb 14 11:43:05 2018 UTC (6 years, 8 months ago) by tb
Branch: MAIN
Changes since 1.1059: +3 -1 lines
Diff to previous 1.1059 (colored)

Localize _f in do_upgrade().

ok rpe

Revision 1.1059 / (download) - annotate - [select for diffs], Sat Feb 10 05:59:06 2018 UTC (6 years, 8 months ago) by florian
Branch: MAIN
Changes since 1.1058: +4 -1 lines
Diff to previous 1.1058 (colored)

installer bits for RFC 7217 support

OK rpe, tb, naddy, sthen

Revision 1.1058 / (download) - annotate - [select for diffs], Tue Feb 6 22:14:52 2018 UTC (6 years, 8 months ago) by sthen
Branch: MAIN
Changes since 1.1057: +2 -2 lines
Diff to previous 1.1057 (colored)

quote http_proxy going to rc.firsttime, avoiding problems if it contains a
special character or space (possible with e.g. proxy username/password).
noticed by, install.sub shell magic from, and ok halex@

Revision 1.1057 / (download) - annotate - [select for diffs], Mon Feb 5 22:31:40 2018 UTC (6 years, 8 months ago) by sthen
Branch: MAIN
Changes since 1.1056: +5 -1 lines
Diff to previous 1.1056 (colored)

If an http proxy was used when fetching sets in the ramdisk, write it to
rc.firsttime for fw_update and syspatch. From trondd at kagu-tsuchi com,
ok halex@

Revision 1.1056 / (download) - annotate - [select for diffs], Sun Jan 21 19:58:37 2018 UTC (6 years, 9 months ago) by halex
Branch: MAIN
Changes since 1.1055: +3 -1 lines
Diff to previous 1.1055 (colored)

fix error handling while fetching sets

reported by naddy@ long ago
ok rpe@

Revision 1.1055 / (download) - annotate - [select for diffs], Thu Jan 18 17:23:15 2018 UTC (6 years, 9 months ago) by job
Branch: MAIN
Changes since 1.1054: +16 -9 lines
Diff to previous 1.1054 (colored)

Make URL redirection sticky in the installer

Ensures that when URL redirection takes place, the rest of the install/upgrade
session will stick to that redirected location. This should help ensure that
the fetched set of files is coherent when a load balancer emits 301/302.

With feedback from rpe@

OK sthen@ rpe@

Revision 1.1054 / (download) - annotate - [select for diffs], Sun Jan 14 12:12:52 2018 UTC (6 years, 9 months ago) by rpe
Branch: MAIN
Changes since 1.1053: +50 -27 lines
Diff to previous 1.1053 (colored)

Prefetched sets are stored by root, but are read by an unprivileged
user during the actual install phase. Add a check to the selection
of the prefetch area to ensure the unprivleged user can read files
from there.

Move the selection logic to its own function prefetcharea_fs_list()
which returns a unique list of candidate filesystems, or with rc=1.
While at it, remove /var/tmp from the potential list of candidates
because it's a symbolic link to /tmp since 2014.

Change install_files() to loop over the candidates and check if it
can read a test file, otherwise clean up and skip this filesystem.

Problem found by benno@ whose upgrade failed due to /usr/obj being
owned by build:wobj and permissions that prevented the unprivileged
user to read the prefetched set files from there.

discussed with and OK benno@ halex@ tb@

Revision 1.1053 / (download) - annotate - [select for diffs], Wed Jan 3 10:22:38 2018 UTC (6 years, 9 months ago) by rpe
Branch: MAIN
Changes since 1.1052: +8 -9 lines
Diff to previous 1.1052 (colored)

Always present the same question at the end of installs or upgrades.
Offer to exit to shell, halt or reboot the system, where 'reboot' is
the default answer. Change default answer to 'halt' for installs if
MDHALT is set to 'y'.

suggested by landry@
OK halex@

Revision 1.1052 / (download) - annotate - [select for diffs], Fri Dec 22 19:41:49 2017 UTC (6 years, 10 months ago) by rpe
Branch: MAIN
Changes since 1.1051: +7 -7 lines
Diff to previous 1.1051 (colored)

Cope with the fact, that the DHCLIENT route label is gone which
helped to find out if the default route was configured by dhclient.

Check if the interface connected to the default route is in the
dhcp interface group which accomplishes the same functionality.

With feedback from and OK krw@

Revision 1.1051 / (download) - annotate - [select for diffs], Thu Dec 21 19:22:14 2017 UTC (6 years, 10 months ago) by rpe
Branch: MAIN
Changes since 1.1050: +3 -5 lines
Diff to previous 1.1050 (colored)

Adopt comments to previous change

Revision 1.1050 / (download) - annotate - [select for diffs], Thu Dec 21 15:14:45 2017 UTC (6 years, 10 months ago) by krw
Branch: MAIN
Changes since 1.1049: +4 -12 lines
Diff to previous 1.1049 (colored)

Stop creating a dhclient.conf in the install script, now
that 'send host-name' is the default behaviour for
dhclient.

ok rpe@

Revision 1.1049 / (download) - annotate - [select for diffs], Mon Dec 18 22:48:28 2017 UTC (6 years, 10 months ago) by rpe
Branch: MAIN
Changes since 1.1048: +18 -7 lines
Diff to previous 1.1048 (colored)

Change the question at the end of installs and upgrades to present a choice
between exiting to the shell or to reboot the latter being the default.
(On sparc64 the second choice is to halt the system which leaves it at the
OpenBoot PROM prompt)

While there add a newline after the CONGRATULATIONS message.

OK tb@
positive feedback naddy@ deraadt@ giovanni@

Revision 1.1048 / (download) - annotate - [select for diffs], Mon Dec 18 21:33:26 2017 UTC (6 years, 10 months ago) by tb
Branch: MAIN
Changes since 1.1047: +4 -1 lines
Diff to previous 1.1047 (colored)

Display $MODE (install/upgrade) in the prompt before we know the hostname.

suggested by deraadt
ok rpe

Revision 1.1047 / (download) - annotate - [select for diffs], Sun Dec 17 18:29:56 2017 UTC (6 years, 10 months ago) by rpe
Branch: MAIN
Changes since 1.1046: +14 -2 lines
Diff to previous 1.1046 (colored)

Add a new question "Escape to shell before reboot? [no]" at the end of
the install and upgrade process.

"no" or [enter] reboots the system
"yes" leaves the install or upgrade at the shell prompt

On selected architectures, sparc64 being the only so far, the system
is halted instead of rebooted.

autoinstall(8) is NOT affected by this new question as it reboots the
system automatically already.

Suggested by and OK deraadt@, tb@ phessler@
Feedback on sparc64 by stsp@
Positive feedback pea@ landry@

Revision 1.1046 / (download) - annotate - [select for diffs], Sun Dec 17 17:03:52 2017 UTC (6 years, 10 months ago) by rpe
Branch: MAIN
Changes since 1.1045: +2 -2 lines
Diff to previous 1.1045 (colored)

allow '-' in usernames

requested and OK aja
OK halex@

Revision 1.1045 / (download) - annotate - [select for diffs], Fri Dec 1 18:19:30 2017 UTC (6 years, 10 months ago) by tb
Branch: MAIN
Changes since 1.1044: +2 -2 lines
Diff to previous 1.1044 (colored)

arm64 is now also a _syspatch_arch

Revision 1.1044 / (download) - annotate - [select for diffs], Sun Nov 5 11:16:16 2017 UTC (6 years, 11 months ago) by rpe
Branch: MAIN
Changes since 1.1043: +3 -2 lines
Diff to previous 1.1043 (colored)

Fix http server selection from the list of mirrors. This broke in
r1.989 in a way that when selecting a mirror from the list by
entering a number, the selection was not actually set as answer.

Noted by and OK tb@

Revision 1.1043 / (download) - annotate - [select for diffs], Sun Nov 5 10:29:24 2017 UTC (6 years, 11 months ago) by rpe
Branch: MAIN
Changes since 1.1042: +9 -9 lines
Diff to previous 1.1042 (colored)

Consolidate lib.so.*.a, ld.so.a and the kernel relink kit into
one location under /usr/share/relink.

Be more specific in src/etc/rc reorder_libs() what filesystems
need r/w remount and ensure that their mount state is restored.

Idea and positive feedback from deraadt@
OK aja@ tb@

Revision 1.1042 / (download) - annotate - [select for diffs], Thu Nov 2 15:35:20 2017 UTC (6 years, 11 months ago) by rpe
Branch: MAIN
Changes since 1.1041: +2 -2 lines
Diff to previous 1.1041 (colored)

Fix this test by adding _http_proto to INSTALL_MIRROR.

Revision 1.1041 / (download) - annotate - [select for diffs], Sun Oct 22 08:23:20 2017 UTC (7 years ago) by rpe
Branch: MAIN
Changes since 1.1040: +2 -2 lines
Diff to previous 1.1040 (colored)

On systems without dhclient, ask IPv4 question again if 'dhcp' was choosen.

Spotted by halex@

Revision 1.1040 / (download) - annotate - [select for diffs], Sat Oct 21 20:08:54 2017 UTC (7 years ago) by rpe
Branch: MAIN
Changes since 1.1039: +74 -33 lines
Diff to previous 1.1039 (colored)

Change v4_config() and v6_config()
- to support CIDR notation for the answers to the
  "IPv4 address for <if>?" and "IPv6 address for <if>?" questions
- to not ask for netmask and prefix lenght if CIDR is used
- to ask the questions again if ifconfig fails with the provided input

Triggered by a report from landry@.
Using ideas from sthen@
OK deraadt@ tb@

Revision 1.1039 / (download) - annotate - [select for diffs], Wed Oct 11 09:02:31 2017 UTC (7 years ago) by tb
Branch: MAIN
Changes since 1.1038: +7 -2 lines
Diff to previous 1.1038 (colored)

If $MODE.site fails, store random.seed and error out.  Based on a diff
for auto$MODE by rpe in response to a question by mpi.

ok rpe mpi

Revision 1.1038 / (download) - annotate - [select for diffs], Tue Oct 10 18:55:22 2017 UTC (7 years ago) by rpe
Branch: MAIN
Changes since 1.1037: +18 -2 lines
Diff to previous 1.1037 (colored)

Allow to boot into the existing bsd.rd and to download, verify
and upgrade to the bsd.rd of the next release.

The installer detects this bsd.rd only upgrade if the answer to
the 'Server directory?' question points to the sets of the next
release.

It then limits the set selection to the bsd.rd file, verifies it
using the on-disk signify key of the next release and makes a
backup of the existing bsd.rd before installing it.

Idea from and OK deraadt@
OK benno@

Revision 1.1037 / (download) - annotate - [select for diffs], Thu Oct 5 19:42:52 2017 UTC (7 years ago) by naddy
Branch: MAIN
Changes since 1.1036: +2 -2 lines
Diff to previous 1.1036 (colored)

When installing sets from disk, change the default answer for the question
"Is the disk partition already mounted?" from "no" to "yes".
Agreed by many.

Revision 1.1036 / (download) - annotate - [select for diffs], Wed Oct 4 18:19:33 2017 UTC (7 years ago) by tb
Branch: MAIN
Changes since 1.1035: +2 -3 lines
Diff to previous 1.1035 (colored)

Only print "done." after successful "syspatch -c".

suggested by and ok ajacoutot, mpi

Revision 1.1035 / (download) - annotate - [select for diffs], Fri Aug 25 18:21:30 2017 UTC (7 years, 2 months ago) by rpe
Branch: MAIN
CVS Tags: OPENBSD_6_2_BASE, OPENBSD_6_2
Changes since 1.1034: +2 -2 lines
Diff to previous 1.1034 (colored)

Combine the commands to fetch and extract set files with the
following if-block to extract {x}etc.tgz using the '&&' operator
to ensure proper error handling.

Fixes the case found by miod, where a failed extraction of the
base set was not properly recognized.

OK miod, tb

Revision 1.1034 / (download) - annotate - [select for diffs], Thu Aug 24 15:21:56 2017 UTC (7 years, 2 months ago) by tb
Branch: MAIN
Changes since 1.1033: +21 -1 lines
Diff to previous 1.1033 (colored)

On release installs of architectures supported by syspatch, run syspatch -c
from rc.firsttime.  If binary patches are available, users will be informed
on the console and in the rc.firsttime output mail.

Based on an idea from tj; discussed with several during t2k17.
Positive feedback and go ahead, deraadt, ajacoutot, rpe, tj.

Revision 1.1033 / (download) - annotate - [select for diffs], Fri Aug 18 16:57:48 2017 UTC (7 years, 2 months ago) by jcs
Branch: MAIN
Changes since 1.1032: +2 -2 lines
Diff to previous 1.1032 (colored)

RFC2606 gives us example.com, show that instead of another private
domain.  The non-existent "my.domain" is still offered as the
default choice which must not resolve.

ok rpe, deraadt

Revision 1.1032 / (download) - annotate - [select for diffs], Tue Aug 8 07:14:05 2017 UTC (7 years, 2 months ago) by rpe
Branch: MAIN
Changes since 1.1031: +2 -2 lines
Diff to previous 1.1031 (colored)

Fix a bug introduced in r1.1028 while switching enable_network()
from _hn to _if.

Found by Pontus Lundkvist

Revision 1.1031 / (download) - annotate - [select for diffs], Fri Jul 28 18:15:44 2017 UTC (7 years, 3 months ago) by rpe
Branch: MAIN
Changes since 1.1030: +11 -5 lines
Diff to previous 1.1030 (colored)

DEFAULTSETS, SANESETS and THESETS are set in the install.md scripts
according to the same logic for all architectures but sgi.

Consolidate setting them in one place in install.sub and incorporate
the sgi specific MDSETS and MDSANESETS.

Introduce MDSANESETS complementing MDSETS which makes the construction
of DEFAULTSETS, THESETS and SANESETS clearer in install.sub.

While here, adjust the comment about how MDSETS used now.

OK deraadt@

Revision 1.1030 / (download) - annotate - [select for diffs], Tue Jul 25 21:17:11 2017 UTC (7 years, 3 months ago) by rpe
Branch: MAIN
Changes since 1.1029: +1 -8 lines
Diff to previous 1.1029 (colored)

Finally remove backwards compat code to support the 'rtsol' keyword
in hostname.if(5)

OK mpi@ deraadt@ florian@
OK jmc@ from doc perspective

Revision 1.1029 / (download) - annotate - [select for diffs], Fri Jul 21 20:35:59 2017 UTC (7 years, 3 months ago) by rpe
Branch: MAIN
Changes since 1.1028: +6 -6 lines
Diff to previous 1.1028 (colored)

Rename _hn to AI_HOSTNAME and export it as global variable so it's
visible in the MODE.site scripts too.

This is useful for reporting back the autoinstall status at the end
of installs or upgrades from within the MODE.site scripts.

OK krw@ tb@

Revision 1.1028 / (download) - annotate - [select for diffs], Fri Jul 21 20:22:13 2017 UTC (7 years, 3 months ago) by rpe
Branch: MAIN
Changes since 1.1027: +7 -7 lines
Diff to previous 1.1027 (colored)

Align ifstart() in netstart and install.sub.

- in netstart, rename _file to _hn referencing hostname.if files
- in install.sub switch ifstart() to be used with _if instead of
  _hn as parameter

ok krw@ tb@

Revision 1.1027 / (download) - annotate - [select for diffs], Fri Jul 21 16:02:26 2017 UTC (7 years, 3 months ago) by rpe
Branch: MAIN
Changes since 1.1026: +8 -8 lines
Diff to previous 1.1026 (colored)

autoinstall(8) related global variables are prefixed with AI_.
RESPFILE -> AI_RESPFILE

OK krw@ tb@

Revision 1.1026 / (download) - annotate - [select for diffs], Thu Jul 20 19:48:13 2017 UTC (7 years, 3 months ago) by rpe
Branch: MAIN
Changes since 1.1025: +3 -3 lines
Diff to previous 1.1025 (colored)

Move the execution of the {install,upgrade}.site script to the end
of the install/upgrade process.

OK tb@

Revision 1.1025 / (download) - annotate - [select for diffs], Thu Jul 20 09:25:59 2017 UTC (7 years, 3 months ago) by anton
Branch: MAIN
Changes since 1.1024: +6 -6 lines
Diff to previous 1.1024 (colored)

Zap space between function name and parens.

ok deraadt@ rpe@ tb@

Revision 1.1024 / (download) - annotate - [select for diffs], Mon Jul 17 18:02:31 2017 UTC (7 years, 3 months ago) by rpe
Branch: MAIN
Changes since 1.1023: +2 -3 lines
Diff to previous 1.1023 (colored)

Fix IPv6 default router selection
- adjust to changed ping6 output
- tighten sed expression
- remove second sed, bsort() prints a unique list

reported by Paul de Weerd and others
prompted by a diff from Klemens Nanni
OK florian@

Revision 1.1023 / (download) - annotate - [select for diffs], Sat Jul 15 23:01:33 2017 UTC (7 years, 3 months ago) by rpe
Branch: MAIN
Changes since 1.1022: +3 -1 lines
Diff to previous 1.1022 (colored)

add comment

Revision 1.1022 / (download) - annotate - [select for diffs], Sat Jul 15 22:48:12 2017 UTC (7 years, 3 months ago) by rpe
Branch: MAIN
Changes since 1.1021: +13 -7 lines
Diff to previous 1.1021 (colored)

- remove superfluous blanks from v[46]_info() output
- tweak comments

Based on a diff from and discussions with Klemens Nanni.

Revision 1.1021 / (download) - annotate - [select for diffs], Sat Jul 15 22:35:56 2017 UTC (7 years, 3 months ago) by rpe
Branch: MAIN
Changes since 1.1020: +80 -66 lines
Diff to previous 1.1020 (colored)

Rework vlan configuration in the installer, triggered by the vlan
releated changes in ifconfig. Put the vlan configuration into its
own function vlan_config() which is called from configure_ifs().

NOTE: Depending on how you use autoinstall(8) related to vlans
(espcially if you rely on the default answers) you should check
that everything still works.

Prompted by and OK dlg@
'looks good' benno@
positive feedback tb@ deraadt@

Revision 1.1020 / (download) - annotate - [select for diffs], Fri Jul 7 16:21:34 2017 UTC (7 years, 3 months ago) by tb
Branch: MAIN
Changes since 1.1019: +3 -3 lines
Diff to previous 1.1019 (colored)

Replace a doubled period and add a blank space in front of a bracket.
From Klemens Nanni

ok rpe

Revision 1.1019 / (download) - annotate - [select for diffs], Sun Jul 2 12:45:43 2017 UTC (7 years, 3 months ago) by rpe
Branch: MAIN
Changes since 1.1018: +4 -8 lines
Diff to previous 1.1018 (colored)

Shorter version of the same.

based on a mail from Klemens Nanni on tech@

Revision 1.1018 / (download) - annotate - [select for diffs], Sun Jul 2 11:53:35 2017 UTC (7 years, 3 months ago) by rpe
Branch: MAIN
Changes since 1.1017: +2 -3 lines
Diff to previous 1.1017 (colored)

Tweak comment

Revision 1.1017 / (download) - annotate - [select for diffs], Sun Jul 2 11:52:44 2017 UTC (7 years, 3 months ago) by rpe
Branch: MAIN
Changes since 1.1016: +3 -4 lines
Diff to previous 1.1016 (colored)

NIFS is checked inside start_cgiinfo() already.
No need to do this check twice.

from Klemens Nanni

Revision 1.1016 / (download) - annotate - [select for diffs], Fri Jun 30 16:46:02 2017 UTC (7 years, 3 months ago) by rpe
Branch: MAIN
Changes since 1.1015: +17 -1 lines
Diff to previous 1.1015 (colored)

Create a unique kernel to boot from during install and upgrade.

- update the linkkit directory
- chroot and relink/install new kernel using the linkkit Makefile

Idea from and OK deraadt@
OK tb@

Revision 1.1015 / (download) - annotate - [select for diffs], Wed Jun 21 23:54:19 2017 UTC (7 years, 4 months ago) by deraadt
Branch: MAIN
Changes since 1.1014: +9 -1 lines
Diff to previous 1.1014 (colored)

/var/db/kernel.SHA256 contains the hash of the /bsd kernel.  Upon
install or upgrade, set it correctly.
diff from rpe, also thanks tb for comments and review

Revision 1.1014 / (download) - annotate - [select for diffs], Sat Jun 3 22:27:41 2017 UTC (7 years, 4 months ago) by deraadt
Branch: MAIN
Changes since 1.1013: +2 -1 lines
Diff to previous 1.1013 (colored)

After installing, chmod og-rwx {/bsd bsd.mp bsd.sp bsd.rd }
(Should we make them kmem readable?  Let's ignore that for now and see
if any issues surface).
ok tb rpe

Revision 1.1013 / (download) - annotate - [select for diffs], Wed May 31 08:02:56 2017 UTC (7 years, 4 months ago) by tb
Branch: MAIN
Changes since 1.1012: +2 -2 lines
Diff to previous 1.1012 (colored)

whitespace nit

Revision 1.1012 / (download) - annotate - [select for diffs], Wed May 31 07:55:29 2017 UTC (7 years, 4 months ago) by tb
Branch: MAIN
Changes since 1.1011: +2 -2 lines
Diff to previous 1.1011 (colored)

Change cp -pR to pax copy mode with -k when copying /etc/skel. This way
we keep existing files in the user's home directory that might have been
installed from siteXX.tgz. Found the hard way by Erling Westenvik.
Thanks to trondd for helpful analysis.

"If that's what it does, I'm all for it" halex

Revision 1.1011 / (download) - annotate - [select for diffs], Sun May 28 09:24:56 2017 UTC (7 years, 5 months ago) by rpe
Branch: MAIN
Changes since 1.1010: +19 -20 lines
Diff to previous 1.1010 (colored)

Remove _mode variable and use AI_MODE directly instead. Use the
exit code of ftp consistently to determine success of fetching the
response file.

discussed with and OK tb@

Revision 1.1010 / (download) - annotate - [select for diffs], Sat May 27 09:05:18 2017 UTC (7 years, 5 months ago) by zhuk
Branch: MAIN
Changes since 1.1009: +2 -3 lines
Diff to previous 1.1009 (colored)

De-duplicate sets selection instructions, and give a short example.
Still one lines shorter.

Input and okay from tedu@ and deraadt@; also a "weak" okay from sthen@.

Revision 1.1009 / (download) - annotate - [select for diffs], Thu May 25 12:10:04 2017 UTC (7 years, 5 months ago) by rpe
Branch: MAIN
Changes since 1.1008: +17 -12 lines
Diff to previous 1.1008 (colored)

Move the code that runs the installer script in non-interactive
mode into a dedicated do_autoinstall() function.

OK halex@, krw@

Revision 1.1008 / (download) - annotate - [select for diffs], Thu May 25 08:25:00 2017 UTC (7 years, 5 months ago) by rpe
Branch: MAIN
Changes since 1.1007: +17 -18 lines
Diff to previous 1.1007 (colored)

Replace various echo "..."; exit 1 with a new err_exit() function.

diskussed with tb@ and halex@
OK krw@ on a similar diff

Revision 1.1007 / (download) - annotate - [select for diffs], Mon May 22 19:03:24 2017 UTC (7 years, 5 months ago) by rpe
Branch: MAIN
Changes since 1.1006: +3 -4 lines
Diff to previous 1.1006 (colored)

The DISPLAY variable is actually not a global variable as it's used
only once in questions(). Use scan_dmesg() output directly to test
for wsdisplay* in dmesg.boot instead.

Change comment, now that it only refers to setting CONSOLE.

no objection tb@

Revision 1.1006 / (download) - annotate - [select for diffs], Mon May 22 17:15:52 2017 UTC (7 years, 5 months ago) by rpe
Branch: MAIN
Changes since 1.1005: +1 -2 lines
Diff to previous 1.1005 (colored)

No need to trim a trailling blank, bsort (in scan_dmesg) does not
emit one anymore.

Revision 1.1005 / (download) - annotate - [select for diffs], Sun May 21 09:09:58 2017 UTC (7 years, 5 months ago) by rpe
Branch: MAIN
Changes since 1.1004: +17 -17 lines
Diff to previous 1.1004 (colored)

Ensure a clean initial state (e.g. in case of an installer restart)
by moving setting ulimit, unmounting all filesystems and cleaning up
the dhcp state upwards to before sourcing install.md.

OK tb@

While here, 1>/dev/null -> >/dev/null.

Revision 1.1004 / (download) - annotate - [select for diffs], Mon May 15 17:12:25 2017 UTC (7 years, 5 months ago) by rpe
Branch: MAIN
Changes since 1.1003: +4 -5 lines
Diff to previous 1.1003 (colored)

- export EDITOR and COLUMNS on assignment
- move EDITOR into the block of global variables and export
- break long line in COLUMNS assignment

Revision 1.1003 / (download) - annotate - [select for diffs], Mon May 15 17:02:48 2017 UTC (7 years, 5 months ago) by rpe
Branch: MAIN
Changes since 1.1002: +10 -12 lines
Diff to previous 1.1002 (colored)

- move NIFS into the block of global variables
- sort global variable block alphabetically

Revision 1.1002 / (download) - annotate - [select for diffs], Mon May 15 16:55:53 2017 UTC (7 years, 5 months ago) by rpe
Branch: MAIN
Changes since 1.1001: +34 -28 lines
Diff to previous 1.1001 (colored)

- Move the dmesg listener code into it's own start_dmesg_listener() function.
- Add -f option to rm in unlock() to be able to use it in the new function.

OK halex@, krw@, tb@

Revision 1.1001 / (download) - annotate - [select for diffs], Sat May 6 06:49:12 2017 UTC (7 years, 5 months ago) by rpe
Branch: MAIN
Changes since 1.1000: +2 -2 lines
Diff to previous 1.1000 (colored)

Add build to the list of usernames that are rejected during
installation.

Noted by crd _at_ crdavies.eu
OK tb@

Revision 1.1000 / (download) - annotate - [select for diffs], Mon May 1 14:29:39 2017 UTC (7 years, 5 months ago) by rpe
Branch: MAIN
Changes since 1.999: +1 -3 lines
Diff to previous 1.999 (colored)

Apply same change of defaultroute handling as in r1.179 of netstart.

Now that routes are automatically G/C with the address they are
attached to there's no reason to duplicate the kernel's job.

Revision 1.999 / (download) - annotate - [select for diffs], Mon May 1 14:22:36 2017 UTC (7 years, 5 months ago) by rpe
Branch: MAIN
Changes since 1.998: +10 -8 lines
Diff to previous 1.998 (colored)

Remove last remnants of rtsol. IPv6 autoconfiguration of interfaces
is now done in ifstart(). Replace rtsolif with a boolean variable
V6_AUTOCONF. Replace dhcpif with a boolean variable V4_DHCPCONF.
Both are later used to decide whether or not to configre defaultroutes
from /etc/mygate.

OK krw@

Revision 1.998 / (download) - annotate - [select for diffs], Tue Apr 25 19:24:05 2017 UTC (7 years, 6 months ago) by rpe
Branch: MAIN
Changes since 1.997: +3 -1 lines
Diff to previous 1.997 (colored)

Unbreak multiple interface configurations like trunk or carp. Ensure
that the noglob option is disabled at the end of parse_hn_line()
and ifstart().

Revision 1.997 / (download) - annotate - [select for diffs], Mon Apr 24 20:27:59 2017 UTC (7 years, 6 months ago) by rpe
Branch: MAIN
Changes since 1.996: +88 -100 lines
Diff to previous 1.996 (colored)

Introduce a new function parse_hn_line() that replaces the existing
hostname.if(5) parsing code in ifstart().

- change v6_config()
  - replace rtsol with autoconf in "IPv6 addres for <if>" question
  - write 'inet6 autoconf" to hostname.if file instead of rtsol
- add parse_hn_line() function with installer specific changes
  - skip shell command and bridge config lines
  - skip inet6 config (incl. dest lines) if there's no inet6 support
  - skip dhcp config if there's no dhclient
- change ifstart() to use parse_hn_line()

Discussed with and positive feedback from many
'commit' deraadt@
conditional OK sthen@ (untested)

Revision 1.996 / (download) - annotate - [select for diffs], Tue Apr 11 19:23:10 2017 UTC (7 years, 6 months ago) by rpe
Branch: MAIN
Changes since 1.995: +2 -2 lines
Diff to previous 1.995 (colored)

Ensure that the version part of $_url_base is correctly removed by
using $VNAME (x.y) instead of $VERSION (xy). This fixes the problem
that the version part ended up in installurl which is wrong anyway
and also confuses pkg_add.

Thanks to florian@ and trondd at kagu-tsuchi dot com for reporting
this.

OK tb@

Revision 1.995 / (download) - annotate - [select for diffs], Fri Apr 7 22:53:25 2017 UTC (7 years, 6 months ago) by rpe
Branch: MAIN
Changes since 1.994: +13 -9 lines
Diff to previous 1.994 (colored)

Minimize differences in ifstart() function between netstart and
install.sub which makes it easier to spot changes in the future.

- comments and formatting
- quotes on assignments are not needed (netstart)
- remove stray space in test (netstart)
- use $file variable with while-loop (netstart)
- although valid, instead of i use $i in arithmetic test (install.sub)

OK krw@, tb@
Looks good deraadt@

Revision 1.994 / (download) - annotate - [select for diffs], Fri Apr 7 22:15:17 2017 UTC (7 years, 6 months ago) by rpe
Branch: MAIN
Changes since 1.993: +10 -11 lines
Diff to previous 1.993 (colored)

Align comments of ifstart() function in netstart and install.sub.

Revision 1.993 / (download) - annotate - [select for diffs], Fri Apr 7 22:02:29 2017 UTC (7 years, 6 months ago) by rpe
Branch: MAIN
Changes since 1.992: +6 -6 lines
Diff to previous 1.992 (colored)

Sync variable names with netstart version of stripcom().
Use $_file variable instead of $1 with the wile-loop.

Revision 1.992 / (download) - annotate - [select for diffs], Fri Apr 7 21:44:07 2017 UTC (7 years, 6 months ago) by rpe
Branch: MAIN
Changes since 1.991: +4 -3 lines
Diff to previous 1.991 (colored)

Align comments of stripcom() function in netstart and install.sub.

Revision 1.991 / (download) - annotate - [select for diffs], Fri Apr 7 21:00:42 2017 UTC (7 years, 6 months ago) by rpe
Branch: MAIN
Changes since 1.990: +15 -8 lines
Diff to previous 1.990 (colored)

Extend the information shown by diskinfo() to help to identify
disks. Extract the disk information enclosed in <> and the NAA
from the last matching dmesg line. Useful if there are multiple
identically sized disk of the same type.

Suggested by jirib at devio dot us
Discussed with deraadt@

Revision 1.990 / (download) - annotate - [select for diffs], Tue Apr 4 17:50:45 2017 UTC (7 years, 6 months ago) by rpe
Branch: MAIN
Changes since 1.989: +2 -2 lines
Diff to previous 1.989 (colored)

Ensure, that during upgrades, the default for the "Location of sets"
question is set to http if /etc/installurl exists and override the
install method information from the cgi server.

'makes sense' deraadt@

Revision 1.989 / (download) - annotate - [select for diffs], Fri Mar 31 18:36:49 2017 UTC (7 years, 6 months ago) by rpe
Branch: MAIN
CVS Tags: OPENBSD_6_1_BASE, OPENBSD_6_1
Changes since 1.988: +36 -22 lines
Diff to previous 1.988 (colored)

The default for the "Server directory?" question can possibly come
from either what information is extracted from the cgi server or
from installurl(5). Otherwise a sane default is used.

Based on what server (HTTP_SERVER) is provided by the user decide
on what source to choose from for the default.

At the end of install_http() use the url from the cgi server as the
base for what's written to /etc/installurl if an official mirror was
used. Otherwise trim _url_base and remove the architecture and
snapshots or version part.

This fixes the problem reported by phessler@ which exposed how
fragile the current logic for this was after recent changes.

At this time of the release cycle the kernel presents itself as
release kernel, but we're still pre-release and the sets are still
in the snapshots directory on the mirrors. This was confusing the
installer script.

Thanks to phessler@ for finding this and testing.
Special thanks to tb@ who imposed on himself to try to understand
and review the diffs.

OK tb@, phessler@ (on a similar diff)
'commit when your are happy' deraadt@

Revision 1.988 / (download) - annotate - [select for diffs], Mon Mar 13 17:08:31 2017 UTC (7 years, 7 months ago) by rpe
Branch: MAIN
Changes since 1.987: +2 -2 lines
Diff to previous 1.987 (colored)

Remove leading slashes from response to ensure a proper url.

Feedback and OK halex@ tb@

Revision 1.987 / (download) - annotate - [select for diffs], Fri Mar 10 22:34:09 2017 UTC (7 years, 7 months ago) by rpe
Branch: MAIN
Changes since 1.986: +6 -1 lines
Diff to previous 1.986 (colored)

Add a comment why INSTALL_MIRROR must not become a local variable
although it's only used in install_http() now.

Revision 1.986 / (download) - annotate - [select for diffs], Fri Mar 10 22:11:28 2017 UTC (7 years, 7 months ago) by rpe
Branch: MAIN
Changes since 1.985: +2 -3 lines
Diff to previous 1.985 (colored)

In a scenario, where the distribution sets are fetched from a mirror
and the siteXX.tgz file is fetched from a local server, ensure that
the mirror server ends up in /etc/installurl.

joint work with and OK tb@

Revision 1.985 / (download) - annotate - [select for diffs], Fri Mar 10 22:02:59 2017 UTC (7 years, 7 months ago) by rpe
Branch: MAIN
Changes since 1.984: +2 -2 lines
Diff to previous 1.984 (colored)

Search case-insensitive for HTTP_SERVER in the ftplist.cgi output.
This ensures that ftp.OpenBSD.org is detected as mirror if
ftp.openbsd.org is specified as set location.

noticed by tj@
joint work with and OK tb@

Revision 1.984 / (download) - annotate - [select for diffs], Fri Mar 10 19:04:17 2017 UTC (7 years, 7 months ago) by rpe
Branch: MAIN
Changes since 1.983: +3 -2 lines
Diff to previous 1.983 (colored)

Explain more accurately why to remember the sets location.

noted by tb@

Revision 1.983 / (download) - annotate - [select for diffs], Fri Mar 10 17:40:26 2017 UTC (7 years, 7 months ago) by rpe
Branch: MAIN
Changes since 1.982: +3 -4 lines
Diff to previous 1.982 (colored)

Always create the installurl(5) file during installation and upgrade
if it does not yet exist. Before it was created only when a mirror
server was used.

suggested by deraadt@
OK halex@ tb@

Revision 1.982 / (download) - annotate - [select for diffs], Mon Mar 6 22:10:14 2017 UTC (7 years, 7 months ago) by rpe
Branch: MAIN
Changes since 1.981: +14 -12 lines
Diff to previous 1.981 (colored)

Localize the 'hn' and 'if' variables in enable_network().
Document why renaming the 'if' variable in ifstart() is not allowed.

OK tb@, krw@

Revision 1.981 / (download) - annotate - [select for diffs], Sun Mar 5 19:31:15 2017 UTC (7 years, 7 months ago) by rpe
Branch: MAIN
Changes since 1.980: +8 -4 lines
Diff to previous 1.980 (colored)

Stop using and copying the on-disk /etc/hosts file to the bsd.rd
/tmp dir during upgrade.

Create and use a minimal hosts file instead to avoid that a big
hosts file fills up the small bsd.rd / filesystem as reported
recently by Ted Roby.

Note that network interface configuration using hostnames instead
of ip addresses in hostname.if(5) relies on the on-disk /etc/hosts
file which is not used anymore during upgrade.

discussed with many
ok tb@, halex@
'sure' deraadt@

Revision 1.980 / (download) - annotate - [select for diffs], Wed Mar 1 20:48:12 2017 UTC (7 years, 7 months ago) by rpe
Branch: MAIN
Changes since 1.979: +6 -3 lines
Diff to previous 1.979 (colored)

Comments ...

Revision 1.979 / (download) - annotate - [select for diffs], Tue Feb 28 19:42:38 2017 UTC (7 years, 8 months ago) by rpe
Branch: MAIN
Changes since 1.978: +4 -3 lines
Diff to previous 1.978 (colored)

Create the /etc/installurl file during upgrade too if a mirror was
used and if the file did not yet exist.

discussed with aja@ and deraadt@
OK tb@ aja@

Revision 1.978 / (download) - annotate - [select for diffs], Tue Feb 28 18:32:15 2017 UTC (7 years, 8 months ago) by rpe
Branch: MAIN
Changes since 1.977: +4 -1 lines
Diff to previous 1.977 (colored)

Modify the logic to determine the default answer for the "Location
of sets?" question.  Present 'http' as the default answer if
/etc/installurl exists.  This fixes the issue noted by aja@ and
espie@ that 'cd' was always overriding 'http'.

OK aja@

Revision 1.977 / (download) - annotate - [select for diffs], Mon Feb 27 22:02:09 2017 UTC (7 years, 8 months ago) by rpe
Branch: MAIN
Changes since 1.976: +4 -1 lines
Diff to previous 1.976 (colored)

Sync comments about install.md variables with reality.

Revision 1.976 / (download) - annotate - [select for diffs], Sun Feb 26 16:51:18 2017 UTC (7 years, 8 months ago) by matthieu
Branch: MAIN
Changes since 1.975: +4 -4 lines
Diff to previous 1.975 (colored)

Switch to xenodm(1).

Do it now deraadt@

Revision 1.975 / (download) - annotate - [select for diffs], Sat Feb 25 12:57:03 2017 UTC (7 years, 8 months ago) by rpe
Branch: MAIN
Changes since 1.974: +5 -5 lines
Diff to previous 1.974 (colored)

Localize _OPT as it is not used as a global variable.

OK tb@

Revision 1.974 / (download) - annotate - [select for diffs], Sun Feb 19 17:53:58 2017 UTC (7 years, 8 months ago) by tb
Branch: MAIN
Changes since 1.973: +2 -2 lines
Diff to previous 1.973 (colored)

Remove an unfortunate significant trailing whitespace that ended up passing
a bogus argument to ftp(1), disabling redirection and running ftp(1) in the
background.

ok rpe

Revision 1.973 / (download) - annotate - [select for diffs], Tue Feb 14 22:23:04 2017 UTC (7 years, 8 months ago) by rpe
Branch: MAIN
Changes since 1.972: +20 -20 lines
Diff to previous 1.972 (colored)

These variables are global so use uppercase and rename sshd and xdm
to START_SSHD and START_XDM to better match their purpose.

aperture -> APERTURE
defcons -> DEFCONS
ssh_enableroot -> SSHD_ENABLEROOT
sshd -> START_SSHD
xdm -> START_XDM

OK krw@, tb@

Revision 1.972 / (download) - annotate - [select for diffs], Tue Feb 14 22:05:13 2017 UTC (7 years, 8 months ago) by rpe
Branch: MAIN
Changes since 1.971: +2 -2 lines
Diff to previous 1.971 (colored)

Fix comment.

Revision 1.971 / (download) - annotate - [select for diffs], Tue Feb 14 22:03:01 2017 UTC (7 years, 8 months ago) by rpe
Branch: MAIN
Changes since 1.970: +32 -32 lines
Diff to previous 1.970 (colored)

Rename functions to match the predominantly used verb_noun naming scheme
and to improve readability.

addhostent -> add_hostent
askpass -> ask_pass
askpassword -> ask_password
makedev -> make_dev
showcols -> show_cols
startcgiinfo -> start_cgiinfo
waitcgiinfo -> wait_cgiinfo

OK krw@, tb@

Revision 1.970 / (download) - annotate - [select for diffs], Sun Feb 12 08:58:30 2017 UTC (7 years, 8 months ago) by landry
Branch: MAIN
Changes since 1.969: +1 -2 lines
Diff to previous 1.969 (colored)

In autoinstall, no need to create /mnt/root/.ssh if the install script
provided an ssh public key, the directory is in the base set now.

From tb@, discussed with rpe@ and tb@

Revision 1.969 / (download) - annotate - [select for diffs], Wed Feb 8 23:13:02 2017 UTC (7 years, 8 months ago) by rpe
Branch: MAIN
Changes since 1.968: +7 -4 lines
Diff to previous 1.968 (colored)

Add even more line breaks to fit to 80 columns.

Revision 1.968 / (download) - annotate - [select for diffs], Wed Feb 8 22:56:01 2017 UTC (7 years, 8 months ago) by rpe
Branch: MAIN
Changes since 1.967: +4 -3 lines
Diff to previous 1.967 (colored)

Use a variable to make the prompt fit to 80 columns.

Revision 1.967 / (download) - annotate - [select for diffs], Wed Feb 8 22:43:37 2017 UTC (7 years, 8 months ago) by rpe
Branch: MAIN
Changes since 1.966: +11 -6 lines
Diff to previous 1.966 (colored)

Add some more line breaks to fit to 80 columns.

Revision 1.966 / (download) - annotate - [select for diffs], Wed Feb 8 22:29:39 2017 UTC (7 years, 8 months ago) by rpe
Branch: MAIN
Changes since 1.965: +7 -4 lines
Diff to previous 1.965 (colored)

Add some line breaks to fit to 80 columns.

Revision 1.965 / (download) - annotate - [select for diffs], Wed Feb 8 22:16:49 2017 UTC (7 years, 8 months ago) by rpe
Branch: MAIN
Changes since 1.964: +3 -3 lines
Diff to previous 1.964 (colored)

Localize PS3 at the top of v6_defroute() to make its assignment
fit to 80 columns.

Revision 1.964 / (download) - annotate - [select for diffs], Wed Feb 8 22:04:03 2017 UTC (7 years, 8 months ago) by rpe
Branch: MAIN
Changes since 1.963: +3 -3 lines
Diff to previous 1.963 (colored)

Use a variable for the sysctl output to shorten the for-loop to
fit to 80 columns.

Revision 1.963 / (download) - annotate - [select for diffs], Wed Feb 8 21:35:18 2017 UTC (7 years, 8 months ago) by rpe
Branch: MAIN
Changes since 1.962: +11 -6 lines
Diff to previous 1.962 (colored)

Reformat get_responsfile() to fit to 80 columns.

Revision 1.962 / (download) - annotate - [select for diffs], Sun Feb 5 19:29:32 2017 UTC (7 years, 8 months ago) by rpe
Branch: MAIN
Changes since 1.961: +19 -10 lines
Diff to previous 1.961 (colored)

Reformat and adapt install_http() to fit to 80 columns.

OK krw@, tb@

Revision 1.961 / (download) - annotate - [select for diffs], Sun Feb 5 15:39:52 2017 UTC (7 years, 8 months ago) by rpe
Branch: MAIN
Changes since 1.960: +2 -2 lines
Diff to previous 1.960 (colored)

Curly brackets are not needed here.

Revision 1.960 / (download) - annotate - [select for diffs], Sun Feb 5 14:57:15 2017 UTC (7 years, 8 months ago) by rpe
Branch: MAIN
Changes since 1.959: +7 -5 lines
Diff to previous 1.959 (colored)

Rename rootpass to _rootpass and localize it together with _rootkey.

Revision 1.959 / (download) - annotate - [select for diffs], Sun Feb 5 14:40:16 2017 UTC (7 years, 8 months ago) by rpe
Branch: MAIN
Changes since 1.958: +22 -22 lines
Diff to previous 1.958 (colored)

user, username, userpass and userkey are global variables. The user
created during install is added to the wheel group and as such is
actually an admin user. So use ADMIN, ADMIN_NAME, ADMIN_PASS and
ADMIN_KEY instead.

OK tb@
OK krw@ on a similar diff

Revision 1.958 / (download) - annotate - [select for diffs], Tue Jan 24 10:14:14 2017 UTC (7 years, 9 months ago) by rpe
Branch: MAIN
Changes since 1.957: +5 -5 lines
Diff to previous 1.957 (colored)

ftplist.cgi provides the http server from previous installs as the
first line of its output. In contrast to the rest of the list of
mirror servers, this first line does not have any location info.

Only use this first line as default answer, if it has no location
info.

OK krw@

Revision 1.957 / (download) - annotate - [select for diffs], Tue Jan 24 10:06:21 2017 UTC (7 years, 9 months ago) by rpe
Branch: MAIN
Changes since 1.956: +8 -2 lines
Diff to previous 1.956 (colored)

Don't allow any control and space characters in the answer to the
"System hostname" question.

OK tb@ krw@
'sure' deraadt@
positive feedback on the idea halex@

Revision 1.956 / (download) - annotate - [select for diffs], Mon Jan 23 02:14:45 2017 UTC (7 years, 9 months ago) by rpe
Branch: MAIN
Changes since 1.955: +7 -1 lines
Diff to previous 1.955 (colored)

Clean up possible leftover prefetch area in case of installer restarts.

OK tb@

Revision 1.955 / (download) - annotate - [select for diffs], Mon Jan 23 02:11:30 2017 UTC (7 years, 9 months ago) by rpe
Branch: MAIN
Changes since 1.954: +5 -9 lines
Diff to previous 1.954 (colored)

Export AI_MAC and AI_SERVER in addition to AI_MODE so they're visible
in the install.site and upgrade.site scripts.

OK tb@

Revision 1.954 / (download) - annotate - [select for diffs], Sun Jan 22 23:38:30 2017 UTC (7 years, 9 months ago) by rpe
Branch: MAIN
Changes since 1.953: +2 -2 lines
Diff to previous 1.953 (colored)

Ensure the right hand side of the test is not treated as pattern.

OK tb@

Revision 1.953 / (download) - annotate - [select for diffs], Sun Jan 22 23:37:37 2017 UTC (7 years, 9 months ago) by rpe
Branch: MAIN
Changes since 1.952: +4 -4 lines
Diff to previous 1.952 (colored)

= -> == inside [[ ]] tests.

Revision 1.952 / (download) - annotate - [select for diffs], Sun Jan 22 23:23:23 2017 UTC (7 years, 9 months ago) by rpe
Branch: MAIN
Changes since 1.951: +62 -22 lines
Diff to previous 1.951 (colored)

Unobscure the installer script code a bit by adding and rewording comments.

Revision 1.951 / (download) - annotate - [select for diffs], Sun Jan 22 22:47:11 2017 UTC (7 years, 9 months ago) by rpe
Branch: MAIN
Changes since 1.950: +3 -3 lines
Diff to previous 1.950 (colored)

Prefix local variables with '_'.

Revision 1.950 / (download) - annotate - [select for diffs], Sun Jan 22 03:30:23 2017 UTC (7 years, 9 months ago) by rpe
Branch: MAIN
Changes since 1.949: +21 -13 lines
Diff to previous 1.949 (colored)

Tweak previous ...
- remove the unsued _err variable
- rework the extraction of the mirror dir info from HTTP_LIST
- use INSTALL_MIRROR to save the mirror info from HTTP_LIST
- use _http_proto to for the final INSTALL_URL if it's a mirror
- assign the correct info to INSTALL_URL
- write INSTALL_URL to /etc/installurl on install if a mirror was used

Feedback and OK tb@
'Looks good' deraadt@

Revision 1.949 / (download) - annotate - [select for diffs], Sat Jan 21 04:33:00 2017 UTC (7 years, 9 months ago) by rpe
Branch: MAIN
Changes since 1.948: +20 -21 lines
Diff to previous 1.948 (colored)

Start creating and using /etc/installurl. This file is created
during installation if an OpenBSD mirror server is used for the
sets download. It contains the mirror server url in the same format
as provided by ftplist.cgi.

The installurl file is used by the OpenBSD installer, the syspatch(8)
and the pkg_add(1) commands.

Stop creating and updating the /etc/pkg.conf file - the pkg_add(1)
command will use the information in installurl.

Use a new dbversion of the CGIs which accecpt and provide mirror
urls without the release/arch part at the end..

Idea from ajacoutot@
Joint work with and OK ajacoutot@ tb@ beck@ deraadt@

Revision 1.948 / (download) - annotate - [select for diffs], Fri Jan 20 23:14:52 2017 UTC (7 years, 9 months ago) by rpe
Branch: MAIN
Changes since 1.947: +5 -6 lines
Diff to previous 1.947 (colored)

Use a global variable PUB_KEY for the location of the key file.

OK tb@ krw@

Revision 1.947 / (download) - annotate - [select for diffs], Wed Jan 11 20:43:46 2017 UTC (7 years, 9 months ago) by tb
Branch: MAIN
Changes since 1.946: +3 -4 lines
Diff to previous 1.946 (colored)

Eliminate an error message by checking whether /tmp/i/hosts exists before
calling sed -i on it.  While there, use a stricter regular expression, as
suggested by halex.

Problem reported by Pedro Caetano.
ok mestre, halex; ok rpe for earlier version without regex tweak

Revision 1.946 / (download) - annotate - [select for diffs], Wed Jan 11 10:57:12 2017 UTC (7 years, 9 months ago) by ajacoutot
Branch: MAIN
Changes since 1.945: +2 -2 lines
Diff to previous 1.945 (colored)

typo: verfied -> verified

ok jmc@

Revision 1.945 / (download) - annotate - [select for diffs], Tue Jan 10 17:50:58 2017 UTC (7 years, 9 months ago) by deraadt
Branch: MAIN
Changes since 1.944: +2 -2 lines
Diff to previous 1.944 (colored)

whitespace

Revision 1.944 / (download) - annotate - [select for diffs], Tue Jan 10 00:15:16 2017 UTC (7 years, 9 months ago) by bluhm
Branch: MAIN
Changes since 1.943: +3 -3 lines
Diff to previous 1.943 (colored)

When installing with a dhcp server that does not provide domain-name
and name-server information, the user was not asked for this
configuration.  Do not assign a default value to _dn and _ns before
the values are checked with -n in donetconfig().
Fix from halex@; tested and OK rpe@

Revision 1.943 / (download) - annotate - [select for diffs], Mon Jan 9 19:42:32 2017 UTC (7 years, 9 months ago) by rpe
Branch: MAIN
Changes since 1.942: +48 -28 lines
Diff to previous 1.942 (colored)

Use a verified list of distribution set files extracted from
the SHA256.sig file which is signed by the OpenBSD project.
Deny the use of mirror servers where the verification fails.

Site specifc sets (siteXX.tgz and siteXX-hostname.tgz) or self
compiled sets in local setups are still supported by using the
index.txt file. Files listed in SHA256.sig override any file
listed in index.txt.

Support http://server and https://server as answers to the
"HTTP Server?" question. This allows a user to control the
logic used to download the set files on architectures that
have tls support for ftp(1).

'server' --> Use https for the sets download. If the server
does not support https, fall back to http but only after
user confirmation.

'https://server'--> Use https only for the sets download.

'http://server' --> Use http only for the sets download.

NOTE: If the autoinstall(8) feature is used, the installer
aborts the installation or upgrade in the following cases:
- a mirror server provides an invalid SHA256.sig file
- 'server' is used, https fails and the question to confirm
  the fallback to http is not answered in the response file.
- 'https://server' is used but ftp(1) has no tls support.
- 'https://server' is used but not supported by the server.

Suggested by, in joint work with and OK deraadt@
Feedback, testing and OK tb@
positive feedback halex@ for the http/https part

Revision 1.942 / (download) - annotate - [select for diffs], Wed Jan 4 13:47:29 2017 UTC (7 years, 9 months ago) by rpe
Branch: MAIN
Changes since 1.941: +5 -1 lines
Diff to previous 1.941 (colored)

Support https for the url to the autopartitioning template for
disklabel on platforms that have tls enabled ftp(1) including
error handling in case ftp(1) doesn't have it.

OK tb@ halex@

Revision 1.941 / (download) - annotate - [select for diffs], Wed Jan 4 13:39:52 2017 UTC (7 years, 9 months ago) by rpe
Branch: MAIN
Changes since 1.940: +4 -4 lines
Diff to previous 1.940 (colored)

Enforce https for connections to ftplist.cgi and ftpinstall.cgi on
platforms that have tls enabled ftp(1).

OK tb@

Revision 1.940 / (download) - annotate - [select for diffs], Tue Jan 3 19:33:48 2017 UTC (7 years, 9 months ago) by rpe
Branch: MAIN
Changes since 1.939: +37 -6 lines
Diff to previous 1.939 (colored)

Add https support to the OpenBSD installer.

The sets are downloaded using https per default. If the server does
not support https, the installer offers falling back to http after
asking for confirmation.

NOTE: Depending on the setup, people using autoinstall(8) might
need to add this new installer question to the response file.

   Unable to connect using https. Use http instead = yes|no

Joint work with and 'go for it' from deraadt@
Tested from and OK tb@
Feedback and OK for the approach halex@

Revision 1.939 / (download) - annotate - [select for diffs], Fri Dec 30 22:59:12 2016 UTC (7 years, 9 months ago) by rpe
Branch: MAIN
Changes since 1.938: +9 -5 lines
Diff to previous 1.938 (colored)

Switch the connection to ftp.openbsd.org from using the ip address
to hostname as preparation for an upcoming change.

But to ensure proper name resolution in case dns is not available
yet, add an entry to the hosts file. After an installation, remove
it so it does not end up in the final hosts file. Not needed for
upgrades because the file is not copied to the upgraded system.

OK deraadt@

Revision 1.938 / (download) - annotate - [select for diffs], Wed Dec 28 11:11:13 2016 UTC (7 years, 10 months ago) by rpe
Branch: MAIN
Changes since 1.937: +5 -3 lines
Diff to previous 1.937 (colored)

Replace literal ^M with $(echo '\r') to avoid cluttering diffs.

OK halex@
fine for deraadt@

Revision 1.937 / (download) - annotate - [select for diffs], Tue Dec 27 09:17:52 2016 UTC (7 years, 10 months ago) by jca
Branch: MAIN
Changes since 1.936: +2 -2 lines
Diff to previous 1.936 (colored)

Remove user uucp and group news from base.

Revision 1.936 / (download) - annotate - [select for diffs], Mon Dec 19 19:59:38 2016 UTC (7 years, 10 months ago) by rpe
Branch: MAIN
Changes since 1.935: +2 -2 lines
Diff to previous 1.935 (colored)

Revert r1.934 to unbreak autoinstall

Revision 1.935 / (download) - annotate - [select for diffs], Mon Dec 19 18:52:54 2016 UTC (7 years, 10 months ago) by rpe
Branch: MAIN
Changes since 1.934: +12 -6 lines
Diff to previous 1.934 (colored)

- no need to export the TERM variable twice
- re-format case-block
- unquote single word default answer
- use 'break' instead of return to leave (same effect here, but
  needed later when the function is no function anymore)
- use -q option with kbd to limit output to warnings/errors only

discussed with and OK krw@ tb@

Revision 1.934 / (download) - annotate - [select for diffs], Sun Dec 18 18:15:14 2016 UTC (7 years, 10 months ago) by rpe
Branch: MAIN
Changes since 1.933: +2 -2 lines
Diff to previous 1.933 (colored)

Split _issue msg and "Continue without verification?" question.

Prodded by and OK aja@
OK halex@ krw@

Revision 1.933 / (download) - annotate - [select for diffs], Fri Nov 25 21:13:58 2016 UTC (7 years, 11 months ago) by rpe
Branch: MAIN
Changes since 1.932: +9 -7 lines
Diff to previous 1.932 (colored)

The build systems now uses the user build and the group wobj.
Add them to bsd.rd and set the ownership and permissions of
/usr/obj and /usr/xobj accordingly.

feedback and OK tb@
Looks good deraadt@

Revision 1.932 / (download) - annotate - [select for diffs], Thu Nov 24 14:35:43 2016 UTC (7 years, 11 months ago) by krw
Branch: MAIN
Changes since 1.931: +2 -3 lines
Diff to previous 1.931 (colored)

Don't manually add a route to an alias IP via 127.0.0.1. This is
now automatically handled by the kernel.

The same change was made to /etc/netstart in 5.5 with r1.139.

Should fix the (U)pgrade problem reported on bugs@ by Clint Pachl.

ok mpi@

Revision 1.931 / (download) - annotate - [select for diffs], Mon Nov 14 21:34:39 2016 UTC (7 years, 11 months ago) by rpe
Branch: MAIN
Changes since 1.930: +6 -3 lines
Diff to previous 1.930 (colored)

Ensure, that the root disk question is added to the response file
mail.

found by and OK tb@
OK halex@ krw@

Revision 1.930 / (download) - annotate - [select for diffs], Sat Nov 5 09:14:36 2016 UTC (7 years, 11 months ago) by rpe
Branch: MAIN
Changes since 1.929: +12 -2 lines
Diff to previous 1.929 (colored)

Remove the obj, xobj and src directories from the base set.
The installer will create these directories during install.
So local setups will not get overwritten during upgrades.

idea from and OK deraadt@
with help from and OK tb@
feedback from and no objections halex@

Revision 1.929 / (download) - annotate - [select for diffs], Sun Oct 30 13:27:05 2016 UTC (7 years, 11 months ago) by rpe
Branch: MAIN
Changes since 1.928: +14 -11 lines
Diff to previous 1.928 (colored)

Search for and create a prefetch area only for nonlocal sources.

This enables the installer to verify local set files even if the
prefetch area would not fit on the local disk.

OK krw@ on a similar diff
Idea from and OK naddy@
Feedback and OK tb@

Revision 1.928 / (download) - annotate - [select for diffs], Sat Oct 29 18:36:12 2016 UTC (8 years ago) by rpe
Branch: MAIN
Changes since 1.927: +6 -3 lines
Diff to previous 1.927 (colored)

Fix an issue found by naddy@ where the installer was not able
to fetch local sets without a SHA256.sig file in a directory
unreachable by the unprivileged users. The missing SHA256.sig
file caused an early exit from the for-loop where the _unpriv
variable is unset in case of local sets.

- Move the check of the set location (local/net) to the top
- Set the ftp command title based on the _srclocal variable
- Remove the now unnecessary second _unpriv=

OK naddy@

Revision 1.927 / (download) - annotate - [select for diffs], Fri Oct 28 17:07:34 2016 UTC (8 years ago) by rpe
Branch: MAIN
Changes since 1.926: +12 -11 lines
Diff to previous 1.926 (colored)

- move SHA256 SHA256.sig h fail from _tmpsrc to /tmp
- cleanup SHA256 and SHA256.sig before download
- move assignment of _cfile and _srclocal to the top

In a later step, this allows verification of local sets without the
need of a prefetch area which is not used in this case anyway.

Idea from and OK naddy@
OK krw@

Revision 1.926 / (download) - annotate - [select for diffs], Sun Oct 23 08:42:58 2016 UTC (8 years ago) by rpe
Branch: MAIN
Changes since 1.925: +3 -3 lines
Diff to previous 1.925 (colored)

Exit autoinstall in case of missing / or duplicate mountpoints.
This also covers the case when a template is rejected by disklabel.

OK krw

Revision 1.925 / (download) - annotate - [select for diffs], Sun Oct 9 10:20:53 2016 UTC (8 years ago) by rpe
Branch: MAIN
Changes since 1.924: +8 -7 lines
Diff to previous 1.924 (colored)

Re-enable fetching sets from local sources (disk, cdrom, nfs) as root.
It's the users responsibility to ensure the integrity of these files!

Problem found by Laurence Tratt who placed the sets in his home dir
where the unprivileged users now used by the installer weren't able
to read them from.

discussed with deraadt@
OK krw@

Revision 1.924 / (download) - annotate - [select for diffs], Sun Sep 25 15:48:15 2016 UTC (8 years, 1 month ago) by rpe
Branch: MAIN
Changes since 1.923: +32 -23 lines
Diff to previous 1.923 (colored)

Tweak/add comments.

with input from and OK tb
OK halex krw

Revision 1.923 / (download) - annotate - [select for diffs], Sun Sep 25 06:06:52 2016 UTC (8 years, 1 month ago) by rpe
Branch: MAIN
Changes since 1.922: +6 -6 lines
Diff to previous 1.922 (colored)

Tweak addel(), rmel() and bsort() to not emit a leading/trailing blank.

OK tb krw

Revision 1.922 / (download) - annotate - [select for diffs], Thu Sep 22 20:48:37 2016 UTC (8 years, 1 month ago) by rpe
Branch: MAIN
Changes since 1.921: +2 -4 lines
Diff to previous 1.921 (colored)

The tape install method is gone for a while already.
Remove leftovers.

OK krw halex deraadt

Revision 1.921 / (download) - annotate - [select for diffs], Thu Sep 22 20:45:22 2016 UTC (8 years, 1 month ago) by rpe
Branch: MAIN
Changes since 1.920: +2 -4 lines
Diff to previous 1.920 (colored)

vi is not available on the install media.
Besides ... real men use ed!

OK krw halex deraadt

Revision 1.920 / (download) - annotate - [select for diffs], Fri Sep 16 15:35:05 2016 UTC (8 years, 1 month ago) by krw
Branch: MAIN
Changes since 1.919: +2 -2 lines
Diff to previous 1.919 (colored)

Revert last. -f is a bad bad idea here.

ok deraadt@

Revision 1.919 / (download) - annotate - [select for diffs], Fri Sep 16 13:28:20 2016 UTC (8 years, 1 month ago) by krw
Branch: MAIN
Changes since 1.918: +2 -2 lines
Diff to previous 1.918 (colored)

Use 'umount -f' so failing to umount root does not blow up install/upgrade
while root (sic) causes are probed.

Problem reported by RD Thrush via bugs@ and reproduced locally.

Revision 1.918 / (download) - annotate - [select for diffs], Tue Sep 13 21:25:29 2016 UTC (8 years, 1 month ago) by halex
Branch: MAIN
Changes since 1.917: +11 -32 lines
Diff to previous 1.917 (colored)

"Make disk selection dumb again", or at least make the change less
intrusive. Default to the first available disk, skipping to the next
(and so on), should the selected one be determined unsuitable for the
install or upgrade taking place.

"please commit" deraadt@

Revision 1.917 / (download) - annotate - [select for diffs], Sun Sep 11 03:16:52 2016 UTC (8 years, 1 month ago) by deraadt
Branch: MAIN
Changes since 1.916: +2 -2 lines
Diff to previous 1.916 (colored)

a lonely little space

Revision 1.916 / (download) - annotate - [select for diffs], Sat Sep 10 22:34:17 2016 UTC (8 years, 1 month ago) by rpe
Branch: MAIN
Changes since 1.915: +7 -6 lines
Diff to previous 1.915 (colored)

Ensure that a previous cdrom install method is passed through
to install_sets() and that it is presented as default answer.

- fix pattern in waitcgiinfo() to match method=cd0.
- use a separate variable _im to set INSTALL_METHOD
  resp might get overwritten in install_cdrom()

OK halex

Revision 1.915 / (download) - annotate - [select for diffs], Sat Sep 10 17:18:30 2016 UTC (8 years, 1 month ago) by rpe
Branch: MAIN
Changes since 1.914: +4 -2 lines
Diff to previous 1.914 (colored)

Ensure that previous installer choices are available during upgrades
by moving waitcgiinfo() from install_http() to before install_sets()
in do_upgrade().

OK halex

Revision 1.914 / (download) - annotate - [select for diffs], Sat Sep 10 15:14:52 2016 UTC (8 years, 1 month ago) by rpe
Branch: MAIN
Changes since 1.913: +2 -2 lines
Diff to previous 1.913 (colored)

Ensure that install_files() returns successful if the _tmpsrc
directory does not exist. Otherwise, INSTALL_METHOD is not set
and this information is not sent to the cgi server.

OK halex

Revision 1.913 / (download) - annotate - [select for diffs], Sat Sep 10 08:10:19 2016 UTC (8 years, 1 month ago) by rpe
Branch: MAIN
Changes since 1.912: +2 -2 lines
Diff to previous 1.912 (colored)

Fix detection if default route was set by dhclient in v4_defroute().
Route labels are now enclosed in double quotes (see r1.107 of
src/sbin/route/show.c).

OK claudio, krw
no objections halex

Revision 1.912 / (download) - annotate - [select for diffs], Sun Sep 4 12:36:33 2016 UTC (8 years, 1 month ago) by halex
Branch: MAIN
Changes since 1.911: +2 -9 lines
Diff to previous 1.911 (colored)

Not having the root filesystem on the 'a' partition is
stupi^Wunfortunate, so stop asking.

deraadt@ and krw@ agrees
ok rpe@

Revision 1.911 / (download) - annotate - [select for diffs], Sun Sep 4 10:15:04 2016 UTC (8 years, 1 month ago) by halex
Branch: MAIN
Changes since 1.910: +43 -15 lines
Diff to previous 1.910 (colored)

Improve the auto disk selection and also apply it for installs as well
as for upgrades.

- For installs, find all and any disks available.
- For upgrades, look for 'a' partitions with the typical root filesystem
  directories in them.

In both cases, if one and only one match is found, it will be selected.

If no disk or multiple disks are found, the installer will require you
to specify a disk, be it by hand or by auto{install,upgrade}.conf.

ok rpe@ krw@ "Innovative." deraadt@

Revision 1.910 / (download) - annotate - [select for diffs], Sun Sep 4 09:56:46 2016 UTC (8 years, 1 month ago) by rpe
Branch: MAIN
Changes since 1.909: +88 -89 lines
Diff to previous 1.909 (colored)

Move files created by root during install/upgrade in a subdir of
/tmp with proper permissions so that unprivileged programs can not
tamper with them.

positive feedback from deraadt
OK halex

Revision 1.909 / (download) - annotate - [select for diffs], Sat Sep 3 11:40:32 2016 UTC (8 years, 1 month ago) by rpe
Branch: MAIN
Changes since 1.908: +14 -14 lines
Diff to previous 1.908 (colored)

Make the installer safer by fetching and verifying external data
as unprivileged users.

OK halex, tb, deraadt

Revision 1.908 / (download) - annotate - [select for diffs], Sat Sep 3 11:29:17 2016 UTC (8 years, 1 month ago) by rpe
Branch: MAIN
Changes since 1.907: +46 -1 lines
Diff to previous 1.907 (colored)

Add a do_as() function that executes commands as unprivileged user
and ensures that no processes of this user remain active afterwards.
Optionally, it creates a file, that is owned by the user only for
this command execution. Afterwards it's chown'd by root.

Add wrapper functions for do_as(). unpriv() uses the _sndio user
and unpriv2() uses the _file user to execute commands.

OK halex, tb, deraadt

Revision 1.907 / (download) - annotate - [select for diffs], Fri Sep 2 21:42:28 2016 UTC (8 years, 1 month ago) by halex
Branch: MAIN
Changes since 1.906: +23 -4 lines
Diff to previous 1.906 (colored)

for an upgrade disk selection, present a default alternative of 'auto',
which will scan the available disks, selecting the first disk with an
'a' partition of type 4.2BSD

ok deraadt@ krw@ phessler@

Revision 1.906 / (download) - annotate - [select for diffs], Tue Aug 23 16:49:48 2016 UTC (8 years, 2 months ago) by krw
Branch: MAIN
Changes since 1.905: +2 -2 lines
Diff to previous 1.905 (colored)

Type. 'if' != 'lf'. Fixes error message and setting hostname from dhcp lease
during install.

Spotted & diff from Patrik Lundin. Thanks!

Revision 1.905 / (download) - annotate - [select for diffs], Sun Aug 21 19:22:15 2016 UTC (8 years, 2 months ago) by halex
Branch: MAIN
Changes since 1.904: +7 -2 lines
Diff to previous 1.904 (colored)

Make lease_value() unescape quoted strings. To be fully compliant, we
should unvis() it too, but I think this is enough, at least for now.

ok krw@

Revision 1.904 / (download) - annotate - [select for diffs], Sun Aug 21 18:47:01 2016 UTC (8 years, 2 months ago) by rpe
Branch: MAIN
Changes since 1.903: +2 -2 lines
Diff to previous 1.903 (colored)

tweak previous

OK halex, krw

Revision 1.903 / (download) - annotate - [select for diffs], Wed Aug 17 13:53:20 2016 UTC (8 years, 2 months ago) by krw
Branch: MAIN
Changes since 1.902: +26 -7 lines
Diff to previous 1.902 (colored)

Use more dhcp info when trying autoinstall/autoupgrade.

For the file name try 'filename' then 'option bootfile-name'.

For the server name try 'server-name' then 'option tftp-server-name' then
'next-server'.

Original idea from Patrick Lundin. Suggestions from rpe@.

Tweaks & ok halex@

Revision 1.902 / (download) - annotate - [select for diffs], Sat Jul 23 17:55:45 2016 UTC (8 years, 3 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_6_0_BASE, OPENBSD_6_0
Changes since 1.901: +2 -2 lines
Diff to previous 1.901 (colored)

Back out the automatic pkg.conf installpath changes; because pkg_add has
an immature heuristic for "what is a release and what is a snapshot".
This change maybe improved the post-release experience, but it damages the
pre-release experience, which may result in less effective pre-release
testing, which risks creating poor releases, which may result in poor
post-release experiences.
Specific case: subtle breakage to fw_update.

Revision 1.901 / (download) - annotate - [select for diffs], Fri May 27 21:13:17 2016 UTC (8 years, 5 months ago) by deraadt
Branch: MAIN
Changes since 1.900: +56 -56 lines
Diff to previous 1.900 (colored)

whitespaces grow bsd.rd, you know

Revision 1.900 / (download) - annotate - [select for diffs], Fri May 27 20:17:39 2016 UTC (8 years, 5 months ago) by rpe
Branch: MAIN
Changes since 1.899: +6 -1 lines
Diff to previous 1.899 (colored)

During install, set new 'wxallowed' mount option for the filesystem
/usr/local resides on.

idea from and ok deraadt
with feedback from halex

Revision 1.899 / (download) - annotate - [select for diffs], Thu May 26 15:27:09 2016 UTC (8 years, 5 months ago) by rpe
Branch: MAIN
Changes since 1.898: +11 -11 lines
Diff to previous 1.898 (colored)

Rename variables to a less ambiguous name better matching their purpose.

OK krw

Revision 1.898 / (download) - annotate - [select for diffs], Sun May 22 19:12:21 2016 UTC (8 years, 5 months ago) by rpe
Branch: MAIN
Changes since 1.897: +12 -9 lines
Diff to previous 1.897 (colored)

Rename variable $action (which is actually global) to AI_MODE.
While there, (re)set AI_MODE and AI_SERVER at the start of the
installer script.

OK krw@

Revision 1.897 / (download) - annotate - [select for diffs], Fri May 20 17:28:43 2016 UTC (8 years, 5 months ago) by rpe
Branch: MAIN
Changes since 1.896: +20 -2 lines
Diff to previous 1.896 (colored)

Log questions and answers during install/upgrade in a format that can be
used as a response file for autoinstall(8). The result is emailed to the
root user on next boot. Passwords are not logged.

positive feedback deraadt, jung
OK krw, halex, sthen

Revision 1.896 / (download) - annotate - [select for diffs], Fri May 20 17:12:42 2016 UTC (8 years, 5 months ago) by rpe
Branch: MAIN
Changes since 1.895: +27 -11 lines
Diff to previous 1.895 (colored)

Move code to create unique filenames and to prepare a file
to be sent to root on reboot into separate functions.

positive feedback deraadt
OK krw, sthen, halex

Revision 1.895 / (download) - annotate - [select for diffs], Thu Apr 28 18:17:30 2016 UTC (8 years, 6 months ago) by natano
Branch: MAIN
Changes since 1.894: +1 -11 lines
Diff to previous 1.894 (colored)

Replace /dev/bpf[0-9] with /dev/bpf and /dev/bpf0. The /dev/bpf node is
unused for now, but I plan to convert all programs in base to use it in
a future diff. /dev/bpf0 is for compatibility with existing binaries
and is to be removed after a transition period.

ok rpe krw, for the installer part
"Let's see it hit the tree." deraadt

Revision 1.894 / (download) - annotate - [select for diffs], Wed Apr 27 14:50:18 2016 UTC (8 years, 6 months ago) by ajacoutot
Branch: MAIN
Changes since 1.893: +2 -3 lines
Diff to previous 1.893 (colored)

rc.firsttime -> rc.sysmerge for running sysmerge(8) after an upgrade.
While here, don't echo 'running sysmerge...' since that'd get us a mail each
time we upgrade even when nothing changed.

ok deraadt@ rpe@

Revision 1.893 / (download) - annotate - [select for diffs], Mon Apr 25 09:55:23 2016 UTC (8 years, 6 months ago) by ajacoutot
Branch: MAIN
Changes since 1.892: +4 -3 lines
Diff to previous 1.892 (colored)

In upgrade mode, automatically run sysmerge(8) in batch mode before fw_update(1).
Putting this at the beginning of the p2k16 hackathon so we can see if anything
breaks and to get feedback about the output etc
If sysmerge cannot merge/install a file automatically, login into the machine
and running it interactively will ask you what you want to do with it.

It may not stay in this exact form, but that's a first step and now is a good
time to get it in.

discussed with deraadt@ for a while
ok rpe@

Revision 1.892 / (download) - annotate - [select for diffs], Mon Apr 11 19:04:30 2016 UTC (8 years, 6 months ago) by rpe
Branch: MAIN
Changes since 1.891: +12 -12 lines
Diff to previous 1.891 (colored)

- In isin(), quote $_b to ensure it's treated as string not as pattern.
- Always quote the first argument to isin()

OK halex@, krw@

Revision 1.891 / (download) - annotate - [select for diffs], Mon Apr 11 18:47:05 2016 UTC (8 years, 6 months ago) by rpe
Branch: MAIN
Changes since 1.890: +9 -11 lines
Diff to previous 1.890 (colored)

Tweak bsort():
- make it clear in comment that it returns a unique list
- shift is only possible if argc > 0, otherwise return
- quote "$_b" in equality test forcing possible patterns being
  treated as strings

OK halex@, krw@

Revision 1.890 / (download) - annotate - [select for diffs], Sat Apr 9 15:14:47 2016 UTC (8 years, 6 months ago) by rpe
Branch: MAIN
Changes since 1.889: +3 -6 lines
Diff to previous 1.889 (colored)

Remove _tz as intermediate variable and use CGI_TZ directly.

Feedback from and OK halex@
OK krw@ for a similar diff

Revision 1.889 / (download) - annotate - [select for diffs], Sat Apr 9 11:03:42 2016 UTC (8 years, 6 months ago) by rpe
Branch: MAIN
Changes since 1.888: +20 -20 lines
Diff to previous 1.888 (colored)

Use _if for a single interface name and _ifs for a list of interface
names instead of _ifdev and _ifdevs.

OK krw@ halex@

Revision 1.888 / (download) - annotate - [select for diffs], Fri Apr 8 17:41:08 2016 UTC (8 years, 6 months ago) by rpe
Branch: MAIN
Changes since 1.887: +51 -51 lines
Diff to previous 1.887 (colored)

Use _if instead of _ifs as variable name for single interface names.

OK krw@, halex@

Revision 1.887 / (download) - annotate - [select for diffs], Fri Apr 8 17:17:54 2016 UTC (8 years, 6 months ago) by rpe
Branch: MAIN
Changes since 1.886: +10 -13 lines
Diff to previous 1.886 (colored)

Rename getdevname() to get_dkdev_name() to better reflect the actual
purpose and simplify the logic to remove the partition information
from the device name.

With help from and OK halex@, krw@

Revision 1.886 / (download) - annotate - [select for diffs], Sat Apr 2 13:52:04 2016 UTC (8 years, 6 months ago) by rpe
Branch: MAIN
Changes since 1.885: +4 -8 lines
Diff to previous 1.885 (colored)

Simplify defining the various set lists.

Feedback from and OK halex@
OK krw@

Revision 1.885 / (download) - annotate - [select for diffs], Sat Apr 2 13:34:48 2016 UTC (8 years, 6 months ago) by rpe
Branch: MAIN
Changes since 1.884: +1 -2 lines
Diff to previous 1.884 (colored)

Remove unused variable.

OK krw@

Revision 1.884 / (download) - annotate - [select for diffs], Sat Apr 2 12:23:46 2016 UTC (8 years, 6 months ago) by rpe
Branch: MAIN
Changes since 1.883: +327 -3 lines
Diff to previous 1.883 (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.883 / (download) - annotate - [select for diffs], Sat Mar 5 17:18:27 2016 UTC (8 years, 7 months ago) by rpe
Branch: MAIN
Changes since 1.882: +3 -4 lines
Diff to previous 1.882 (colored)

missed 'sed -i'

OK halex@

Revision 1.882 / (download) - annotate - [select for diffs], Sat Feb 27 12:28:16 2016 UTC (8 years, 8 months ago) by rpe
Branch: MAIN
Changes since 1.881: +2 -4 lines
Diff to previous 1.881 (colored)

Cleanup the list of usernames that are rejected during installation.

- sendmail, named, popa3d are not part of base anymore and their ports
versions use _<username>.

- _tftp_proxy and _ftp_proxy are used instead of the proxy user.

OK ajacoutot@

Revision 1.881 / (download) - annotate - [select for diffs], Sat Feb 27 12:17:03 2016 UTC (8 years, 8 months ago) by rpe
Branch: MAIN
Changes since 1.880: +4 -8 lines
Diff to previous 1.880 (colored)

Shorter version that does the same.
Change description to better match the purpose of this function.

OK halex@

Revision 1.880 / (download) - annotate - [select for diffs], Tue Feb 23 02:34:09 2016 UTC (8 years, 8 months ago) by krw
Branch: MAIN
CVS Tags: OPENBSD_5_9_BASE, OPENBSD_5_9
Changes since 1.879: +2 -2 lines
Diff to previous 1.879 (colored)

In the great pdisk churn we lost a pdisk pecularity in disk name
handling. "pdisk -l /dev/wd0c" used to work as well as "pdisk -l
/dev/rwd0c". The new, more fdisk-like, code does not accept the
former.

Adjust the install scripts to eliminate the use of "/dev/wd0c"
constructs and, like fdisk, simply use 'wd0'.

Fixes macppc installs to HFS partitioned disks.

Discovered and diff by rpe@.

ok rpe@ deraadt@

Revision 1.879 / (download) - annotate - [select for diffs], Sat Feb 20 12:08:55 2016 UTC (8 years, 8 months ago) by rpe
Branch: MAIN
Changes since 1.878: +2 -3 lines
Diff to previous 1.878 (colored)

Combine two sed calls into one.

OK krw@, halex@

Revision 1.878 / (download) - annotate - [select for diffs], Sat Feb 20 12:03:11 2016 UTC (8 years, 8 months ago) by rpe
Branch: MAIN
Changes since 1.877: +2 -2 lines
Diff to previous 1.877 (colored)

remove stray semicolon

OK krw@, halex@

Revision 1.877 / (download) - annotate - [select for diffs], Fri Feb 12 14:18:31 2016 UTC (8 years, 8 months ago) by rpe
Branch: MAIN
Changes since 1.876: +3 -3 lines
Diff to previous 1.876 (colored)

Uppercase global variable.

OK halex@

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

- remove _d from local list which is a leftover from a previous change
- rename a -> _src and localize it

OK krw@, halex@

Revision 1.875 / (download) - annotate - [select for diffs], Mon Jan 25 23:46:54 2016 UTC (8 years, 9 months ago) by rpe
Branch: MAIN
Changes since 1.874: +2 -3 lines
Diff to previous 1.874 (colored)

localize _clist

feedback and OK halex@
OK krw@

Revision 1.874 / (download) - annotate - [select for diffs], Sun Jan 24 09:16:57 2016 UTC (8 years, 9 months ago) by rpe
Branch: MAIN
Changes since 1.873: +22 -15 lines
Diff to previous 1.873 (colored)

spacing

ok krw@, halex@

Revision 1.873 / (download) - annotate - [select for diffs], Sun Jan 24 09:13:57 2016 UTC (8 years, 9 months ago) by rpe
Branch: MAIN
Changes since 1.872: +5 -5 lines
Diff to previous 1.872 (colored)

- cleanup quoting in sed pattern
- use shell built-in read command instead of 'sed q'

OK krw@, halex@

Revision 1.872 / (download) - annotate - [select for diffs], Sun Jan 17 18:01:31 2016 UTC (8 years, 9 months ago) by rpe
Branch: MAIN
Changes since 1.871: +4 -3 lines
Diff to previous 1.871 (colored)

Discard stderr of fdisk and pdisk.

disussed with and OK krw@

Revision 1.871 / (download) - annotate - [select for diffs], Tue Jan 12 00:17:05 2016 UTC (8 years, 9 months ago) by rpe
Branch: MAIN
Changes since 1.870: +10 -4 lines
Diff to previous 1.870 (colored)

The data for CGI_{METHOD,TIME,TZ} comes from an external source.
Validate before assignment.

with feedback from and OK halex@
OK krw@

Revision 1.870 / (download) - annotate - [select for diffs], Sun Jan 10 17:47:14 2016 UTC (8 years, 9 months ago) by rpe
Branch: MAIN
Changes since 1.869: +3 -3 lines
Diff to previous 1.869 (colored)

replace test command with [[ ]]

OK krw@

Revision 1.869 / (download) - annotate - [select for diffs], Sun Jan 10 17:44:35 2016 UTC (8 years, 9 months ago) by rpe
Branch: MAIN
Changes since 1.868: +2 -2 lines
Diff to previous 1.868 (colored)

simplify pattern

feedback halex@
OK krw@

Revision 1.868 / (download) - annotate - [select for diffs], Sat Jan 9 18:10:57 2016 UTC (8 years, 9 months ago) by krw
Branch: MAIN
Changes since 1.867: +4 -4 lines
Diff to previous 1.867 (colored)

Revamp the display of GPT information, hiding less important
information under the '-v' flag. This brings the GPT display more
into line with the MBR display and simplifies and hardens the parsing
of the partition info in the install scripts.

Original problem with install scripts parsing hand edited GPT
information reported by Valere Monseur via bugs@.

Man page fixes and tweaks from jmc@.
Install script changes tested & ok rpe@.

Revision 1.867 / (download) - annotate - [select for diffs], Sun Dec 27 18:42:11 2015 UTC (8 years, 10 months ago) by rpe
Branch: MAIN
Changes since 1.866: +63 -1 lines
Diff to previous 1.866 (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.866 / (download) - annotate - [select for diffs], Wed Dec 23 18:06:32 2015 UTC (8 years, 10 months ago) by rpe
Branch: MAIN
Changes since 1.865: +10 -1 lines
Diff to previous 1.865 (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.865 / (download) - annotate - [select for diffs], Wed Dec 23 17:45:13 2015 UTC (8 years, 10 months ago) by rpe
Branch: MAIN
Changes since 1.864: +19 -19 lines
Diff to previous 1.864 (colored)

Change comment style for headings so they get removed by list2sh.awk and
don't end up in bsd.rd.

OK krw@

Revision 1.864 / (download) - annotate - [select for diffs], Wed Dec 23 08:05:11 2015 UTC (8 years, 10 months ago) by rpe
Branch: MAIN
Changes since 1.863: +14 -10 lines
Diff to previous 1.863 (colored)

Ensure the installer asks for the dns domain and nameserver in case an
interface has been configured via dhcp and then again manually.

tested and OK krw@
makes sense halex@

Revision 1.863 / (download) - annotate - [select for diffs], Wed Dec 23 08:00:09 2015 UTC (8 years, 10 months ago) by rpe
Branch: MAIN
Changes since 1.862: +11 -12 lines
Diff to previous 1.862 (colored)

Ensure the installer asks for IPv4 default route in case an interface has
been configured via dhcp and then again manually.

While there, remove 'dhcp' as valid answer for the default route qeustion.
It was a no-op and was handled the same way as 'none'.

tested and OK krw@
makes sense halex@

Revision 1.862 / (download) - annotate - [select for diffs], Fri Dec 18 16:20:58 2015 UTC (8 years, 10 months ago) by rpe
Branch: MAIN
Changes since 1.861: +41 -1 lines
Diff to previous 1.861 (colored)

Introduce a new function disk_has() to inspect a disk if it has a
partition-table of a certain type and optionally if it has a partition
of a certain type.

Use disk_has() in the install.md script to replace all the various
"fdisk <disk> | grep <pattern>" commands greatly simplifying things.

positive feedback from sthen@
"time to get it really tested" deraadt@
OK krw@

Revision 1.861 / (download) - annotate - [select for diffs], Sun Dec 6 20:29:07 2015 UTC (8 years, 10 months ago) by rpe
Branch: MAIN
Changes since 1.860: +9 -15 lines
Diff to previous 1.860 (colored)

Do the same with less code.

OK krw@

Revision 1.860 / (download) - annotate - [select for diffs], Fri Nov 20 14:41:48 2015 UTC (8 years, 11 months ago) by sthen
Branch: MAIN
Changes since 1.859: +1 -5 lines
Diff to previous 1.859 (colored)

don't auto-skip X sets on systems without wscons, you can remove them easily
with -x*, and "no wscons" doesn't cover all of the systems where one might
intentionally want to skip them anyway.  ok bmercer deraadt espie rpe

Revision 1.859 / (download) - annotate - [select for diffs], Wed Nov 18 17:48:45 2015 UTC (8 years, 11 months ago) by sthen
Branch: MAIN
Changes since 1.858: +2 -2 lines
Diff to previous 1.858 (colored)

Now that the transition is over, have the installer set 'prohibit-password'
in sshd_config instead of 'without-password'.  "it is time" deraadt@

Revision 1.858 / (download) - annotate - [select for diffs], Sun Sep 27 19:00:32 2015 UTC (9 years, 1 month ago) by halex
Branch: MAIN
Changes since 1.857: +1 -5 lines
Diff to previous 1.857 (colored)

HEAD is past 5.8 now, so remove /var/tmp removal tweak.

ok krw@

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

zap trailing whitespace

Revision 1.856 / (download) - annotate - [select for diffs], Wed Sep 9 15:04:54 2015 UTC (9 years, 1 month ago) by halex
Branch: MAIN
Changes since 1.855: +2 -2 lines
Diff to previous 1.855 (colored)

At some point back in time, the disk info (obtained by responding '?' at
the root disk question) got some extra linefeeds in it. This fixes the
output to be one line per disk again.

ok krw@

Revision 1.855 / (download) - annotate - [select for diffs], Mon Aug 24 10:41:11 2015 UTC (9 years, 2 months ago) by ajacoutot
Branch: MAIN
Changes since 1.854: +2 -2 lines
Diff to previous 1.854 (colored)

/usr/share/sysmerge -> /var/sysmerge

requested by several
discussed with deraadt@

Revision 1.854 / (download) - annotate - [select for diffs], Thu Aug 6 14:55:51 2015 UTC (9 years, 2 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_5_8_BASE, OPENBSD_5_8
Changes since 1.853: +3 -3 lines
Diff to previous 1.853 (colored)

match change to prohibit-password.  however, also default to "no", as
as strong secure-by-default stance.
people who upload root keys via site.tgz need to adjust sshd_config;
those who load a root key via autoinstall should trigger on this
question and select prohibit-password.
discussed at length

Revision 1.853 / (download) - annotate - [select for diffs], Thu Aug 6 13:15:53 2015 UTC (9 years, 2 months ago) by deraadt
Branch: MAIN
Changes since 1.852: +2 -2 lines
Diff to previous 1.852 (colored)

spelling

Revision 1.852 / (download) - annotate - [select for diffs], Thu Aug 6 06:39:41 2015 UTC (9 years, 2 months ago) by deraadt
Branch: MAIN
Changes since 1.851: +4 -4 lines
Diff to previous 1.851 (colored)

Change the ssh root login question to avoid the unnatural keyword
"without-password". Instead use "pubkeys-only" which people will find
conceptually easier.  Still quietly accept "w" or "without-password"
as an option.
Place a warning beforehands:
WARNING: root is targetted by password guessing attacks, pubkeys are safer.

Everyone happy now, or at learning to not use root passwords?

Revision 1.851 / (download) - annotate - [select for diffs], Sat Aug 1 16:20:40 2015 UTC (9 years, 2 months ago) by rpe
Branch: MAIN
Changes since 1.850: +20 -13 lines
Diff to previous 1.850 (colored)

- Be more specific as to what accept as answer to the "Allow root
  ssh login?" question. Either the first letter or the whole word
- Use grep to check for the default in sshd_config
- Simplify sed expression for changing sshd_config

Based on feedback from and OK halex@

Revision 1.850 / (download) - annotate - [select for diffs], Thu Jul 30 19:40:32 2015 UTC (9 years, 3 months ago) by rpe
Branch: MAIN
Changes since 1.849: +21 -14 lines
Diff to previous 1.849 (colored)

Change installer to cope with the new sshd_config(5) default for
the PermitRootLogin option. Additionally to 'yes' and 'no' allow
'without-password' and make that the proposed default answer for
the "Allow root ssh login?" question. Modify sshd_config only if
the user choice is not the default.

OK deraadt
discussed with halex@, sthen@ and others

Revision 1.849 / (download) - annotate - [select for diffs], Mon Jul 20 01:12:49 2015 UTC (9 years, 3 months ago) by rpe
Branch: MAIN
Changes since 1.848: +66 -59 lines
Diff to previous 1.848 (colored)

Fix some typos and reformat comments.

OK halex@

Revision 1.848 / (download) - annotate - [select for diffs], Sun Jul 19 19:33:51 2015 UTC (9 years, 3 months ago) by rpe
Branch: MAIN
Changes since 1.847: +2 -2 lines
Diff to previous 1.847 (colored)

Use the %c (version or snapshots) and %a (package architecture) for
installpath in pkg.conf instead of hardcoding that information.
This fixes the problem, that installpath has a path from an older
release after updating from disk for a while.

NOTE: This matches fw_update behaviour in that during a beta cycle,
it will expand to 5.8 (for e.g.) instead of snapshots.

requested by and OK ajacoutot@
OK halex@ krw@

Revision 1.847 / (download) - annotate - [select for diffs], Fri Jul 17 15:11:52 2015 UTC (9 years, 3 months ago) by rpe
Branch: MAIN
Changes since 1.846: +8 -8 lines
Diff to previous 1.846 (colored)

Remove spaces before the double semicolons in case-blocks.

OK krw@ halex@

Revision 1.846 / (download) - annotate - [select for diffs], Thu Jul 16 21:05:08 2015 UTC (9 years, 3 months ago) by halex
Branch: MAIN
Changes since 1.845: +2 -2 lines
Diff to previous 1.845 (colored)

zap trailing whitespace

with rpe's blessing

Revision 1.845 / (download) - annotate - [select for diffs], Sun Jul 5 09:17:39 2015 UTC (9 years, 3 months ago) by rpe
Branch: MAIN
Changes since 1.844: +43 -22 lines
Diff to previous 1.844 (colored)

In case-statements where single and multiline commands are used,
put the terminating ;; always on its own line.

discussed with and OK krw@ halex@

Revision 1.844 / (download) - annotate - [select for diffs], Fri Jul 3 18:29:08 2015 UTC (9 years, 3 months ago) by rpe
Branch: MAIN
Changes since 1.843: +9 -9 lines
Diff to previous 1.843 (colored)

Use [aA]* instead of a*|A* in case-blocks.

OK krw@
@halex agreed on this in a similar diff

Revision 1.843 / (download) - annotate - [select for diffs], Tue Jun 2 19:54:06 2015 UTC (9 years, 4 months ago) by rpe
Branch: MAIN
Changes since 1.842: +3 -4 lines
Diff to previous 1.842 (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.842 / (download) - annotate - [select for diffs], Sun May 31 19:40:10 2015 UTC (9 years, 5 months ago) by rpe
Branch: MAIN
Changes since 1.841: +44 -13 lines
Diff to previous 1.841 (colored)

Replace identical code in the MD scripts of the installer with a new
MI function disklabel_autolayout() which now handles all aspects of
the disklabel auto-layout and autopartitioning case for the root disk.
Remove get_disklabel_template() and merge it with the new function.

"move forward" deraadt@

Revision 1.841 / (download) - annotate - [select for diffs], Wed May 20 19:14:35 2015 UTC (9 years, 5 months ago) by rpe
Branch: MAIN
Changes since 1.840: +6 -12 lines
Diff to previous 1.840 (colored)

Merge the get_drive() function with install_disk(), which is the
only remaining consumer.

OK krw@

Revision 1.840 / (download) - annotate - [select for diffs], Tue May 19 20:12:29 2015 UTC (9 years, 5 months ago) by rpe
Branch: MAIN
Changes since 1.839: +2 -2 lines
Diff to previous 1.839 (colored)

Fix installing sets from cdrom if more than one drive is present.
Run makedev in install_cdrom() to create the necessary device nodes,
which got lost in a recent change.

Found by James Hartley, thanks for the bug report!
OK krw@

Revision 1.839 / (download) - annotate - [select for diffs], Mon May 18 13:48:37 2015 UTC (9 years, 5 months ago) by deraadt
Branch: MAIN
Changes since 1.838: +1 -14 lines
Diff to previous 1.838 (colored)

enable ntpd by default at install time.  We use pools and a reliable
constraint to keep them in check.  in the worst case of being on a
dark net, nothing changes.

this is being enabled by default to allow gathering of more operational
information from users.  and if the operational heuristics in ntpd can be
suitable refined, this may stay the default into the future.  if not, ntpd
will become even more awesome along the way.

with reyk rpe

Revision 1.838 / (download) - annotate - [select for diffs], Fri May 15 07:41:30 2015 UTC (9 years, 5 months ago) by rpe
Branch: MAIN
Changes since 1.837: +2 -2 lines
Diff to previous 1.837 (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.837 / (download) - annotate - [select for diffs], Thu May 14 10:58:55 2015 UTC (9 years, 5 months ago) by rpe
Branch: MAIN
Changes since 1.836: +13 -10 lines
Diff to previous 1.836 (colored)

Extend autoinstall(8) to allow for <hostname>-<mode>.conf response files
and to put response files in a subdir of the webserver's document root.
Based on diffs from Nathanael Rensen, thanks!

While here fix a buglet introduced by the $_server -> $AI_SERVER change.

OK krw, halex

Revision 1.836 / (download) - annotate - [select for diffs], Mon May 4 19:55:26 2015 UTC (9 years, 5 months ago) by rpe
Branch: MAIN
Changes since 1.835: +13 -1 lines
Diff to previous 1.835 (colored)

Add the new template file based autopartitioning feature of disklabel(8)
to the OpenBSD installer. It is available during unattended installation.
The template file is fetched from an url, provided as answer to a new
question in the response file:

    URL to autopartitioning template for disklabel = url

Original diff from and OK henning@
'no objection' krw@

Revision 1.835 / (download) - annotate - [select for diffs], Tue Apr 28 21:41:40 2015 UTC (9 years, 6 months ago) by sthen
Branch: MAIN
Changes since 1.834: +4 -4 lines
Diff to previous 1.834 (colored)

ajacoutot spotted a problem with the new sshd logic (to disable root logins
by default completely in most cases, except where a public ssh key was provided
to autoinstall) - in the case where a (non-root) account was created, sshd
was being disabled; this diff fixes it. Looks good ajacoutot, OK djm@,
extensive testing+OK rpe@,

Revision 1.834 / (download) - annotate - [select for diffs], Mon Apr 27 23:17:11 2015 UTC (9 years, 6 months ago) by djm
Branch: MAIN
Changes since 1.833: +25 -9 lines
Diff to previous 1.833 (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.833 / (download) - annotate - [select for diffs], Sun Apr 26 14:49:23 2015 UTC (9 years, 6 months ago) by henning
Branch: MAIN
Changes since 1.832: +7 -7 lines
Diff to previous 1.832 (colored)

get_responsefile: instead of keeping the dhcp-supplied next-server where
we fetch the response file from in a local _server var, put it in an
exported AI_SERVER one. last not least that allows install.site to see it.
ok krw rpe

Revision 1.832 / (download) - annotate - [select for diffs], Tue Apr 21 10:58:28 2015 UTC (9 years, 6 months ago) by henning
Branch: MAIN
Changes since 1.831: +2 -2 lines
Diff to previous 1.831 (colored)

append the setdir ("5.7/amd64", "snapshots/vax") as get-parameter "path"
when fetching the autoinstall response file.
a webserver that serves static files doesn't give a damn. if I map that
to something that dynamically creates the response file, i can use that to
construct the sets path, or play other arch and/or version dependent
games.
ok krw uwe

Revision 1.831 / (download) - annotate - [select for diffs], Mon Apr 20 15:31:15 2015 UTC (9 years, 6 months ago) by krw
Branch: MAIN
Changes since 1.830: +3 -3 lines
Diff to previous 1.830 (colored)

Fix asking for list of http servers via '?'. The 'more' now used
on the install media does not (currently) support '-e' or other
posix nifties, but does exit after displaying the last line.

Should fix scanning for wireless networks too.

Reported by Adam Wolk on misc@.

ok deraadt@

Revision 1.830 / (download) - annotate - [select for diffs], Mon Apr 6 13:34:23 2015 UTC (9 years, 6 months ago) by rpe
Branch: MAIN
Changes since 1.829: +5 -5 lines
Diff to previous 1.829 (colored)

Use if then else instead of testing $_fstype twice.

OK krw@

Revision 1.829 / (download) - annotate - [select for diffs], Sun Apr 5 12:37:14 2015 UTC (9 years, 6 months ago) by rpe
Branch: MAIN
Changes since 1.828: +3 -3 lines
Diff to previous 1.828 (colored)

Cope with the removal of less from install media.
Noted by Adam Wolk, thanks.

OK krw@ deraadt@

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

I contributed substantially to the installer, so add copyright.

prodded by deraadt@

Revision 1.827 / (download) - annotate - [select for diffs], Sat Apr 4 11:06:33 2015 UTC (9 years, 6 months ago) by rpe
Branch: MAIN
Changes since 1.826: +76 -18 lines
Diff to previous 1.826 (colored)

Moar comments !!

Add comment headers to each function, briefly explaining its purpose
and arguments.

Feedback and OK halex@ krw@

Revision 1.826 / (download) - annotate - [select for diffs], Fri Apr 3 17:03:15 2015 UTC (9 years, 6 months ago) by rpe
Branch: MAIN
Changes since 1.825: +5 -5 lines
Diff to previous 1.825 (colored)

Eleminate the last occurrences of backticks and replace constructs
like `cat file` or $(cat file) with $(<file) in places, where we
can be sure that file exists.

OK krw@

Revision 1.825 / (download) - annotate - [select for diffs], Sat Mar 28 17:03:11 2015 UTC (9 years, 7 months ago) by rpe
Branch: MAIN
Changes since 1.824: +3 -4 lines
Diff to previous 1.824 (colored)

fix typos

noted by Mikolaj Kucharski, thx
OK krw@

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

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

OK krw@

Revision 1.823 / (download) - annotate - [select for diffs], Fri Mar 27 22:15:39 2015 UTC (9 years, 7 months ago) by rpe
Branch: MAIN
Changes since 1.822: +1358 -1319 lines
Diff to previous 1.822 (colored)

Tame the more than 70 functions in install.sub.
Regroup them by their purpose and add section headers.

go for it halex@, OK krw@

Revision 1.822 / (download) - annotate - [select for diffs], Sat Mar 21 21:13:52 2015 UTC (9 years, 7 months ago) by rpe
Branch: MAIN
Changes since 1.821: +3 -6 lines
Diff to previous 1.821 (colored)

Fold the single command from update_firmware() into finish_up()
and remove the update_firmware() function all together.

OK halex@ krw@

Revision 1.821 / (download) - annotate - [select for diffs], Sat Mar 21 18:27:39 2015 UTC (9 years, 7 months ago) by rpe
Branch: MAIN
Changes since 1.820: +59 -59 lines
Diff to previous 1.820 (colored)

Move code that gets executed when install.sub is sourced
to the bottom of the file to make it easier to see what
code is actually executed.

OK krw@ halex@

Revision 1.820 / (download) - annotate - [select for diffs], Sat Mar 21 16:45:53 2015 UTC (9 years, 7 months ago) by rpe
Branch: MAIN
Changes since 1.819: +3 -3 lines
Diff to previous 1.819 (colored)

Bourne to Korn shell

OK krw@

Revision 1.819 / (download) - annotate - [select for diffs], Tue Mar 17 15:21:02 2015 UTC (9 years, 7 months ago) by rpe
Branch: MAIN
Changes since 1.818: +3 -2 lines
Diff to previous 1.818 (colored)

Restore previous behaviour that got lost with 1.780.
Don't ask about xdm if the answer to the X question was no.

Noted by mlarkin@
"Looks good" deraadt@
OK krw@

Revision 1.818 / (download) - annotate - [select for diffs], Sun Mar 15 00:09:50 2015 UTC (9 years, 7 months ago) by krw
Branch: MAIN
Changes since 1.817: +16 -10 lines
Diff to previous 1.817 (colored)

Eliminate the question 'Which cd?' and just show the available cd's
in the 'Location of sets?' prompt.

Idea from deraadt@

Developed with and tested by rpe@

ok deraadt@ rpe@

Revision 1.817 / (download) - annotate - [select for diffs], Fri Mar 13 15:02:14 2015 UTC (9 years, 7 months ago) by deraadt
Branch: MAIN
Changes since 1.816: +2 -2 lines
Diff to previous 1.816 (colored)

chroot is now inside instbin, so do not need to run the copy in /mnt
ok rpe

Revision 1.816 / (download) - annotate - [select for diffs], Wed Mar 11 21:00:35 2015 UTC (9 years, 7 months ago) by krw
Branch: MAIN
Changes since 1.815: +108 -134 lines
Diff to previous 1.815 (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.815 / (download) - annotate - [select for diffs], Sun Mar 8 13:15:00 2015 UTC (9 years, 7 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_5_7_BASE, OPENBSD_5_7
Changes since 1.814: +1 -1 lines
Diff to previous 1.814 (colored)

oops, wrong file to commit a diff to

Revision 1.814 / (download) - annotate - [select for diffs], Sun Mar 8 13:12:50 2015 UTC (9 years, 7 months ago) by deraadt
Branch: MAIN
Changes since 1.813: +2 -2 lines
Diff to previous 1.813 (colored)

last rev fixed upgrades, but broke installs, sigh.  use on-bsd.rd sdboot
for LIF/header creation, pre-disklabel.  post-install/upgrade, this
gets redone, this time with -r /mnt to pick up the new sdboot file
ok krw jsing miod

Revision 1.813 / (download) - annotate - [select for diffs], Thu Mar 5 17:56:35 2015 UTC (9 years, 7 months ago) by krw
Branch: MAIN
Changes since 1.812: +5 -3 lines
Diff to previous 1.812 (colored)

Manipulate only whole words when flipping 'ro' and 'rw' in fstab entries.

Fixes 'groupquota' -> 'grwupquota' damage noted by giovanni@.

Diff from rpe@, ok halex@, giovanni@, deraadt@

Revision 1.812 / (download) - annotate - [select for diffs], Sat Jan 24 00:20:35 2015 UTC (9 years, 9 months ago) by krw
Branch: MAIN
Changes since 1.811: +7 -7 lines
Diff to previous 1.811 (colored)

In shell statements use shell pattern '+([0-9])', not sed regular
expression '[0-9]*'.

Should fix problem reported by jsg@ where 'hostname.vlan6.bak' was
deemed to be an active vlan specification during upgrade.

No change to script output.

Tested by rpe@.

ok halex@ rpe@

Revision 1.811 / (download) - annotate - [select for diffs], Sat Jan 17 14:36:58 2015 UTC (9 years, 9 months ago) by rpe
Branch: MAIN
Changes since 1.810: +2 -2 lines
Diff to previous 1.810 (colored)

Remove unnecessary double-quotes inside [[]].

OK krw@

Revision 1.810 / (download) - annotate - [select for diffs], Sat Jan 17 10:09:06 2015 UTC (9 years, 9 months ago) by rpe
Branch: MAIN
Changes since 1.809: +29 -29 lines
Diff to previous 1.809 (colored)

Uppercase global vars (auto -> AUTO, respfile -> RESPFILE)

OK krw@ deraadt@

Revision 1.809 / (download) - annotate - [select for diffs], Mon Jan 12 16:33:31 2015 UTC (9 years, 9 months ago) by deraadt
Branch: MAIN
Changes since 1.808: +1 -10 lines
Diff to previous 1.808 (colored)

Enable lid suspends by default in the kernel, and remove the question from
the installer.  We used a full release cycle to learn that suspend/resume
is reliable enough for this default.  Personal policy can disable this using
machdep.lidsuspend=0 in /etc/sysctl.conf
ok more people begging, and less people whining

Revision 1.808 / (download) - annotate - [select for diffs], Wed Jan 7 19:31:51 2015 UTC (9 years, 9 months ago) by rpe
Branch: MAIN
Changes since 1.807: +9 -3 lines
Diff to previous 1.807 (colored)

Cleanup network config after fetching the responsefile. This enables
automatic upgrades on systems with trunk interfaces.

OK krw@

Revision 1.807 / (download) - annotate - [select for diffs], Wed Jan 7 19:20:53 2015 UTC (9 years, 9 months ago) by rpe
Branch: MAIN
Changes since 1.806: +2 -2 lines
Diff to previous 1.806 (colored)

Fix get_ifdevs() - don't filter vlan interfaces.

OK krw@

Revision 1.806 / (download) - annotate - [select for diffs], Sun Jan 4 18:44:12 2015 UTC (9 years, 9 months ago) by tedu
Branch: MAIN
Changes since 1.805: +2 -2 lines
Diff to previous 1.805 (colored)

back to using ramdisk encrypt again. theo found and fixed the (my) bug.

Revision 1.805 / (download) - annotate - [select for diffs], Sun Jan 4 02:26:29 2015 UTC (9 years, 9 months ago) by tedu
Branch: MAIN
Changes since 1.804: +2 -2 lines
Diff to previous 1.804 (colored)

go back to using /mnt encrypt. it seems something isn't working yet.

Revision 1.804 / (download) - annotate - [select for diffs], Thu Jan 1 22:53:39 2015 UTC (9 years, 9 months ago) by krw
Branch: MAIN
Changes since 1.803: +19 -25 lines
Diff to previous 1.803 (colored)

Enable 'ifconfig -C' (list dynamic interface types) on install
media. Use this feature in install scripts to eliminate manually
maintained list of dynamic interface types.

'-C' brought to my attention by reyk@, tweaks to install script to
use -C in get_ifdevs() from rpe@.

ok rpe@ deraadt@

Revision 1.803 / (download) - annotate - [select for diffs], Mon Dec 29 17:04:19 2014 UTC (9 years, 10 months ago) by deraadt
Branch: MAIN
Changes since 1.802: +2 -2 lines
Diff to previous 1.802 (colored)

encrypt is now built into instbin, do not need to use the /mnt version

Revision 1.802 / (download) - annotate - [select for diffs], Mon Dec 29 16:55:44 2014 UTC (9 years, 10 months ago) by tedu
Branch: MAIN
Changes since 1.801: +2 -2 lines
Diff to previous 1.801 (colored)

switch encrypt to auto scaling bcrypt rounds. ok deraadt

Revision 1.801 / (download) - annotate - [select for diffs], Fri Dec 26 17:54:54 2014 UTC (9 years, 10 months ago) by rpe
Branch: MAIN
Changes since 1.800: +1 -12 lines
Diff to previous 1.800 (colored)

Remove upgrade_to64time_t() now that the transition to 64 bit time_t
is done.

diff from tj at mrsk.me
OK halex@ deraadt@

Revision 1.800 / (download) - annotate - [select for diffs], Wed Dec 3 19:55:49 2014 UTC (9 years, 10 months ago) by florian
Branch: MAIN
Changes since 1.799: +11 -7 lines
Diff to previous 1.799 (colored)

The kernel handles rtsol(8) functionality since some time now.
Treat rtsol in hostname.if as a keyword like dhcp and call ifconfig
inet6 autoconf.
"reads good" todd@
OK krw@ (who is *not* an IPv6 person), but I recruited him in his
capacity as an installer person.

Revision 1.799 / (download) - annotate - [select for diffs], Tue Nov 18 19:00:16 2014 UTC (9 years, 11 months ago) by rpe
Branch: MAIN
Changes since 1.798: +5 -1 lines
Diff to previous 1.798 (colored)

Delete tmp directory in /mnt/var during upgrades right before the
extraction of baseXX.tgz creates the symlink to ../tmp.

OK deraadt

Revision 1.798 / (download) - annotate - [select for diffs], Tue Nov 11 21:31:29 2014 UTC (9 years, 11 months ago) by rpe
Branch: MAIN
Changes since 1.797: +2 -2 lines
Diff to previous 1.797 (colored)

Store autoinstaller logfile in /mnt/var/log to be available after
reboot and to cope with an upcoming change to /var/tmp.

Noted by and OK halex@
OK deraadt@

Revision 1.797 / (download) - annotate - [select for diffs], Sun Oct 26 23:31:00 2014 UTC (10 years ago) by krw
Branch: MAIN
Changes since 1.796: +117 -93 lines
Diff to previous 1.796 (colored)

Defer processing hostname.if files for trunks, svlans and vlans
during upgrades. This ensures all physical interfaces are configured
first, as is done in /etc/netstart.

Currently only vlans are present in install images, but that could
change.

Requested by many so trunks might work during upgrades.  Prodded
by henning@ actually creating a diff to add trunks to boot images.

Tested & ok rpe@ sthen@

Revision 1.796 / (download) - annotate - [select for diffs], Thu Oct 23 21:33:21 2014 UTC (10 years ago) by rpe
Branch: MAIN
Changes since 1.795: +60 -47 lines
Diff to previous 1.795 (colored)

Extend autoinstall(8) feature:

- Ask for responsefile location (url or local path) if dhcp discovery
  fails for location or mode.  If 'next-server' is found in dhcp lease
  file, provide a default url http://next-server/install.conf.

- Ask for installer mode if the specified response file name does not
  match *install.conf or *upgrade.conf.

- If present, use /auto_install.conf or /auto_upgrade.conf as response
  file for unattended installation or upgrade.

- Automatically start installer in unattended mode if either one of
  these files is present when the system boots.

- Document changes in manpage and installation notes.

OK krw@ deraadt@

Revision 1.795 / (download) - annotate - [select for diffs], Wed Oct 8 00:26:38 2014 UTC (10 years ago) by krw
Branch: MAIN
Changes since 1.794: +2 -2 lines
Diff to previous 1.794 (colored)

sl(4) was tedu'd. No need to filter it out of interface list anymore.

Revision 1.794 / (download) - annotate - [select for diffs], Fri Sep 26 15:44:21 2014 UTC (10 years, 1 month ago) by benno
Branch: MAIN
Changes since 1.793: +4 -3 lines
Diff to previous 1.793 (colored)

make the default of the "Change the default console" question depend
on whether the install is done on a serial console.

ok halex@, deraadt@ likes it too

Revision 1.793 / (download) - annotate - [select for diffs], Sun Aug 31 20:10:36 2014 UTC (10 years, 1 month ago) by rpe
Branch: MAIN
Changes since 1.792: +5 -6 lines
Diff to previous 1.792 (colored)

The xetc set is now part of xbase and not distributed separately anymore.
Extract it from xbase during installation.

OK ajacoutot@

Revision 1.792 / (download) - annotate - [select for diffs], Tue Aug 26 20:19:26 2014 UTC (10 years, 2 months ago) by rpe
Branch: MAIN
Changes since 1.791: +10 -7 lines
Diff to previous 1.791 (colored)

Create etc set during 'make build' and embed it in base set to make
it available during a regular install or upgrade so that it doesn't
need to be independently fetched.

Idea, directions and OK deraadt@
Feedback and Ok halex@ and aja@

Revision 1.791 / (download) - annotate - [select for diffs], Sun Aug 10 20:54:17 2014 UTC (10 years, 2 months ago) by rpe
Branch: MAIN
Changes since 1.790: +8 -8 lines
Diff to previous 1.790 (colored)

[] -> [[]]

OK krw@
"well ok" halex@

Revision 1.790 / (download) - annotate - [select for diffs], Sun Aug 10 16:32:28 2014 UTC (10 years, 2 months ago) by rpe
Branch: MAIN
Changes since 1.789: +10 -17 lines
Diff to previous 1.789 (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.789 / (download) - annotate - [select for diffs], Sat Aug 9 21:51:29 2014 UTC (10 years, 2 months ago) by halex
Branch: MAIN
Changes since 1.788: +10 -10 lines
Diff to previous 1.788 (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.788 / (download) - annotate - [select for diffs], Mon Jul 28 14:12:14 2014 UTC (10 years, 3 months ago) by kettenis
Branch: MAIN
CVS Tags: OPENBSD_5_6_BASE, OPENBSD_5_6
Changes since 1.787: +2 -2 lines
Diff to previous 1.787 (colored)

Avoid matching a particular driver for "aperture needed" detection.
On sparc64 we also need to match machfb(4) in addition to vgafb(4) so let's
just match any driver.

ok halex@, deraadt@

Revision 1.787 / (download) - annotate - [select for diffs], Mon Jul 28 05:42:26 2014 UTC (10 years, 3 months ago) by rpe
Branch: MAIN
Changes since 1.786: +2 -2 lines
Diff to previous 1.786 (colored)

Change detection of unconfigured vlan interfaces from using flags to
looking for vlan id and parent interface. This avoids the creation of
unconfigured vlan interface every time /install is restarted.

Noted by and OK miod@
OK krw@
Positive feedback sthen@ claudio@

Revision 1.786 / (download) - annotate - [select for diffs], Tue Jul 22 17:01:33 2014 UTC (10 years, 3 months ago) by deraadt
Branch: MAIN
Changes since 1.785: +4 -4 lines
Diff to previous 1.785 (colored)

use a better style of sh code around aperture

Revision 1.785 / (download) - annotate - [select for diffs], Tue Jul 22 06:45:31 2014 UTC (10 years, 3 months ago) by ajacoutot
Branch: MAIN
Changes since 1.784: +5 -13 lines
Diff to previous 1.784 (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.784 / (download) - annotate - [select for diffs], Sun Jul 20 20:08:44 2014 UTC (10 years, 3 months ago) by deraadt
Branch: MAIN
Changes since 1.783: +13 -1 lines
Diff to previous 1.783 (colored)

if we think this is a laptop (wsdisplay.....) ask a lidsuspend
question.  Let's see who whines.

Revision 1.783 / (download) - annotate - [select for diffs], Sun Jul 20 18:13:22 2014 UTC (10 years, 3 months ago) by deraadt
Branch: MAIN
Changes since 1.782: +2 -2 lines
Diff to previous 1.782 (colored)

match on vga1 or vgafb0, well, let's just call it vga.* for now

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

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

ok deraadt@ rpe@

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

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

Revision 1.780 / (download) - annotate - [select for diffs], Sun Jul 13 21:24:43 2014 UTC (10 years, 3 months ago) by rpe
Branch: MAIN
Changes since 1.779: +15 -16 lines
Diff to previous 1.779 (colored)

Only set machdep.allowaperture if 'vga1: aperture needed' is found
in dmesg output. Use that information to decide whether or not to
ask the user if he intends to use X.

initial diff from and OK halex@
OK deraadt@

Revision 1.779 / (download) - annotate - [select for diffs], Sun Jul 13 13:53:36 2014 UTC (10 years, 3 months ago) by rpe
Branch: MAIN
Changes since 1.778: +4 -11 lines
Diff to previous 1.778 (colored)

- move the ntpd.conf file to examples directory
- move it from BIN1 to EXAMPLES in src/etc/Makefile
- change the installer to create the file instead of editing it
- add a '+' to the corresponding changelist entry

suggested by and OK deraadt@
OK for the installer change krw@

Revision 1.778 / (download) - annotate - [select for diffs], Sat Jul 12 15:27:15 2014 UTC (10 years, 3 months ago) by rpe
Branch: MAIN
Changes since 1.777: +1 -7 lines
Diff to previous 1.777 (colored)

xbase has its own cpp now so it doesn't depend on comp anymore.
Remove the code introduced in r1.723 to tie them together.

OK deraadt@

Revision 1.777 / (download) - annotate - [select for diffs], Fri Jul 11 13:21:08 2014 UTC (10 years, 3 months ago) by deraadt
Branch: MAIN
Changes since 1.776: +1 -6 lines
Diff to previous 1.776 (colored)

take the directories specified by BSD.local.dist, and add them into
4.4BSD.dist.  The base set grows by a tiny amount, but we no longer
need to run chroot'd dynamic mtree from the installer.
ok espie halex schwarze

Revision 1.776 / (download) - annotate - [select for diffs], Mon Jun 16 19:31:41 2014 UTC (10 years, 4 months ago) by rpe
Branch: MAIN
Changes since 1.775: +7 -8 lines
Diff to previous 1.775 (colored)

Allow autoinstall to fetch/install sets from multiple locations.

Noted by and OK sebastia@
OK halex@

Revision 1.775 / (download) - annotate - [select for diffs], Mon Jun 9 18:05:55 2014 UTC (10 years, 4 months ago) by rpe
Branch: MAIN
Changes since 1.774: +1 -3 lines
Diff to previous 1.774 (colored)

remove sysmerge leftovers

OK halex@ krw@

Revision 1.774 / (download) - annotate - [select for diffs], Sun May 11 08:23:46 2014 UTC (10 years, 5 months ago) by rpe
Branch: MAIN
Changes since 1.773: +5 -2 lines
Diff to previous 1.773 (colored)

Fix configuration of static IPv6 default gateway
- Append IPv4 default gw to /tmp/mygate instead of overwriting it.
- Delete /tmp/mygate at the beginning of configure_ifs() to reset
  previous default gw config on installer restarts.

pointed out by todd@
OK halex@ krw@

Revision 1.773 / (download) - annotate - [select for diffs], Sat May 10 17:25:21 2014 UTC (10 years, 5 months ago) by rpe
Branch: MAIN
Changes since 1.772: +13 -7 lines
Diff to previous 1.772 (colored)

Fix v6_defroute() for automatic installation.

OK krw@ halex@

Revision 1.772 / (download) - annotate - [select for diffs], Thu May 8 16:46:47 2014 UTC (10 years, 5 months ago) by krw
Branch: MAIN
Changes since 1.771: +3 -3 lines
Diff to previous 1.771 (colored)

"Server?" -> "HTTP Server?" to allow unambiguous auto-install
handling.

Confusion with "NTP Server?" reported by Xavier Claude via misc@.

ok rpe@ halex@

Revision 1.771 / (download) - annotate - [select for diffs], Mon May 5 00:09:16 2014 UTC (10 years, 5 months ago) by bluhm
Branch: MAIN
Changes since 1.770: +10 -10 lines
Diff to previous 1.770 (colored)

Redirecting stderr to /dev/null suppresses all errors.  Instead use
the new status=none feature to make dd quiet.
OK krw@ deraadt@

Revision 1.770 / (download) - annotate - [select for diffs], Sun May 4 13:08:39 2014 UTC (10 years, 5 months ago) by krw
Branch: MAIN
Changes since 1.769: +2 -3 lines
Diff to previous 1.769 (colored)

Revert previous. Insufficient discussion. Introduces
inconsistancy between configured and unconfigured interfaces.

Requested by deraadt@

Revision 1.769 / (download) - annotate - [select for diffs], Sun May 4 10:47:25 2014 UTC (10 years, 5 months ago) by krw
Branch: MAIN
Changes since 1.768: +3 -2 lines
Diff to previous 1.768 (colored)

Make answering 'none' to the installer question "IPv6 address?" result
in no IPv6 address, by appending '-inet6' to the generated hostname.<if>
file.

Less surprising to many people.

ok henning@ reyk@ beck@ rpe@

Revision 1.768 / (download) - annotate - [select for diffs], Fri Apr 25 19:34:24 2014 UTC (10 years, 6 months ago) by halex
Branch: MAIN
Changes since 1.767: +3 -3 lines
Diff to previous 1.767 (colored)

filter excess data from autoinstall output *before* it ends up in the
log file on the ramdisk, in order not to run out of its precious space

reported by, tested and ok sebastia@

Revision 1.767 / (download) - annotate - [select for diffs], Mon Apr 21 23:15:09 2014 UTC (10 years, 6 months ago) by rpe
Branch: MAIN
Changes since 1.766: +2 -1 lines
Diff to previous 1.766 (colored)

Avoid a loop during autoinstall in case the path in the responsefile does
not exist.

OK halex@ krw@

Revision 1.766 / (download) - annotate - [select for diffs], Mon Apr 21 19:05:40 2014 UTC (10 years, 6 months ago) by rpe
Branch: MAIN
Changes since 1.765: +18 -28 lines
Diff to previous 1.765 (colored)

Change dhcp_request() and v4_config() to be able to configure dhcp
for an interface without an active network connection.

- Don't write options to dhclient.conf that are default. Only use
  the 'host-name' option for hostname associated dhcp requests.

- Run dhclient with options to reduce the time it takes to finish
  in case it gets no answer from a DHCP server.

- Don't bother removing the interface from group dhcp and save the
  configuration files even if dhclient fails. If the same interface
  is statically configured later, it is removed from the group dhcp.

- Add 'dhcp' to hostname.if file regardless whether dhcp_request()
  was successful or not.

- Change the Netmask question to be more autoinstaller friendly.

based on krw's work
discussed with and OK krw@

Revision 1.765 / (download) - annotate - [select for diffs], Mon Apr 21 15:56:19 2014 UTC (10 years, 6 months ago) by rpe
Branch: MAIN
Changes since 1.764: +2 -2 lines
Diff to previous 1.764 (colored)

Use a better way that ensures that NIFS is really 0 if there are no
hostname.if files.

suggested by and OK halex@
OK krw@

Revision 1.764 / (download) - annotate - [select for diffs], Mon Apr 21 12:41:36 2014 UTC (10 years, 6 months ago) by rpe
Branch: MAIN
Changes since 1.763: +3 -2 lines
Diff to previous 1.763 (colored)

NIFS is supposed to represent the number of configured interfaces.
If an interface got configured twice, NIFS must not be incremented.
So count the number of hostname.if files instead.

discussed with and OK krw@

Revision 1.763 / (download) - annotate - [select for diffs], Sun Apr 20 15:53:57 2014 UTC (10 years, 6 months ago) by rpe
Branch: MAIN
Changes since 1.762: +4 -11 lines
Diff to previous 1.762 (colored)

Only issue a single dhcp requests per interface with the host-name
option set. Remove the second request, which does not provide the
host-name option. The client supplied hostname is used in certain
setups by DHCP servers to update DNS records on behalf of clients
and ensures that the hostname information is in the lease db.

discussed with deraadt
ok krw@ halex@

Revision 1.762 / (download) - annotate - [select for diffs], Sun Apr 20 10:51:59 2014 UTC (10 years, 6 months ago) by rpe
Branch: MAIN
Changes since 1.761: +2 -2 lines
Diff to previous 1.761 (colored)

Simplify shell pattern.

OK krw@

Revision 1.761 / (download) - annotate - [select for diffs], Sat Apr 19 18:31:24 2014 UTC (10 years, 6 months ago) by rpe
Branch: MAIN
Changes since 1.760: +5 -8 lines
Diff to previous 1.760 (colored)

populateusrlocal() is used only once in finish_up(). Just fold it in there.

OK krw@ halex@

Revision 1.760 / (download) - annotate - [select for diffs], Sat Apr 19 16:50:52 2014 UTC (10 years, 6 months ago) by rpe
Branch: MAIN
Changes since 1.759: +5 -11 lines
Diff to previous 1.759 (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.759 / (download) - annotate - [select for diffs], Wed Apr 16 13:12:22 2014 UTC (10 years, 6 months ago) by krw
Branch: MAIN
Changes since 1.758: +2 -2 lines
Diff to previous 1.758 (colored)

Tweak network interface configuration so that after 1st attempted
(rather than first successfull) configuration, the default selection
becomes [done]. This allows one to <cr> past network configuration.
e.g. when dhcp is not working.

Requested by deraadt@. ok halex@.

Revision 1.758 / (download) - annotate - [select for diffs], Fri Apr 4 19:44:02 2014 UTC (10 years, 6 months ago) by krw
Branch: MAIN
Changes since 1.757: +6 -4 lines
Diff to previous 1.757 (colored)

Change HTTP_PROXY back to http_proxy. This is an environment variable
for ftp(1) and not an install script global variable.

Pointed out by rpe@, and probably explains M. Lucas's problems of a
few days ago.

ok sthen@ halex@

Revision 1.757 / (download) - annotate - [select for diffs], Sat Mar 22 02:42:00 2014 UTC (10 years, 7 months ago) by krw
Branch: MAIN
Changes since 1.756: +9 -9 lines
Diff to previous 1.756 (colored)

Upper case another global variable (nifs -> NIFS).

Revision 1.756 / (download) - annotate - [select for diffs], Sat Mar 22 02:24:43 2014 UTC (10 years, 7 months ago) by krw
Branch: MAIN
Changes since 1.755: +2 -1 lines
Diff to previous 1.755 (colored)

Oops. MDMTDEVS is used to populate /dev. Put those bits back.

Revision 1.755 / (download) - annotate - [select for diffs], Sat Mar 22 01:13:02 2014 UTC (10 years, 7 months ago) by krw
Branch: MAIN
Changes since 1.754: +2 -51 lines
Diff to previous 1.754 (colored)

Remove 'tape' as a method for installing sets. Elite masters of unix
arcana able to do without instructions for tape installs, can do
without the crutch of script support. If any non-EMOUA tape users
surface, this is easy to restore.

ok halex@ on the actual diff.

Revision 1.754 / (download) - annotate - [select for diffs], Thu Mar 20 20:01:28 2014 UTC (10 years, 7 months ago) by krw
Branch: MAIN
Changes since 1.753: +90 -179 lines
Diff to previous 1.753 (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.753 / (download) - annotate - [select for diffs], Mon Mar 10 00:14:34 2014 UTC (10 years, 7 months ago) by rpe
Branch: MAIN
Changes since 1.752: +6 -18 lines
Diff to previous 1.752 (colored)

replace set size calculation with a fixed value
- reduce complexity
- don't abuse index.txt

OK halex@ krw@

Revision 1.752 / (download) - annotate - [select for diffs], Sun Mar 2 14:12:16 2014 UTC (10 years, 7 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_5_5_BASE, OPENBSD_5_5
Changes since 1.751: +6 -7 lines
Diff to previous 1.751 (colored)

the map-to-lowercase scheme for msdos is not going to work, because other
filesystems can contain mixed case files (ie. sgi).
discussed with krw and halex

Revision 1.751 / (download) - annotate - [select for diffs], Sun Mar 2 03:36:22 2014 UTC (10 years, 7 months ago) by deraadt
Branch: MAIN
Changes since 1.750: +2 -2 lines
Diff to previous 1.750 (colored)

move to official keys

Revision 1.750 / (download) - annotate - [select for diffs], Fri Feb 28 23:51:54 2014 UTC (10 years, 8 months ago) by krw
Branch: MAIN
Changes since 1.749: +7 -6 lines
Diff to previous 1.749 (colored)

Mount MSDOS partitions with '-l' and not '-s'. Force lists of file names
to all lower case. Check for install.$ARCH and sha256*. Fixes
getting sets from an MSDOS partition, which uebayasi@ reported was
broken, without impacting other sources for sets.

ok rpe@ halex@ deraadt@

Revision 1.749 / (download) - annotate - [select for diffs], Sat Feb 22 05:13:22 2014 UTC (10 years, 8 months ago) by deraadt
Branch: MAIN
Changes since 1.748: +2 -1 lines
Diff to previous 1.748 (colored)

Do an additional feed_random in the co-routine that is fetching the sets
like.  This is going to finish at a really unpredictable time, and
that is a swell time to do an aggressive push & stir.
ok halex

Revision 1.748 / (download) - annotate - [select for diffs], Fri Feb 21 19:47:31 2014 UTC (10 years, 8 months ago) by deraadt
Branch: MAIN
Changes since 1.747: +12 -13 lines
Diff to previous 1.747 (colored)

some spaces snuck in, and they cost us on the install media.  Not joking.
ok krw halex

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

oops, seperate pieces coming...

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

services

Revision 1.745 / (download) - annotate - [select for diffs], Thu Feb 20 00:26:14 2014 UTC (10 years, 8 months ago) by rpe
Branch: MAIN
Changes since 1.744: +4 -4 lines
Diff to previous 1.744 (colored)

Adjust alignment of ftp titles

OK halex@ deraadt@

Revision 1.744 / (download) - annotate - [select for diffs], Wed Feb 19 18:48:23 2014 UTC (10 years, 8 months ago) by rpe
Branch: MAIN
Changes since 1.743: +26 -14 lines
Diff to previous 1.743 (colored)

Improve the logic to find a filesystem to store the prefetched sets.

Prefer filesystems which are not used during extraction. They need
to have free space the size of the selected sets +10M. Otherwise
use any other filesystem that has four time the free space of the
selected sets to prevent overflow during the extraction.

joint work with and OK halex@
deraadt@ likes the direction
OK krw@

Revision 1.743 / (download) - annotate - [select for diffs], Fri Feb 7 23:28:21 2014 UTC (10 years, 8 months ago) by halex
Branch: MAIN
Changes since 1.742: +11 -9 lines
Diff to previous 1.742 (colored)

make sure a free bpf exists before dhclient is run, and remove some
prior workarounds

until we have clonable bpfs

ok rpe@ krw@

Revision 1.742 / (download) - annotate - [select for diffs], Mon Feb 3 23:28:00 2014 UTC (10 years, 8 months ago) by rpe
Branch: MAIN
Changes since 1.741: +2 -2 lines
Diff to previous 1.741 (colored)

Use get_ifdevs() to get the name of a possibly existing netboot
interface instead of using handrolled ifconfig | sed combo.

OK halex@ krw@

Revision 1.741 / (download) - annotate - [select for diffs], Sun Feb 2 19:33:23 2014 UTC (10 years, 8 months ago) by rpe
Branch: MAIN
Changes since 1.740: +3 -2 lines
Diff to previous 1.740 (colored)

Allow to use ************* (13 '*') as password in the response file
for accounts which have password logins disabled but login with e.g.
ssh-keys is still possible.

suggested and OK sthen@, OK halex@

Revision 1.740 / (download) - annotate - [select for diffs], Sun Feb 2 17:37:24 2014 UTC (10 years, 8 months ago) by rpe
Branch: MAIN
Changes since 1.739: +6 -7 lines
Diff to previous 1.739 (colored)

replace multiple grep with sed onliners in mount_mnt2()

with feedback and OK halex@

Revision 1.739 / (download) - annotate - [select for diffs], Sun Feb 2 17:10:33 2014 UTC (10 years, 8 months ago) by rpe
Branch: MAIN
Changes since 1.738: +2 -2 lines
Diff to previous 1.738 (colored)

fix typo
from Markus Lude markus _dot_ lude _at_ gmx _dot_ de

OK halex@

Revision 1.738 / (download) - annotate - [select for diffs], Sat Feb 1 23:16:16 2014 UTC (10 years, 8 months ago) by rpe
Branch: MAIN
Changes since 1.737: +22 -22 lines
Diff to previous 1.737 (colored)

remove -e sed option where only one command is used

OK halex@

Revision 1.737 / (download) - annotate - [select for diffs], Tue Jan 28 21:34:44 2014 UTC (10 years, 9 months ago) by halex
Branch: MAIN
Changes since 1.736: +6 -8 lines
Diff to previous 1.736 (colored)

trim sane_sets()

ok krw@

Revision 1.736 / (download) - annotate - [select for diffs], Mon Jan 27 23:18:53 2014 UTC (10 years, 9 months ago) by rpe
Branch: MAIN
Changes since 1.735: +45 -45 lines
Diff to previous 1.735 (colored)

remove spaces right before ; and ;;

OK halex@

Revision 1.735 / (download) - annotate - [select for diffs], Sun Jan 26 21:54:32 2014 UTC (10 years, 9 months ago) by rpe
Branch: MAIN
Changes since 1.734: +83 -34 lines
Diff to previous 1.734 (colored)

- extend logic to find a sensible location to place prefetched sets
- complain loudly on errors and give users a chance to react on them
- improve detection if ftp fails while fetching sets
- be more cautious while removing temporary directories

joint work with and ok halex@

Revision 1.734 / (download) - annotate - [select for diffs], Sun Jan 26 19:01:03 2014 UTC (10 years, 9 months ago) by rpe
Branch: MAIN
Changes since 1.733: +4 -3 lines
Diff to previous 1.733 (colored)

let ask_yn() return 0 for yes, 1 for no

from and OK halex@

Revision 1.733 / (download) - annotate - [select for diffs], Fri Jan 24 01:12:10 2014 UTC (10 years, 9 months ago) by halex
Branch: MAIN
Changes since 1.732: +6 -11 lines
Diff to previous 1.732 (colored)

don't ever use an unsigned SHA256

ok rpe@

Revision 1.732 / (download) - annotate - [select for diffs], Thu Jan 23 22:17:57 2014 UTC (10 years, 9 months ago) by deraadt
Branch: MAIN
Changes since 1.731: +2 -2 lines
Diff to previous 1.731 (colored)

watch out, a white space!

Revision 1.731 / (download) - annotate - [select for diffs], Thu Jan 23 21:56:42 2014 UTC (10 years, 9 months ago) by rpe
Branch: MAIN
Changes since 1.730: +12 -9 lines
Diff to previous 1.730 (colored)

- always show (ftp) progress bar with the appropriate title
- the Verifying part is done even if the sets are on local media

OK todd@ deraadt@

Revision 1.730 / (download) - annotate - [select for diffs], Thu Jan 23 01:04:41 2014 UTC (10 years, 9 months ago) by rpe
Branch: MAIN
Changes since 1.729: +6 -11 lines
Diff to previous 1.729 (colored)

first take in using ftp -D to more consistently show "named" progress
during (pre)fetch/verify/install

idea from and OK deraadt@

Revision 1.729 / (download) - annotate - [select for diffs], Fri Jan 17 01:15:27 2014 UTC (10 years, 9 months ago) by halex
Branch: MAIN
Changes since 1.728: +74 -22 lines
Diff to previous 1.728 (colored)

add signature checking and make checksum procedure more robust by
prefetching sets to a temporary directory within /home, iff it is a
separate mount point

with rpe@ and deraadt@, "ffiinaallllyyy .... OK" rpe@ (r.i.p. progress bars)

Revision 1.728 / (download) - annotate - [select for diffs], Wed Jan 15 00:55:21 2014 UTC (10 years, 9 months ago) by rpe
Branch: MAIN
Changes since 1.727: +2 -2 lines
Diff to previous 1.727 (colored)

Since we now show the installer output we want that new line back.

OK halex@

Revision 1.727 / (download) - annotate - [select for diffs], Sat Jan 11 23:28:02 2014 UTC (10 years, 9 months ago) by halex
Branch: MAIN
Changes since 1.726: +6 -7 lines
Diff to previous 1.726 (colored)

when selecting sets to install, postpone the xbase/comp check so the
comp set does not get readded if the xbase set is being removed later
on the same input line

"nice semantics" deraadt@

Revision 1.726 / (download) - annotate - [select for diffs], Wed Jan 8 21:53:35 2014 UTC (10 years, 9 months ago) by deraadt
Branch: MAIN
Changes since 1.725: +3 -6 lines
Diff to previous 1.725 (colored)

Switch to using the base sha256 command, rather than some customized
abomination.
install.sub chunk tested by rpe

Revision 1.725 / (download) - annotate - [select for diffs], Tue Jan 7 23:58:44 2014 UTC (10 years, 9 months ago) by rpe
Branch: MAIN
Changes since 1.724: +5 -4 lines
Diff to previous 1.724 (colored)

Make skipping the root fs DUID aware.

If ROOTDEV is either the device from fstab or the converted DUID
device name with the partition added, skip the current fstab entry

ok halex@

Revision 1.724 / (download) - annotate - [select for diffs], Sun Jan 5 01:52:17 2014 UTC (10 years, 9 months ago) by deraadt
Branch: MAIN
Changes since 1.723: +20 -1 lines
Diff to previous 1.723 (colored)

provide feed_random() and store_random().  The first is used by install or
upgrade to feed as much additional usable entropy (as early as possible)
to the current bsd.rd install kernel.  The latter is used late in the
procedure to store entropy for the next boot (of a real kernel)
based on an issue described by dtucker, must conversation with halex and rpe
tested by rpe

Revision 1.723 / (download) - annotate - [select for diffs], Mon Dec 23 13:57:05 2013 UTC (10 years, 10 months ago) by rpe
Branch: MAIN
Changes since 1.722: +8 -1 lines
Diff to previous 1.722 (colored)

The xbase set requires the comp set. If xbase is in the selection,
but not comp, put comp back in automatically.

suggested by and ok deraadt@
ok halex@

Revision 1.722 / (download) - annotate - [select for diffs], Wed Dec 18 08:04:16 2013 UTC (10 years, 10 months ago) by halex
Branch: MAIN
Changes since 1.721: +14 -9 lines
Diff to previous 1.721 (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.721 / (download) - annotate - [select for diffs], Mon Dec 16 16:58:22 2013 UTC (10 years, 10 months ago) by halex
Branch: MAIN
Changes since 1.720: +24 -11 lines
Diff to previous 1.720 (colored)

Replace `[RESPONSEFILE=...] install auto` voodoo with plain'ol getopts,
as discussed with uwe@ at some point.

ok krw@, rpe@, "Cool" uwe@

Revision 1.720 / (download) - annotate - [select for diffs], Mon Dec 16 08:15:21 2013 UTC (10 years, 10 months ago) by halex
Branch: MAIN
Changes since 1.719: +5 -3 lines
Diff to previous 1.719 (colored)

Change subject of install|upgrade log to match periodic maintenance
email subjects better.

ok deraadt@ rpe@
Suggested by, and "Lovely" deraadt@, "Sure" rpe@,

Revision 1.719 / (download) - annotate - [select for diffs], Wed Dec 11 23:28:01 2013 UTC (10 years, 10 months ago) by halex
Branch: MAIN
Changes since 1.718: +2 -2 lines
Diff to previous 1.718 (colored)

make the word-matching of the autoinstaller config file allow skipping
the trailing question mark, such as in "hostname = foo"

noted by, discussed with, and ok rpe@

Revision 1.718 / (download) - annotate - [select for diffs], Wed Dec 11 06:37:46 2013 UTC (10 years, 10 months ago) by halex
Branch: MAIN
Changes since 1.717: +4 -1 lines
Diff to previous 1.717 (colored)

for automated installs, use the hostname from the dhcp lease by default

ok rpe@

Revision 1.717 / (download) - annotate - [select for diffs], Mon Dec 9 23:14:34 2013 UTC (10 years, 10 months ago) by halex
Branch: MAIN
Changes since 1.716: +3 -2 lines
Diff to previous 1.716 (colored)

Make the response lookup of a question match on entire words, where
anything not being a whitespace is considered part of a word.

deraadt@ likes it, rpe@ has approved of the idea

Revision 1.716 / (download) - annotate - [select for diffs], Sun Dec 8 12:38:48 2013 UTC (10 years, 10 months ago) by stsp
Branch: MAIN
Changes since 1.715: +3 -4 lines
Diff to previous 1.715 (colored)

After a completed upgrade, present reboot and post-reboot instructions in a
more intuitive order: Show the 'After rebooting, run sysmerge' hint below
the line that explains how to reboot, instead of several lines above.
Suggested by a new user doing the first upgrade.
input/ok halex@ rpe@

Revision 1.715 / (download) - annotate - [select for diffs], Sat Dec 7 09:36:10 2013 UTC (10 years, 10 months ago) by halex
Branch: MAIN
Changes since 1.714: +23 -33 lines
Diff to previous 1.714 (colored)

Change the response file handling such that it "consumes" an answer
once it's been used, and allow the same question to be answered
multiple times. This way, responses to ask_which() questions no
longer need the special magic we had for them being on a single line.

idea from deraadt@
ok rpe@

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

Workaround closed stdin in non-interactive mode.

ok deraadt@

Revision 1.713 / (download) - annotate - [select for diffs], Thu Dec 5 00:44:49 2013 UTC (10 years, 10 months ago) by halex
Branch: MAIN
Changes since 1.712: +5 -5 lines
Diff to previous 1.712 (colored)

improve the question part (second line) of ask_which to actually include
the name of what we're asking for, rather than 'Which _one_ ...'
Improves things a lot for the autoinstaller.

ok rpe@

Revision 1.712 / (download) - annotate - [select for diffs], Wed Dec 4 21:21:35 2013 UTC (10 years, 10 months ago) by halex
Branch: MAIN
Changes since 1.711: +9 -15 lines
Diff to previous 1.711 (colored)

Defer spooling of the install log output mail until we are up and
running again, with our mail system of choice running.

ok deraadt@

Revision 1.711 / (download) - annotate - [select for diffs], Wed Dec 4 16:19:32 2013 UTC (10 years, 10 months ago) by krw
Branch: MAIN
Changes since 1.710: +2 -2 lines
Diff to previous 1.710 (colored)

Eliminate spurious space that breaks parsing of nwids containing
blanks.

Same fix was applied by todd@ to /etc/netstart (r1.114) in 2006.

Pointed out by Remy via bugs@. Thanks!

Revision 1.710 / (download) - annotate - [select for diffs], Wed Dec 4 01:08:49 2013 UTC (10 years, 10 months ago) by sthen
Branch: MAIN
Changes since 1.709: +2 -1 lines
Diff to previous 1.709 (colored)

the hostname.if for a vlan's parent interface should be mode 640 to avoid
a warning at first boot  ok deraadt

Revision 1.709 / (download) - annotate - [select for diffs], Sun Dec 1 21:01:01 2013 UTC (10 years, 10 months ago) by halex
Branch: MAIN
Changes since 1.708: +20 -13 lines
Diff to previous 1.708 (colored)

More robuse parsing of the DHCP lease file for autoinstall.  This will,
for example, bail out instead of producing annoying output if the
filename statement does not match auto_(install|upgrade).

Brought up again by Patrik Lundin, thanks!
ok rpe@

Revision 1.708 / (download) - annotate - [select for diffs], Sun Dec 1 01:54:23 2013 UTC (10 years, 10 months ago) by halex
Branch: MAIN
Changes since 1.707: +5 -1 lines
Diff to previous 1.707 (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.707 / (download) - annotate - [select for diffs], Fri Nov 29 22:28:12 2013 UTC (10 years, 11 months ago) by rpe
Branch: MAIN
Changes since 1.706: +8 -13 lines
Diff to previous 1.706 (colored)

Move the comments out of get_responsefile() into a description block
at the top.

ok halex@

Revision 1.706 / (download) - annotate - [select for diffs], Fri Nov 29 02:02:47 2013 UTC (10 years, 11 months ago) by rpe
Branch: MAIN
Changes since 1.705: +13 -13 lines
Diff to previous 1.705 (colored)

- Rename _bootdev to _ifdev now that we not only support
  the interface we netbooted from for initial dhcp reqest.
- Change the error message in case no response file was
  found to match the info message at the beginning.

ok krw@

Revision 1.705 / (download) - annotate - [select for diffs], Thu Nov 28 22:56:05 2013 UTC (10 years, 11 months ago) by rpe
Branch: MAIN
Changes since 1.704: +2 -3 lines
Diff to previous 1.704 (colored)

simplify the check if a responsefile line is valid

idea from and ok halex@

Revision 1.704 / (download) - annotate - [select for diffs], Thu Nov 28 22:31:07 2013 UTC (10 years, 11 months ago) by halex
Branch: MAIN
Changes since 1.703: +5 -2 lines
Diff to previous 1.703 (colored)

make ask_which bail out on a missing response in the autoinstall case
rather than looping endlessly.

ok rpe@

Revision 1.703 / (download) - annotate - [select for diffs], Thu Nov 28 21:20:40 2013 UTC (10 years, 11 months ago) by rpe
Branch: MAIN
Changes since 1.702: +7 -8 lines
Diff to previous 1.702 (colored)

- use IFS=<space><tab> to trim the leading/trailing blanks with read
- simplify the key/value splitting with a true halexism
- recognize a line without a '=' by counting the chars in _key/_val
  instead of doing a string comparison which needs a temporary _k var
- localize _l

ok krw@ halex@

Revision 1.702 / (download) - annotate - [select for diffs], Wed Nov 27 21:49:21 2013 UTC (10 years, 11 months ago) by deraadt
Branch: MAIN
Changes since 1.701: +3 -3 lines
Diff to previous 1.701 (colored)

wasteful spaces and tabs snuck in.  Actually, it's true -- this is one
place where they do matter...

Revision 1.701 / (download) - annotate - [select for diffs], Wed Nov 27 21:48:25 2013 UTC (10 years, 11 months ago) by rpe
Branch: MAIN
Changes since 1.700: +1 -4 lines
Diff to previous 1.700 (colored)

Remove an outdated comment.

ok krw@ halex@

Revision 1.700 / (download) - annotate - [select for diffs], Mon Nov 25 23:02:04 2013 UTC (10 years, 11 months ago) by rpe
Branch: MAIN
Changes since 1.699: +17 -3 lines
Diff to previous 1.699 (colored)

Allow auto install/upgrade in non-netbooted case.

Add some logic to get_responsefile() to select an interface for the
initial dhcp request which tells what to do (install/upgrade) and
where to fetch the responsefile from.

- if netbooted, use the interface in netboot group, or
- if only one interface exists, use it, or
- if more intefaces exist, ask user which one to use

Tweak ask_which() to be usable if $auto is true, but
$RESPSONSEFILE not yet set.

ok halex@ deraadt@

Revision 1.699 / (download) - annotate - [select for diffs], Mon Nov 25 21:51:48 2013 UTC (10 years, 11 months ago) by rpe
Branch: MAIN
Changes since 1.698: +26 -12 lines
Diff to previous 1.698 (colored)

Rework _autorespond()

- strip leading/trailing blanks from question
- strip leading blanks from answer
- compare questions case insensitive
- ignore empty and comment lines and lines without =
- treat empty/missing/multiple answers as error and exit
- ensure, that $RESPONSEFILE is actually an existing file.
- unset IFS to preserve leading/trailing blanks on read.
- use read -r, because we don't support line continuation in answers.
- simplify the "_i=0 but we have a default answer" case a bit.

lots of feedback from halex@
ok deraadt@ krw@

Revision 1.698 / (download) - annotate - [select for diffs], Sat Nov 23 13:25:47 2013 UTC (10 years, 11 months ago) by rpe
Branch: MAIN
Changes since 1.697: +20 -7 lines
Diff to previous 1.697 (colored)

- use a flag file to recognize a successfull autoinstaller run
- use a shorter constant logfile name
- quote From lines and remove ^M in ftp output from logfile
- provide the autoinstaller logfile as mail to root

with help and positive feedback halex@ krw@ deraadt@
ok halex@

Revision 1.697 / (download) - annotate - [select for diffs], Tue Nov 19 12:02:55 2013 UTC (10 years, 11 months ago) by rpe
Branch: MAIN
Changes since 1.696: +6 -4 lines
Diff to previous 1.696 (colored)

Fetch host specific responsefile, if that does not exist, fall back
to generic one.

noted by and ok phessler@
ok krw@ and positive feedback deraadt@

Revision 1.696 / (download) - annotate - [select for diffs], Mon Nov 18 21:31:39 2013 UTC (10 years, 11 months ago) by rpe
Branch: MAIN
Changes since 1.695: +19 -14 lines
Diff to previous 1.695 (colored)

Extract the information whether to install or upgrade in unattended
mode from DHCP attribute "filename", which has to be "auto_install"
or "auto_upgrade". For archs that use this attribute for the boot
program create a symbolic link to auto_install and/or auto_install.

Change the naming scheme for response files on the http server to
<mac-addres>-<install|upgrade>.conf where <mac-address> is the
lladdr of the netboot interface of to be installed/upgraded hosts,
e.g. 52:54:00:12:34:56-install.conf. This allows different response
files for multiple hosts.

ok krw@ deraadt@

Revision 1.695 / (download) - annotate - [select for diffs], Wed Nov 13 19:17:22 2013 UTC (10 years, 11 months ago) by rpe
Branch: MAIN
Changes since 1.694: +3 -2 lines
Diff to previous 1.694 (colored)

Ignore empty lines and emtpy answers in install.conf.

bug report from philip
e1c1bac6253dc54a1e89ddc046585792 at posteo dot net

ok halex@

Revision 1.694 / (download) - annotate - [select for diffs], Wed Nov 13 07:16:55 2013 UTC (10 years, 11 months ago) by rpe
Branch: MAIN
Changes since 1.693: +2 -3 lines
Diff to previous 1.693 (colored)

Ensure, that install.conf is non-empty and is
refetched on every restart of the autoinstaller.

ok halex@ krw@

Revision 1.693 / (download) - annotate - [select for diffs], Tue Nov 12 15:30:11 2013 UTC (10 years, 11 months ago) by rpe
Branch: MAIN
Changes since 1.692: +10 -9 lines
Diff to previous 1.692 (colored)

Make variables inside get_responsefile() local.

ok krw@ halex@

Revision 1.692 / (download) - annotate - [select for diffs], Tue Nov 12 13:20:47 2013 UTC (10 years, 11 months ago) by rpe
Branch: MAIN
Changes since 1.691: +9 -7 lines
Diff to previous 1.691 (colored)

Rework get_responsefile()

- Take netboot interface down and so kill a dhclient from a previous
  attempt and to free up the only bpf which exists in this installstage.
  Without this, we're not able to "restart" autoinstall because dhclient
  fails due to lack of bpf's. dhclient takes the interface up again.
- Remove -s leasefile check, it's implicitly done with -n SERVER check.
- Avoid possible sed error msgs by redirecting STDERR to /dev/null.
- Fetch install.conf in a ftp on-liner whithout unneccessary URL var.
- Shorten -s install.conf check,
- [] -> [[]] for consistency

ok krw@

Revision 1.691 / (download) - annotate - [select for diffs], Sat Nov 9 22:37:53 2013 UTC (10 years, 11 months ago) by rpe
Branch: MAIN
Changes since 1.690: +3 -1 lines
Diff to previous 1.690 (colored)

Abort autoinstaller in case of an invalid answer to a yes/no question.
Avoids an endless question/wrong answer loop.

with help from and ok halex@
ok krw@

Revision 1.690 / (download) - annotate - [select for diffs], Sat Nov 9 19:38:59 2013 UTC (10 years, 11 months ago) by rpe
Branch: MAIN
Changes since 1.689: +2 -1 lines
Diff to previous 1.689 (colored)

Abort automatic installation if no sets are found in install_files().

ok krw@ halex@

Revision 1.689 / (download) - annotate - [select for diffs], Sat Nov 9 19:32:55 2013 UTC (10 years, 11 months ago) by rpe
Branch: MAIN
Changes since 1.688: +3 -8 lines
Diff to previous 1.688 (colored)

Replace handrolled tolower() function with ksh equivalent.

ok krw@ halex@

Revision 1.688 / (download) - annotate - [select for diffs], Fri Nov 8 21:34:35 2013 UTC (10 years, 11 months ago) by rpe
Branch: MAIN
Changes since 1.687: +2 -2 lines
Diff to previous 1.687 (colored)

Use get_ifdevs() to get the interface name
which the system netbooted from.

"cool" uwe@ on a similar diff
ok krw@ halex@

Revision 1.687 / (download) - annotate - [select for diffs], Tue Nov 5 19:54:40 2013 UTC (10 years, 11 months ago) by uwe
Branch: MAIN
Changes since 1.686: +25 -23 lines
Diff to previous 1.686 (colored)

avoid touching the signal traps during autoinstall

With this, the installer finishes even when there are kernel messages
output during the installation. :)

original diff and ok halex@

Revision 1.686 / (download) - annotate - [select for diffs], Thu Oct 31 19:15:20 2013 UTC (10 years, 11 months ago) by halex
Branch: MAIN
Changes since 1.685: +12 -1 lines
Diff to previous 1.685 (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.685 / (download) - annotate - [select for diffs], Sun Oct 27 22:36:06 2013 UTC (11 years ago) by uwe
Branch: MAIN
Changes since 1.684: +108 -4 lines
Diff to previous 1.684 (colored)

Unattended installation using DHCP and a response file

For a completely unattended installation bsd.rd has to be netbooted,
a DHCP server must be running and provide "next-server", which will be
used to fetch "http://<next-server>/install.conf".  The format of the
response file is a list of "<key> = <value>" pairs where <key> is a
substring of the interactive question (case-insensitive) and <value> is
what would be entered interactively.

Minimal response file example:

  system hostname = openbsd
  password for root account = <...>
  network interfaces = re0
  IPv4 address for re0 = dhcp
  server? = <...>

This is a starting point, it still a bit rough.

ok krw@, many improvements by halex@

Revision 1.684 / (download) - annotate - [select for diffs], Mon Aug 19 21:07:22 2013 UTC (11 years, 2 months ago) by halex
Branch: MAIN
Changes since 1.683: +12 -1 lines
Diff to previous 1.683 (colored)

(temporarily) introduce upgrade_to64time_t() to handle the transition
to 64 bit time_t

prodded by deraadt@

Revision 1.683 / (download) - annotate - [select for diffs], Wed Jul 31 11:26:58 2013 UTC (11 years, 3 months ago) by ajacoutot
Branch: MAIN
Changes since 1.682: +3 -22 lines
Diff to previous 1.682 (colored)

Remove the sysmerge(8) glue from the installer -- it's never been used
and something else is in the work.

ok halex@ sthen@ deraadt@ kettenis@ phessler@

Revision 1.682 / (download) - annotate - [select for diffs], Sun Jul 21 22:06:51 2013 UTC (11 years, 3 months ago) by halex
Branch: MAIN
CVS Tags: OPENBSD_5_4_BASE, OPENBSD_5_4
Changes since 1.681: +1 -6 lines
Diff to previous 1.681 (colored)

stop adding static entries to /etc/hosts for dynamic ip addresses

"do it NOW" deraadt@

Revision 1.681 / (download) - annotate - [select for diffs], Mon Jun 10 21:19:29 2013 UTC (11 years, 4 months ago) by rpe
Branch: MAIN
Changes since 1.680: +13 -26 lines
Diff to previous 1.680 (colored)

rework v6_defroute()
- simplify search for an existing ipv6 def. route
- ensure, that $_routers holds a sorted and unique list
- show 'list #' in prompt only if there's a list to select from
- zap IFS/_oifs dance and simplify select loop
- set ipv6 def. route in v6_defroute() instead of in v6_config()

thanks naddy@ and todd@ for their feedback
ok sthen@, krw@ on a similar diff
with help from and ok halex@

Revision 1.680 / (download) - annotate - [select for diffs], Tue Jun 4 00:42:23 2013 UTC (11 years, 4 months ago) by halex
Branch: MAIN
Changes since 1.679: +2 -2 lines
Diff to previous 1.679 (colored)

supress errors that would occur if bioctl is missing or is run with an
unsupported disk as argument (e.g. wd*)

Revision 1.679 / (download) - annotate - [select for diffs], Sun Jun 2 14:55:39 2013 UTC (11 years, 4 months ago) by halex
Branch: MAIN
Changes since 1.678: +6 -12 lines
Diff to previous 1.678 (colored)

If case we're running installboot on a softraid device, make sure all
underlying device nodes exists. Also clean up makedev and allow it to
pass multiple arguments to MAKEDEV.

ok krw@ rpe@

Revision 1.678 / (download) - annotate - [select for diffs], Fri May 31 23:52:18 2013 UTC (11 years, 5 months ago) by halex
Branch: MAIN
Changes since 1.677: +9 -21 lines
Diff to previous 1.677 (colored)

clean up some IFS and input handling

ok rpe@

Revision 1.677 / (download) - annotate - [select for diffs], Fri May 31 06:27:08 2013 UTC (11 years, 5 months ago) by rpe
Branch: MAIN
Changes since 1.676: +28 -28 lines
Diff to previous 1.676 (colored)

remove unneeded '\' for line continuations

ok halex@ krw@

Revision 1.676 / (download) - annotate - [select for diffs], Sat May 25 15:00:25 2013 UTC (11 years, 5 months ago) by rpe
Branch: MAIN
Changes since 1.675: +10 -10 lines
Diff to previous 1.675 (colored)

remove first and last space within (( ))

ok halex@ krw@

Revision 1.675 / (download) - annotate - [select for diffs], Mon Mar 25 21:35:45 2013 UTC (11 years, 7 months ago) by halex
Branch: MAIN
Changes since 1.674: +6 -2 lines
Diff to previous 1.674 (colored)

during upgrade network setup, print friendlier error message if
/sbin/dhclient is required but missing

brought to attention by florian@
ok krw@

Revision 1.674 / (download) - annotate - [select for diffs], Wed Jan 2 20:35:00 2013 UTC (11 years, 9 months ago) by krw
Branch: MAIN
CVS Tags: OPENBSD_5_3_BASE, OPENBSD_5_3
Changes since 1.673: +25 -21 lines
Diff to previous 1.673 (colored)

Sync hostname.if parsing with /etc/netstart. Toss in a ipv6
'prefix' parsing fix.

ok rpe@ naddy@

Revision 1.673 / (download) - annotate - [select for diffs], Sun Dec 16 20:01:26 2012 UTC (11 years, 10 months ago) by rpe
Branch: MAIN
Changes since 1.672: +2 -2 lines
Diff to previous 1.672 (colored)

use grep -q instead of redirecting to /dev/null

ok krw@ halex@

Revision 1.672 / (download) - annotate - [select for diffs], Thu Nov 22 17:57:22 2012 UTC (11 years, 11 months ago) by ajacoutot
Branch: MAIN
Changes since 1.671: +2 -2 lines
Diff to previous 1.671 (colored)

Stop saying "please", people needs to run sysmerge(8) after an upgrade.
Also s/repair/update .

wording from sthen@
ok sthen@ deraadt@

Revision 1.671 / (download) - annotate - [select for diffs], Tue Nov 6 17:49:39 2012 UTC (11 years, 11 months ago) by krw
Branch: MAIN
Changes since 1.670: +4 -4 lines
Diff to previous 1.670 (colored)

Always setup lo0 with 127.0.0.1/8 when configuring the network,
whether installing or upgrading.

ok deraadt@

Revision 1.670 / (download) - annotate - [select for diffs], Sun Oct 21 06:41:14 2012 UTC (12 years ago) by deraadt
Branch: MAIN
Changes since 1.669: +1 -6 lines
Diff to previous 1.669 (colored)

remove some backwards compat for 5.0 -> 5.1/5.2 upgrades
ok krw matthieu

Revision 1.669 / (download) - annotate - [select for diffs], Sat Oct 20 22:40:25 2012 UTC (12 years ago) by halex
Branch: MAIN
Changes since 1.668: +2 -11 lines
Diff to previous 1.668 (colored)

waitftplist:
- simplify
- remove excess comments
- reduce verbosity

ok deraadt@ rpe@

Revision 1.668 / (download) - annotate - [select for diffs], Mon Oct 1 18:49:13 2012 UTC (12 years ago) by rpe
Branch: MAIN
Changes since 1.667: +1 -2 lines
Diff to previous 1.667 (colored)

remove check for negative numbers in resp
previous check ensures positive numbers

ok halex@

Revision 1.667 / (download) - annotate - [select for diffs], Sat Sep 29 17:42:10 2012 UTC (12 years, 1 month ago) by rpe
Branch: MAIN
Changes since 1.666: +7 -7 lines
Diff to previous 1.666 (colored)

use ++ operator for increments

ok halex@

Revision 1.666 / (download) - annotate - [select for diffs], Sat Sep 29 17:17:10 2012 UTC (12 years, 1 month ago) by rpe
Branch: MAIN
Changes since 1.665: +9 -9 lines
Diff to previous 1.665 (colored)

use (()) for arithmetic tests

ok halex@

Revision 1.665 / (download) - annotate - [select for diffs], Mon Sep 3 07:34:37 2012 UTC (12 years, 1 month ago) by deraadt
Branch: MAIN
Changes since 1.664: +11 -13 lines
Diff to previous 1.664 (colored)

compress arguments to the ftp command; ok halex

Revision 1.664 / (download) - annotate - [select for diffs], Mon Sep 3 04:35:30 2012 UTC (12 years, 1 month ago) by deraadt
Branch: MAIN
Changes since 1.663: +3 -2 lines
Diff to previous 1.663 (colored)

roll a comment to a new line, so that the comment-stripper can remove it

Revision 1.663 / (download) - annotate - [select for diffs], Mon Sep 3 04:34:36 2012 UTC (12 years, 1 month ago) by deraadt
Branch: MAIN
Changes since 1.662: +6 -6 lines
Diff to previous 1.662 (colored)

we CAPITALIZE variables used in multiple sh functions

Revision 1.662 / (download) - annotate - [select for diffs], Fri Jul 20 01:33:40 2012 UTC (12 years, 3 months ago) by krw
Branch: MAIN
CVS Tags: OPENBSD_5_2_BASE, OPENBSD_5_2
Changes since 1.661: +3 -3 lines
Diff to previous 1.661 (colored)

Replace some leading blanks before comments with leading tab. Noticed
by and diff from Robert at peichaer dot org.

Revision 1.661 / (download) - annotate - [select for diffs], Sat Jul 14 08:45:33 2012 UTC (12 years, 3 months ago) by halex
Branch: MAIN
Changes since 1.660: +2 -2 lines
Diff to previous 1.660 (colored)

as _resp is being localized by typeset -l, no need to localize it twice

from Robert Peichaer, thanks!

ok krw@

Revision 1.660 / (download) - annotate - [select for diffs], Thu Jul 12 10:42:48 2012 UTC (12 years, 3 months ago) by halex
Branch: MAIN
Changes since 1.659: +2 -2 lines
Diff to previous 1.659 (colored)

ksh does not properly separate the arguments in "$@" if IFS is an
empty string.

Since some places in the installer like to fiddle with IFS before
calling the various ask functions, be sure to use the positional
parameters one by one in those.

I believe the fix should really be applied to ksh, but this should
do for now.

ok deraadt@

Revision 1.659 / (download) - annotate - [select for diffs], Mon Jul 9 10:51:10 2012 UTC (12 years, 3 months ago) by halex
Branch: MAIN
Changes since 1.658: +24 -4 lines
Diff to previous 1.658 (colored)

when being asked which disk to install on, give the user the chance to
see some details for each device.

"Lovely" deraadt@ and some more ok's on previous similar versions

Revision 1.658 / (download) - annotate - [select for diffs], Sun Jul 8 10:10:18 2012 UTC (12 years, 3 months ago) by halex
Branch: MAIN
Changes since 1.657: +13 -18 lines
Diff to previous 1.657 (colored)

Move functionality from ask() to _ask() to make the latter more useful
from other places.

ok krw@

Revision 1.657 / (download) - annotate - [select for diffs], Sat Apr 21 10:17:26 2012 UTC (12 years, 6 months ago) by henning
Branch: MAIN
Changes since 1.656: +0 -10 lines
Diff to previous 1.656 (colored)

remove the "Do you want to do any manual network configuration?" question.
there is barely ever a need to do so these days, I for one don't remember
ever using it, and we have a well documented way of escaping to a shell at
any point in the install process, which the installer conveniently points
out right at the beginning.
stumbled upon while reviewing the upcoming 2nd edition of Michael Lucas'
"Absolute OpenBSD"
ok sthen deraadt halex krw

Revision 1.656 / (download) - annotate - [select for diffs], Mon Mar 12 22:45:39 2012 UTC (12 years, 7 months ago) by halex
Branch: MAIN
Changes since 1.655: +14 -14 lines
Diff to previous 1.655 (colored)

more cleanup of the bad style of closing fd 0-2

pre-lock ok krw@

Revision 1.655 / (download) - annotate - [select for diffs], Tue Nov 22 14:02:14 2011 UTC (12 years, 11 months ago) by krw
Branch: MAIN
CVS Tags: OPENBSD_5_1_BASE, OPENBSD_5_1
Changes since 1.654: +2 -2 lines
Diff to previous 1.654 (colored)

MAKEDEV never reports failure, always returning 0. So check for
error messages to detect failure to create a device.

Provides the user the intended chance to proceed without mounting
a filesystem whose device can't be created. Particularly useful
for softraid encrypted partitions that are not needed during an
upgrade.

ok halex@

Revision 1.654 / (download) - annotate - [select for diffs], Tue Nov 8 19:55:52 2011 UTC (12 years, 11 months ago) by deraadt
Branch: MAIN
Changes since 1.653: +2 -6 lines
Diff to previous 1.653 (colored)

Now that the code is well tested, don't ask the firmware question
anymore.  Saves 141 precious bytes on the inside of the media.
ok krw

Revision 1.653 / (download) - annotate - [select for diffs], Tue Oct 18 19:02:44 2011 UTC (13 years ago) by matthieu
Branch: MAIN
Changes since 1.652: +6 -1 lines
Diff to previous 1.652 (colored)

Fix xkb mistake: remove symbols/srvr_ctrl directory that is now a file
in xshareXX.tgz before extracting it.
With feedback from  halex@, krw@ and deraadt@.

Revision 1.652 / (download) - annotate - [select for diffs], Mon Aug 8 15:41:17 2011 UTC (13 years, 2 months ago) by halex
Branch: MAIN
CVS Tags: OPENBSD_5_0_BASE, OPENBSD_5_0
Changes since 1.651: +4 -8 lines
Diff to previous 1.651 (colored)

revert the last commit and do the right thing instead.

tested and ok krw@, "get it in" deraadt@

Revision 1.651 / (download) - annotate - [select for diffs], Sun Aug 7 15:07:22 2011 UTC (13 years, 2 months ago) by krw
Branch: MAIN
Changes since 1.650: +7 -3 lines
Diff to previous 1.650 (colored)

Check that timezones provided by the user do not include spaces.
e.g. 'Brazil/DeNoronha East'. Input with embedded spaces put the
install script into a state where a valid timezone could not be
entered.

Problem noted by and fix tested by Javier Bassi.

ok deraadt@

Revision 1.650 / (download) - annotate - [select for diffs], Tue Aug 2 20:40:52 2011 UTC (13 years, 2 months ago) by deraadt
Branch: MAIN
Changes since 1.649: +8 -7 lines
Diff to previous 1.649 (colored)

Disable upgrade-time sysmerge for the 5.0 release.  Between 4.9 and 5.0
/etc has changed in substantial ways.  Perhaps on the 5.0->5.1 transition
this will not be so scary.  As it is now, it is way too tempting for
inexperienced users with incredibly complex configurations to go into
sysmerge and cause themselves major havoc.

Revision 1.649 / (download) - annotate - [select for diffs], Tue Aug 2 15:52:04 2011 UTC (13 years, 2 months ago) by deraadt
Branch: MAIN
Changes since 1.648: +4 -4 lines
Diff to previous 1.648 (colored)

Say "firmware files" instead of "firmwares".  It is so hard to be clear
when they are per-device packages which can containing more than one
firmware files..
from sthen

Revision 1.648 / (download) - annotate - [select for diffs], Thu Jul 28 19:11:33 2011 UTC (13 years, 3 months ago) by halex
Branch: MAIN
Changes since 1.647: +2 -3 lines
Diff to previous 1.647 (colored)

remove unneeded echo in rc.firsttime, since fw_update became more verbose

ok deraadt krw

Revision 1.647 / (download) - annotate - [select for diffs], Thu Jul 14 14:54:57 2011 UTC (13 years, 3 months ago) by ajacoutot
Branch: MAIN
Changes since 1.646: +9 -11 lines
Diff to previous 1.646 (colored)

Fix a bug reported by "Remco" on misc@ where sysmerge(8) would fail to
run when upgrading using a CD.
The reason was that at the time sysmerge(8) would run (and gets its
sets), the CD would be unmounted. We are now taking a different approach
and get the (x)etc sets anyway according to whether base and/or xbase
was selected and put them under /tmp in the chroot.
This way whatever upgrade method is chosen, the sets will always be in
a consistent location.

ok krw@

Revision 1.646 / (download) - annotate - [select for diffs], Sat Jul 9 17:53:58 2011 UTC (13 years, 3 months ago) by halex
Branch: MAIN
Changes since 1.645: +3 -2 lines
Diff to previous 1.645 (colored)

move the 'updating firmwares' message into rc.firsttime rather than having
startup-like output in fw_update

"looks good" deraadt@

Revision 1.645 / (download) - annotate - [select for diffs], Sat Jul 9 03:14:53 2011 UTC (13 years, 3 months ago) by deraadt
Branch: MAIN
Changes since 1.644: +5 -1 lines
Diff to previous 1.644 (colored)

delete the ld.so.hints file on the ramdisk, because I am worried about
future messes now that there are a few more dynamics programs running
in chroot.

Revision 1.644 / (download) - annotate - [select for diffs], Sat Jul 9 03:12:24 2011 UTC (13 years, 3 months ago) by ajacoutot
Branch: MAIN
Changes since 1.643: +12 -5 lines
Diff to previous 1.643 (colored)

Unbreak sysmerge(8) with 'disk' install media.

reported by and ok krw@

Revision 1.643 / (download) - annotate - [select for diffs], Sat Jul 9 01:20:37 2011 UTC (13 years, 3 months ago) by halex
Branch: MAIN
Changes since 1.642: +11 -1 lines
Diff to previous 1.642 (colored)

Ask to install non-free firmwares at first boot

"go ahead" deraadt@

Revision 1.642 / (download) - annotate - [select for diffs], Wed Jul 6 23:38:41 2011 UTC (13 years, 3 months ago) by halex
Branch: MAIN
Changes since 1.641: +11 -12 lines
Diff to previous 1.641 (colored)

"Tweak previous", aka

- Globals variable names should not start with an underscore
- Fetch {,x}etcNN.tgz from where we found the corresponding base
  (meaning it must not be the same place)

"reads ok" todd@, ok krw@

Revision 1.641 / (download) - annotate - [select for diffs], Wed Jul 6 20:02:16 2011 UTC (13 years, 3 months ago) by halex
Branch: MAIN
Changes since 1.640: +8 -1 lines
Diff to previous 1.640 (colored)

As non-mp install.md's neither set NCPU, nor will have a bsd.mp,
we could as well pull the 'mv bsd.mp bsd' and the associated checks
out of there.

ok deraadt@ "makes sense" todd@

Revision 1.640 / (download) - annotate - [select for diffs], Wed Jul 6 15:35:15 2011 UTC (13 years, 3 months ago) by ajacoutot
Branch: MAIN
Changes since 1.639: +20 -1 lines
Diff to previous 1.639 (colored)

Add a new question to run sysmerge(8) at the end of an upgrade; defaults
to no.

The way it works is as follow:
- if baseXX was selected during the upgrade, etcXX will be added to the
args to pass to sysmerge(8)
- if xbaseXX was selected during the upgrade, xetcXX will be added to
the args to pass to sysmerge(8)
Note that etcXX and xetcXX will always be fetched from the first
installation source that was configured during the upgrade (it is most
likely that other sources contain site specific sets rather than the
base ones).
This option will not be available when using tape.

"read good" krw@
prodded by and ok (with love) pirofti@, ok deraadt@

Revision 1.639 / (download) - annotate - [select for diffs], Mon Jul 4 20:59:05 2011 UTC (13 years, 3 months ago) by halex
Branch: MAIN
Changes since 1.638: +1 -7 lines
Diff to previous 1.638 (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.638 / (download) - annotate - [select for diffs], Mon Apr 18 16:52:10 2011 UTC (13 years, 6 months ago) by thib
Branch: MAIN
Changes since 1.637: +3 -3 lines
Diff to previous 1.637 (colored)

Deprecate vnds in favour of svnds.

In effect, this removes the "old" vndX nodes, and renames
the svndX nodes to vndX.

Old svndX nodes will still continue to work though, for now.

Cleanup accordingly.

ok deraadt@, todd@
comments and ok on the man page bits from jmc@

Revision 1.637 / (download) - annotate - [select for diffs], Sun Apr 17 20:57:10 2011 UTC (13 years, 6 months ago) by krw
Branch: MAIN
Changes since 1.636: +2 -1 lines
Diff to previous 1.636 (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.636 / (download) - annotate - [select for diffs], Tue Mar 22 19:20:15 2011 UTC (13 years, 7 months ago) by krw
Branch: MAIN
Changes since 1.635: +3 -3 lines
Diff to previous 1.635 (colored)

Pay attention to result of amd64/i386 installboot(8).  Warn user
when they won't be able to boot the installed root disk.  Move
installboot invocation to just before congratulation on sucess is
emitted. Thus the installed partition will be 'complete' if it ever
is booted.

"go for it" deraadt@

Revision 1.635 / (download) - annotate - [select for diffs], Fri Feb 25 12:55:45 2011 UTC (13 years, 8 months ago) by krw
Branch: MAIN
CVS Tags: OPENBSD_4_9_BASE, OPENBSD_4_9
Changes since 1.634: +2 -2 lines
Diff to previous 1.634 (colored)

Silence a bit of error output when no ftplist can be downloaded.
Silence is golden. Problem seen and fix tested by guenther@.

ok guenther@ halex@

Revision 1.634 / (download) - annotate - [select for diffs], Mon Jan 31 16:48:18 2011 UTC (13 years, 8 months ago) by halex
Branch: MAIN
Changes since 1.633: +19 -21 lines
Diff to previous 1.633 (colored)

- do not run fsck for fstab entries with zero or empty fs_passno
- ask for permission to continue upgrade if one or more mounts failed

Fixes issue noted by Peter Miller, who also tested the diff. Thanks!

ok krw@

Revision 1.633 / (download) - annotate - [select for diffs], Thu Jan 6 16:59:06 2011 UTC (13 years, 9 months ago) by otto
Branch: MAIN
Changes since 1.632: +2 -2 lines
Diff to previous 1.632 (colored)

rephrase fsck question and default to 'n'; ok krw@ henning@ stsp@

Revision 1.632 / (download) - annotate - [select for diffs], Mon Jan 3 00:36:50 2011 UTC (13 years, 9 months ago) by deraadt
Branch: MAIN
Changes since 1.631: +8 -10 lines
Diff to previous 1.631 (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.631 / (download) - annotate - [select for diffs], Mon Nov 22 14:10:42 2010 UTC (13 years, 11 months ago) by halex
Branch: MAIN
Changes since 1.630: +17 -4 lines
Diff to previous 1.630 (colored)

create devices for fstab entries that are using the disklabel UID notation too

ok krw@, jsing@

Revision 1.630 / (download) - annotate - [select for diffs], Fri Nov 19 19:33:13 2010 UTC (13 years, 11 months ago) by halex
Branch: MAIN
Changes since 1.629: +10 -3 lines
Diff to previous 1.629 (colored)

- drop dhcp group from interfaces which did not go UP and got
  an ip address
- do the same on startup of the install/upgrade too
- do NOT do it unconditionally on all dhcp'd interfaces, since
  we use the group to retain state.

ok krw@, deraadt@

Revision 1.629 / (download) - annotate - [select for diffs], Thu Nov 18 23:25:46 2010 UTC (13 years, 11 months ago) by deraadt
Branch: MAIN
Changes since 1.628: +2 -2 lines
Diff to previous 1.628 (colored)

do not run makedev for a uid; ok krw

Revision 1.628 / (download) - annotate - [select for diffs], Fri Nov 12 06:47:40 2010 UTC (13 years, 11 months ago) by halex
Branch: MAIN
Changes since 1.627: +15 -5 lines
Diff to previous 1.627 (colored)

- introduce quote() which prints its arguments quoted for sh/ksh parsing
- use the aformentioned function to properly quote the wireless config
  into /etc/hostname.$if

Now, if only /etc/netstart didn't screw up whitespace...

"I don't speak Swahili, so I'm going to have to trust you" deraadt@
no objections from others, specifically so from krw@

Revision 1.627 / (download) - annotate - [select for diffs], Fri Nov 5 00:23:05 2010 UTC (13 years, 11 months ago) by halex
Branch: MAIN
Changes since 1.626: +2 -2 lines
Diff to previous 1.626 (colored)

Properly quote the wpakey argument. Fixes issue noted by tdm.

ok krw@

Revision 1.626 / (download) - annotate - [select for diffs], Thu Nov 4 06:39:19 2010 UTC (13 years, 11 months ago) by deraadt
Branch: MAIN
Changes since 1.625: +2 -2 lines
Diff to previous 1.625 (colored)

correct comment

Revision 1.625 / (download) - annotate - [select for diffs], Thu Nov 4 04:15:56 2010 UTC (13 years, 11 months ago) by deraadt
Branch: MAIN
Changes since 1.624: +2 -2 lines
Diff to previous 1.624 (colored)

default to using all the IPs for ntp servers; ok krw henning

Revision 1.624 / (download) - annotate - [select for diffs], Mon Oct 18 22:47:07 2010 UTC (14 years ago) by deraadt
Branch: MAIN
Changes since 1.623: +2 -2 lines
Diff to previous 1.623 (colored)

delete a wasteful space

Revision 1.623 / (download) - annotate - [select for diffs], Mon Oct 18 22:45:28 2010 UTC (14 years ago) by halex
Branch: MAIN
Changes since 1.622: +81 -1 lines
Diff to previous 1.622 (colored)

allow configuration of 802.11 interfaces in the installer

based on a diff from damien@
ok deraadt@

Revision 1.622 / (download) - annotate - [select for diffs], Mon Oct 18 04:18:26 2010 UTC (14 years ago) by deraadt
Branch: MAIN
Changes since 1.621: +2 -2 lines
Diff to previous 1.621 (colored)

no more misc set

Revision 1.621 / (download) - annotate - [select for diffs], Sun Sep 26 14:49:05 2010 UTC (14 years, 1 month ago) by joshe
Branch: MAIN
Changes since 1.620: +2 -2 lines
Diff to previous 1.620 (colored)

Correctly parse new hw.disknames output.

Nicer fix from guenther@, tested by editing install.sub while booted
into bsd.rd.

"please commit asap" deraadt@

Revision 1.620 / (download) - annotate - [select for diffs], Fri Sep 24 07:44:43 2010 UTC (14 years, 1 month ago) by ajacoutot
Branch: MAIN
Changes since 1.619: +2 -2 lines
Diff to previous 1.619 (colored)

Prefer -h instead over -L for symlink test.

ok deraadt@

Revision 1.619 / (download) - annotate - [select for diffs], Thu Sep 23 13:30:15 2010 UTC (14 years, 1 month ago) by jsing
Branch: MAIN
Changes since 1.618: +1 -1 lines
Diff to previous 1.618 (colored)

Teach the installer how to process the new hw.disknames output.

ok krw@

Revision 1.618 / (download) - annotate - [select for diffs], Mon Aug 30 09:52:07 2010 UTC (14 years, 2 months ago) by halex
Branch: MAIN
Changes since 1.617: +13 -12 lines
Diff to previous 1.617 (colored)

Make future work in the installer easier by reducing the amount of
eval craziness in install_url().

ok krw@

Revision 1.617 / (download) - annotate - [select for diffs], Sun Aug 8 21:06:06 2010 UTC (14 years, 2 months ago) by krw
Branch: MAIN
CVS Tags: OPENBSD_4_8_BASE, OPENBSD_4_8
Changes since 1.616: +1 -8 lines
Diff to previous 1.616 (colored)

Revert auto-enabling of apm. Some security implications were not
fully appreciated, and no time to work through them.

ok deraadt@

Revision 1.616 / (download) - annotate - [select for diffs], Sun Aug 8 17:02:14 2010 UTC (14 years, 2 months ago) by krw
Branch: MAIN
Changes since 1.615: +8 -1 lines
Diff to previous 1.615 (colored)

Look for MD devices or assurance that apmd would be a useful thing to
run. If found, add "apmd_flags=" installed rc.conf.local. Suggested by
deraadt@.

i386/apm test by kettenis@.

ok deraadt@

Revision 1.615 / (download) - annotate - [select for diffs], Thu Aug 5 10:45:32 2010 UTC (14 years, 2 months ago) by halex
Branch: MAIN
Changes since 1.614: +2 -2 lines
Diff to previous 1.614 (colored)

Return the old behaviour of exiting if a mount fails rather than ignoring it

ok krw@

Revision 1.614 / (download) - annotate - [select for diffs], Mon Aug 2 11:21:35 2010 UTC (14 years, 2 months ago) by krw
Branch: MAIN
Changes since 1.613: +2 -2 lines
Diff to previous 1.613 (colored)

Suppress MAKEDEV warnings about 'unknown device' that can appear
during upgrades when /etc/fstab is using disklabel UID's to mount
partitions.

Feedback & trash elimination from halex@

"That seems acceptable to me" deraadt@

Revision 1.613 / (download) - annotate - [select for diffs], Wed Jul 7 07:15:00 2010 UTC (14 years, 3 months ago) by halex
Branch: MAIN
Changes since 1.612: +1 -2 lines
Diff to previous 1.612 (colored)

zap chmod of /etc/pkg.conf since the installer itself will not put a username
or password in there, and any existing /etc/pkg.conf file will already have its
file mode preserved

"sure" deraadt@

Revision 1.612 / (download) - annotate - [select for diffs], Sun Jul 4 22:51:05 2010 UTC (14 years, 3 months ago) by deraadt
Branch: MAIN
Changes since 1.611: +2 -2 lines
Diff to previous 1.611 (colored)

600 i mean.  hackathon took it's toll.  pointed out by halex

Revision 1.611 / (download) - annotate - [select for diffs], Sun Jul 4 22:12:38 2010 UTC (14 years, 3 months ago) by deraadt
Branch: MAIN
Changes since 1.610: +2 -1 lines
Diff to previous 1.610 (colored)

the pkg.conf file should be mode 644, in case the user used a ftp
user:password (unlikely.. but)

Revision 1.610 / (download) - annotate - [select for diffs], Wed Jun 30 23:02:38 2010 UTC (14 years, 4 months ago) by phessler
Branch: MAIN
Changes since 1.609: +1 -3 lines
Diff to previous 1.609 (colored)

we don't need to add a localhost route for our hostname address, our arp
code is smarter these days.

a side effect of this was noticed by reyk@

OK claudio@ henning@

Revision 1.609 / (download) - annotate - [select for diffs], Wed Jun 30 20:22:01 2010 UTC (14 years, 4 months ago) by halex
Branch: MAIN
Changes since 1.608: +3 -5 lines
Diff to previous 1.608 (colored)

revert last ^D behaviour change

requested and well explained by krw@

Revision 1.608 / (download) - annotate - [select for diffs], Wed Jun 30 19:31:19 2010 UTC (14 years, 4 months ago) by halex
Branch: MAIN
Changes since 1.607: +6 -4 lines
Diff to previous 1.607 (colored)

make the installer quit when ^D is pressed at any prompt

ok deraadt@

Revision 1.607 / (download) - annotate - [select for diffs], Wed Jun 30 00:23:02 2010 UTC (14 years, 4 months ago) by halex
Branch: MAIN
Changes since 1.606: +3 -3 lines
Diff to previous 1.606 (colored)

handle whitespace around installpath in pkg.conf

feedback from espie@ deraadt@ krw@
ok krw@

Revision 1.606 / (download) - annotate - [select for diffs], Tue Jun 29 15:11:45 2010 UTC (14 years, 4 months ago) by halex
Branch: MAIN
Changes since 1.605: +20 -2 lines
Diff to previous 1.605 (colored)

After installing or updating from a public mirror, the installfrom=...
line in /etc/pkg.conf is set to point at the corresponding package
collection. The file is created if it does not exist.

discussed with deraadt@ and espie@
ok espie@

Revision 1.605 / (download) - annotate - [select for diffs], Sat Jun 26 20:44:15 2010 UTC (14 years, 4 months ago) by halex
Branch: MAIN
Changes since 1.604: +4 -4 lines
Diff to previous 1.604 (colored)

make http the default network install method rather than ftp

ok krw@

Revision 1.604 / (download) - annotate - [select for diffs], Mon Jun 21 02:54:46 2010 UTC (14 years, 4 months ago) by krw
Branch: MAIN
Changes since 1.603: +4 -5 lines
Diff to previous 1.603 (colored)

Argh. Back out previous until correct diff found.

Revision 1.603 / (download) - annotate - [select for diffs], Mon Jun 21 02:19:16 2010 UTC (14 years, 4 months ago) by krw
Branch: MAIN
Changes since 1.602: +5 -4 lines
Diff to previous 1.602 (colored)

Juggle code a bit and add a check so we don't attempt to create
a device from a UID name.

Revision 1.602 / (download) - annotate - [select for diffs], Mon Apr 5 01:09:45 2010 UTC (14 years, 6 months ago) by deraadt
Branch: MAIN
Changes since 1.601: +4 -5 lines
Diff to previous 1.601 (colored)

purge extra spaces which make the media cry

Revision 1.601 / (download) - annotate - [select for diffs], Sun Apr 4 22:29:08 2010 UTC (14 years, 6 months ago) by halex
Branch: MAIN
Changes since 1.600: +24 -6 lines
Diff to previous 1.600 (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.600 / (download) - annotate - [select for diffs], Tue Mar 9 23:34:09 2010 UTC (14 years, 7 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_4_7_BASE, OPENBSD_4_7
Changes since 1.599: +2 -2 lines
Diff to previous 1.599 (colored)

correctly choose the files in a directory, even if it is a symbolic link
also don't pull extra goop into the selector (do not use ls -l)
diff from halex
ok krw

Revision 1.599 / (download) - annotate - [select for diffs], Tue Mar 9 15:06:36 2010 UTC (14 years, 7 months ago) by krw
Branch: MAIN
Changes since 1.598: +5 -5 lines
Diff to previous 1.598 (colored)

Tweak default set selection so X sets are in the default list when
/etc/X11 already exists. So if you install X to a headless machine
and then upgrade you don't have to remember to add X sets.

Idea from landry@ who installs to a lot of ports boxen.

ok halex@ beck@ deraadt@

Revision 1.598 / (download) - annotate - [select for diffs], Thu Mar 4 02:07:55 2010 UTC (14 years, 7 months ago) by krw
Branch: MAIN
Changes since 1.597: +8 -9 lines
Diff to previous 1.597 (colored)

Gracefully handle trailing '/'s when asking for [sub]Timezones.
i.e. ignore them all. Problem pointed out by Sebastian Rother. More
script discipline and voodoo from halex@.

ok halex@ deraadt@

Revision 1.597 / (download) - annotate - [select for diffs], Tue Mar 2 01:24:50 2010 UTC (14 years, 8 months ago) by krw
Branch: MAIN
Changes since 1.596: +3 -3 lines
Diff to previous 1.596 (colored)

The -stable default ftp directory should not be snapshots/$ARCH.
The normal release directory is a less surprising default.

Suggested by henning@ a while ago. Working script incantation
courtesy of several cluebats from halex@. No strong opposition.

ok deraadt@

Revision 1.596 / (download) - annotate - [select for diffs], Wed Jan 13 00:15:26 2010 UTC (14 years, 9 months ago) by todd
Branch: MAIN
Changes since 1.595: +2 -2 lines
Diff to previous 1.595 (colored)

match the 'use 127.0.0.1/8 instead of 127.0.0.1 for clarity' change in netstart
sure henning@

Revision 1.595 / (download) - annotate - [select for diffs], Sun Jan 3 04:25:42 2010 UTC (14 years, 9 months ago) by krw
Branch: MAIN
Changes since 1.594: +6 -5 lines
Diff to previous 1.594 (colored)

Since we can now recognize new disks as they appear, loop waiting
for a root disk to appear if no disks are initially found.

Diff & ok from halex@, idea from deraadt@

Revision 1.594 / (download) - annotate - [select for diffs], Thu Jul 23 00:30:03 2009 UTC (15 years, 3 months ago) by krw
Branch: MAIN
Changes since 1.593: +2 -3 lines
Diff to previous 1.593 (colored)

Don't use the presence of /etc/fstab to determine if all filesystems
are umount'd at the start of install/upgrade. As halex@ pointed out
'umount -af' doesn't actually use /etc/fstab, so just always do it.
Fixes situations where bailing out of install/upgrade before
/etc/fstab was created meant filesystems were not umount'd and
restarting the install/upgrade would fail.

Noticed & prodded deraadt@

Revision 1.593 / (download) - annotate - [select for diffs], Tue Jul 14 23:45:16 2009 UTC (15 years, 3 months ago) by krw
Branch: MAIN
Changes since 1.592: +3 -1 lines
Diff to previous 1.592 (colored)

Add a couple of missing ';;'s in case statements. Both are just
before the 'esac' so there should be no functional change, but
consistancy feels so good.

ok halex@

Revision 1.592 / (download) - annotate - [select for diffs], Thu Jul 9 23:45:20 2009 UTC (15 years, 3 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_4_6_BASE, OPENBSD_4_6
Changes since 1.591: +2 -2 lines
Diff to previous 1.591 (colored)

The cd install method is called cd, not cdrom.  This gets told to the
back end, which feeds it back to us next time, and since we don't know
what it means... we ignore it.  That is dumb.

Revision 1.591 / (download) - annotate - [select for diffs], Mon Jul 6 22:11:11 2009 UTC (15 years, 3 months ago) by krw
Branch: MAIN
Changes since 1.590: +17 -15 lines
Diff to previous 1.590 (colored)

Fix handling of install info saving and fetching. May still be some
interesting behaviour with v6 '[]' ftp syntax, but best we can do
for 4.6. Testing and tweaking from halex@ and phessler@, and a host
of others in various previous versions.

ok halex@ deraadt@.

Revision 1.590 / (download) - annotate - [select for diffs], Fri Jul 3 00:42:47 2009 UTC (15 years, 3 months ago) by deraadt
Branch: MAIN
Changes since 1.589: +2 -2 lines
Diff to previous 1.589 (colored)

jmc becomes upset when nouns are used as verbs; via krw

Revision 1.589 / (download) - annotate - [select for diffs], Wed Jul 1 19:12:53 2009 UTC (15 years, 4 months ago) by deraadt
Branch: MAIN
Changes since 1.588: +2 -2 lines
Diff to previous 1.588 (colored)

Do not default to disk installs;  ftp or cdrom covers 99% of users; ok krw

Revision 1.588 / (download) - annotate - [select for diffs], Mon Jun 29 23:56:49 2009 UTC (15 years, 4 months ago) by deraadt
Branch: MAIN
Changes since 1.587: +9 -2 lines
Diff to previous 1.587 (colored)

Revert 1.558, making the installer (in the worst case) use the base-set
localtime zone for decision making.  But when we get into that situation,
also skip timezone manipulation the first time (before base install) and
defer it to after the base install (since that is the only time that file
exists).  Complicated?  It could be worse..
ok krw halex

Revision 1.587 / (download) - annotate - [select for diffs], Fri Jun 19 00:42:04 2009 UTC (15 years, 4 months ago) by krw
Branch: MAIN
Changes since 1.586: +3 -1 lines
Diff to previous 1.586 (colored)

Don't create bogus hosts file entries if too few parameters are
passed to addhostent(). Noticed by sthen@ and jsing@.

ok halex@ deraadt@

Revision 1.586 / (download) - annotate - [select for diffs], Fri Jun 12 08:25:57 2009 UTC (15 years, 4 months ago) by halex
Branch: MAIN
Changes since 1.585: +3 -2 lines
Diff to previous 1.585 (colored)

make the interrupt handler in install.sub print a linefeed and also make
sure to enable echoing of the input to the tty

ok krw@

Revision 1.585 / (download) - annotate - [select for diffs], Fri Jun 12 03:25:24 2009 UTC (15 years, 4 months ago) by krw
Branch: MAIN
Changes since 1.584: +6 -2 lines
Diff to previous 1.584 (colored)

Avoid vlan explosion reported by deraadt@, sthen@ and jsing@ when
^C'ing and restarting the install script. When looking for the next
vlan to offer, stop at the first unconfigured one rather than the
first non-existant one.

ok deraadt@

Revision 1.584 / (download) - annotate - [select for diffs], Thu Jun 11 04:21:27 2009 UTC (15 years, 4 months ago) by deraadt
Branch: MAIN
Changes since 1.583: +2 -2 lines
Diff to previous 1.583 (colored)

krw must not have tested his dhcp change from a scratch boot

Revision 1.583 / (download) - annotate - [select for diffs], Thu Jun 11 02:28:49 2009 UTC (15 years, 4 months ago) by krw
Branch: MAIN
Changes since 1.582: +6 -2 lines
Diff to previous 1.582 (colored)

Make 'dhcp' the default answer only if no other interface has
been configured to use dhcp. Requested by deraadt@.

Revision 1.582 / (download) - annotate - [select for diffs], Wed Jun 10 07:03:29 2009 UTC (15 years, 4 months ago) by deraadt
Branch: MAIN
Changes since 1.581: +3 -3 lines
Diff to previous 1.581 (colored)

A tighter printing format for the SHA256 hashes.

Revision 1.581 / (download) - annotate - [select for diffs], Wed Jun 10 07:01:25 2009 UTC (15 years, 4 months ago) by deraadt
Branch: MAIN
Changes since 1.580: +2 -3 lines
Diff to previous 1.580 (colored)

On systems without keyboard setting, the hostname choice had no blank line
above it.  It disturbed me deeply.

Revision 1.580 / (download) - annotate - [select for diffs], Wed Jun 10 01:28:10 2009 UTC (15 years, 4 months ago) by krw
Branch: MAIN
Changes since 1.579: +6 -1 lines
Diff to previous 1.579 (colored)

Count existing vlan's so restarting the script doesn't lose track of
which vlan to create next.

Revision 1.579 / (download) - annotate - [select for diffs], Wed Jun 10 00:53:40 2009 UTC (15 years, 4 months ago) by deraadt
Branch: MAIN
Changes since 1.578: +8 -4 lines
Diff to previous 1.578 (colored)

when sets cannot be found, do the 4-space indent dance to make the
failure list a whole lot prettier.
ok todd

Revision 1.578 / (download) - annotate - [select for diffs], Wed Jun 10 00:52:48 2009 UTC (15 years, 4 months ago) by deraadt
Branch: MAIN
Changes since 1.577: +3 -3 lines
Diff to previous 1.577 (colored)

the interface list should not be sorted.  use the order that ifconfig
chooses, since that is the order people are used to.  krw remembered
some weird behaviour, but i tested and could not find it
ok krw

Revision 1.577 / (download) - annotate - [select for diffs], Tue Jun 9 10:11:21 2009 UTC (15 years, 4 months ago) by halex
Branch: MAIN
Changes since 1.576: +108 -38 lines
Diff to previous 1.576 (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.576 / (download) - annotate - [select for diffs], Tue Jun 9 03:33:49 2009 UTC (15 years, 4 months ago) by krw
Branch: MAIN
Changes since 1.575: +5 -5 lines
Diff to previous 1.575 (colored)

Tighten and tweak keyboard question. Use 'layout' instead of 'type'
as suggested by mk@. Shortened verbiage allows us to bring back 'L'
as a way to list the alternate layouts, as pointed out by Andr?s
on tech@. On some keyboards finding the '?' can be a challenge
before the layout is set.

ok deraadt@

Revision 1.575 / (download) - annotate - [select for diffs], Sun Jun 7 03:52:29 2009 UTC (15 years, 4 months ago) by krw
Branch: MAIN
Changes since 1.574: +8 -1 lines
Diff to previous 1.574 (colored)

More tersification. Fixes verbiage issue reported by jdixon@ on
icb.

Revision 1.574 / (download) - annotate - [select for diffs], Fri Jun 5 05:43:42 2009 UTC (15 years, 4 months ago) by halex
Branch: MAIN
Changes since 1.573: +14 -4 lines
Diff to previous 1.573 (colored)

add some hostname sanity check
honour the path part of the suggested hostname/path combo

"please commit" deraadt@

Revision 1.573 / (download) - annotate - [select for diffs], Thu Jun 4 02:27:48 2009 UTC (15 years, 4 months ago) by sthen
Branch: MAIN
Changes since 1.572: +3 -1 lines
Diff to previous 1.572 (colored)

count nifs in enable_network(); allows ftplist to be fetched in the
upgrade case too.  ok deraadt@

Revision 1.572 / (download) - annotate - [select for diffs], Wed Jun 3 23:44:53 2009 UTC (15 years, 4 months ago) by krw
Branch: MAIN
Changes since 1.571: +1 -43 lines
Diff to previous 1.571 (colored)

Add hw.machine and kern.osrelease to install media sysctl. Using
these rather than hard coded variables allows the rationalization
of the greeting by moving it into dot.profile. Whack at dot.profile
a lot. Eliminate the 'Proceed with ...' question as unneeded.
Eliminate welcome().

ok deraadt@ "I like" todd@

Revision 1.571 / (download) - annotate - [select for diffs], Wed Jun 3 06:07:37 2009 UTC (15 years, 4 months ago) by halex
Branch: MAIN
Changes since 1.570: +8 -2 lines
Diff to previous 1.570 (colored)

make sure timezone and sets location gets sane defaults

ok krw@

Revision 1.570 / (download) - annotate - [select for diffs], Wed Jun 3 00:30:31 2009 UTC (15 years, 4 months ago) by krw
Branch: MAIN
Changes since 1.569: +4 -3 lines
Diff to previous 1.569 (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.569 / (download) - annotate - [select for diffs], Tue Jun 2 23:53:34 2009 UTC (15 years, 4 months ago) by krw
Branch: MAIN
Changes since 1.568: +7 -32 lines
Diff to previous 1.568 (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.568 / (download) - annotate - [select for diffs], Tue Jun 2 22:44:27 2009 UTC (15 years, 4 months ago) by krw
Branch: MAIN
Changes since 1.567: +57 -57 lines
Diff to previous 1.567 (colored)

Bring interface list handling up to disk and cd behaviour of being
able to detect added/deleted interfaces.

Tweak vlan handling. No longer delete interfaces as they are
configured so you can choose to reconfigure them.

ok deraadt@, ksh tweaks from halex@

Revision 1.567 / (download) - annotate - [select for diffs], Tue Jun 2 10:35:26 2009 UTC (15 years, 4 months ago) by halex
Branch: MAIN
Changes since 1.566: +2 -2 lines
Diff to previous 1.566 (colored)

strip /<version>/<arch> part from the install url before feeding it back
to the ftplist server

ok deraadt@

Revision 1.566 / (download) - annotate - [select for diffs], Tue Jun 2 08:59:22 2009 UTC (15 years, 4 months ago) by halex
Branch: MAIN
Changes since 1.565: +5 -5 lines
Diff to previous 1.565 (colored)

some sed cleanup and killing a cat

very similar diff ok krw@

Revision 1.565 / (download) - annotate - [select for diffs], Tue Jun 2 03:21:31 2009 UTC (15 years, 4 months ago) by halex
Branch: MAIN
Changes since 1.564: +13 -11 lines
Diff to previous 1.564 (colored)

make the eval's resistant to rouge user input

Revision 1.564 / (download) - annotate - [select for diffs], Sun May 31 17:57:27 2009 UTC (15 years, 5 months ago) by deraadt
Branch: MAIN
Changes since 1.563: +2 -2 lines
Diff to previous 1.563 (colored)

If xdm was requested, but then xbase was not installed, don't try to
enable it.
ok halex

Revision 1.563 / (download) - annotate - [select for diffs], Sun May 31 03:34:15 2009 UTC (15 years, 5 months ago) by krw
Branch: MAIN
Changes since 1.562: +20 -26 lines
Diff to previous 1.562 (colored)

Fix sane_sets. Set default set source to last successful source
until sane_install succeeds, then make it 'done'. Nuke a useless
bleet when harassing user.

Mostly requested by deraadt@

Revision 1.562 / (download) - annotate - [select for diffs], Sun May 31 00:03:29 2009 UTC (15 years, 5 months ago) by deraadt
Branch: MAIN
Changes since 1.561: +22 -9 lines
Diff to previous 1.561 (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.561 / (download) - annotate - [select for diffs], Sun May 31 00:02:50 2009 UTC (15 years, 5 months ago) by deraadt
Branch: MAIN
Changes since 1.560: +10 -9 lines
Diff to previous 1.560 (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.560 / (download) - annotate - [select for diffs], Sat May 30 20:40:59 2009 UTC (15 years, 5 months ago) by deraadt
Branch: MAIN
Changes since 1.559: +2 -7 lines
Diff to previous 1.559 (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.559 / (download) - annotate - [select for diffs], Sat May 30 19:32:20 2009 UTC (15 years, 5 months ago) by deraadt
Branch: MAIN
Changes since 1.558: +2 -2 lines
Diff to previous 1.558 (colored)

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

Revision 1.558 / (download) - annotate - [select for diffs], Sat May 30 18:17:16 2009 UTC (15 years, 5 months ago) by deraadt
Branch: MAIN
Changes since 1.557: +1 -6 lines
Diff to previous 1.557 (colored)

The TZ question can be asked at 3 different places.  In the "media which
lacks the names but we have net" case, we end up with installed sets.
Remove the code which guesses the TZ from the sets just installed.  We
now default to GMT, unless the ftplist.cgi made a better guess.

Revision 1.557 / (download) - annotate - [select for diffs], Fri May 29 00:46:41 2009 UTC (15 years, 5 months ago) by deraadt
Branch: MAIN
Changes since 1.556: +2 -1 lines
Diff to previous 1.556 (colored)

Remember to copy the modified ntpd.conf back to /etc
problem spotted by Thomas Pfaff

Revision 1.556 / (download) - annotate - [select for diffs], Thu May 28 02:34:56 2009 UTC (15 years, 5 months ago) by krw
Branch: MAIN
Changes since 1.555: +15 -10 lines
Diff to previous 1.555 (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.555 / (download) - annotate - [select for diffs], Sun May 24 00:17:37 2009 UTC (15 years, 5 months ago) by halex
Branch: MAIN
Changes since 1.554: +17 -23 lines
Diff to previous 1.554 (colored)

Make select_sets insensitive to rougue user input and
allow [+-] prefixing per whitespace separated parameter.

This makes it possible to write e.g.

  * -x* +xbase* done

The previous way of entering multiple sets separated by
pipes will no longer work.

ok krw@

Revision 1.554 / (download) - annotate - [select for diffs], Tue May 19 07:46:03 2009 UTC (15 years, 5 months ago) by halex
Branch: MAIN
Changes since 1.553: +13 -3 lines
Diff to previous 1.553 (colored)

refine login name and full user name sanity check

spotted by miod@
feedback and ok deraadt@, krw@

Revision 1.553 / (download) - annotate - [select for diffs], Tue May 19 02:56:45 2009 UTC (15 years, 5 months ago) by deraadt
Branch: MAIN
Changes since 1.552: +3 -3 lines
Diff to previous 1.552 (colored)

shorten ftp server install prompt; ok krw

Revision 1.552 / (download) - annotate - [select for diffs], Sun May 17 04:59:43 2009 UTC (15 years, 5 months ago) by deraadt
Branch: MAIN
Changes since 1.551: +2 -2 lines
Diff to previous 1.551 (colored)

add a period; Stephan A. Rickauer

Revision 1.551 / (download) - annotate - [select for diffs], Sun May 17 04:41:46 2009 UTC (15 years, 5 months ago) by deraadt
Branch: MAIN
Changes since 1.550: +4 -4 lines
Diff to previous 1.550 (colored)

noone needs to use halt.  reboot will do
discussed with jmc

Revision 1.550 / (download) - annotate - [select for diffs], Sun May 17 00:43:13 2009 UTC (15 years, 5 months ago) by deraadt
Branch: MAIN
Changes since 1.549: +2 -2 lines
Diff to previous 1.549 (colored)

do not hardcode the version into the script; ok krw miod

Revision 1.549 / (download) - annotate - [select for diffs], Sat May 16 08:51:57 2009 UTC (15 years, 5 months ago) by halex
Branch: MAIN
Changes since 1.548: +4 -4 lines
Diff to previous 1.548 (colored)

cleanup of set_timezone resulting in byte shaving and fixing an issue where
posixright would apprear in the listing of posix/ while it is actually its
sibling

Revision 1.548 / (download) - annotate - [select for diffs], Fri May 15 02:00:36 2009 UTC (15 years, 5 months ago) by krw
Branch: MAIN
Changes since 1.547: +2 -3 lines
Diff to previous 1.547 (colored)

Since _defdsk is now only set to "", just nuke it.

ok deraadt@

Revision 1.547 / (download) - annotate - [select for diffs], Fri May 15 01:40:42 2009 UTC (15 years, 5 months ago) by krw
Branch: MAIN
Changes since 1.546: +1 -11 lines
Diff to previous 1.546 (colored)

Zap tedious verbiage announcing disk configuration will start soon.

ok deraadt@

Revision 1.546 / (download) - annotate - [select for diffs], Fri May 15 01:31:01 2009 UTC (15 years, 5 months ago) by deraadt
Branch: MAIN
Changes since 1.545: +2 -2 lines
Diff to previous 1.545 (colored)

If we have more than one disk, we don't know what the user wants but done
is probably not the right default answer.  ok krw

Revision 1.545 / (download) - annotate - [select for diffs], Tue May 12 09:05:54 2009 UTC (15 years, 5 months ago) by halex
Branch: MAIN
Changes since 1.544: +4 -4 lines
Diff to previous 1.544 (colored)

Cleanup and shave some bytes in hextodec()

ok krw@, "If that works, commit it" deraadt@

Revision 1.544 / (download) - annotate - [select for diffs], Sat May 9 22:41:01 2009 UTC (15 years, 5 months ago) by martynas
Branch: MAIN
Changes since 1.543: +3 -3 lines
Diff to previous 1.543 (colored)

- ask_yn defaults to no
- remove trailing whitespace
ok krw@, sthen@

Revision 1.543 / (download) - annotate - [select for diffs], Sat May 9 21:34:23 2009 UTC (15 years, 5 months ago) by deraadt
Branch: MAIN
Changes since 1.542: +12 -2 lines
Diff to previous 1.542 (colored)

Read the netmask in dotted decimal notation, even though ifconfig does
the wrong thing.

Revision 1.542 / (download) - annotate - [select for diffs], Sat May 9 19:33:35 2009 UTC (15 years, 5 months ago) by deraadt
Branch: MAIN
Changes since 1.541: +2 -4 lines
Diff to previous 1.541 (colored)

IFS dance not needed

Revision 1.541 / (download) - annotate - [select for diffs], Sat May 9 19:11:11 2009 UTC (15 years, 5 months ago) by deraadt
Branch: MAIN
Changes since 1.540: +9 -9 lines
Diff to previous 1.540 (colored)

Pretty up the failed sets message

Revision 1.540 / (download) - annotate - [select for diffs], Fri May 8 18:39:57 2009 UTC (15 years, 5 months ago) by deraadt
Branch: MAIN
Changes since 1.539: +12 -1 lines
Diff to previous 1.539 (colored)

If sshd is enabled, and a user is setup, as if sshd should turn off
sshd's PermitRootLogin

Revision 1.539 / (download) - annotate - [select for diffs], Fri May 8 14:32:52 2009 UTC (15 years, 5 months ago) by deraadt
Branch: MAIN
Changes since 1.538: +13 -8 lines
Diff to previous 1.538 (colored)

improve user_setup by only accepting good usernames; idea from alexander
hall.  also improve the 2nd question designed for people not paying
attention; ok todd

Revision 1.538 / (download) - annotate - [select for diffs], Fri May 8 05:47:38 2009 UTC (15 years, 5 months ago) by deraadt
Branch: MAIN
Changes since 1.537: +2 -2 lines
Diff to previous 1.537 (colored)

use $nifs instead of hostname.* existance to determine if we should get ftplist

Revision 1.537 / (download) - annotate - [select for diffs], Fri May 8 03:01:42 2009 UTC (15 years, 5 months ago) by deraadt
Branch: MAIN
Changes since 1.536: +3 -3 lines
Diff to previous 1.536 (colored)

Since our order is now net, disk, TZ, we can increase the ftp timeout
up to 12 seconds more comfortably

Revision 1.536 / (download) - annotate - [select for diffs], Thu May 7 03:43:02 2009 UTC (15 years, 5 months ago) by todd
Branch: MAIN
Changes since 1.535: +44 -51 lines
Diff to previous 1.535 (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.535 / (download) - annotate - [select for diffs], Wed May 6 22:48:03 2009 UTC (15 years, 5 months ago) by sthen
Branch: MAIN
Changes since 1.534: +2 -2 lines
Diff to previous 1.534 (colored)

use /snapshots/ rather than /4.5/ when you choose a numbered mirror from
the list.  ok deraadt

Revision 1.534 / (download) - annotate - [select for diffs], Wed May 6 20:41:38 2009 UTC (15 years, 5 months ago) by todd
Branch: MAIN
Changes since 1.533: +2 -2 lines
Diff to previous 1.533 (colored)

make nifs init global, so it can be relied upon
ok deraadt@

Revision 1.533 / (download) - annotate - [select for diffs], Wed May 6 02:07:19 2009 UTC (15 years, 5 months ago) by krw
Branch: MAIN
Changes since 1.532: +4 -5 lines
Diff to previous 1.532 (colored)

Don't display 'No disks found.' after configuring the last disk.

"Silence is golden." deraadt@

Revision 1.532 / (download) - annotate - [select for diffs], Wed May 6 01:29:48 2009 UTC (15 years, 5 months ago) by deraadt
Branch: MAIN
Changes since 1.531: +108 -75 lines
Diff to previous 1.531 (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.531 / (download) - annotate - [select for diffs], Wed May 6 01:00:14 2009 UTC (15 years, 5 months ago) by krw
Branch: MAIN
Changes since 1.530: +1 -29 lines
Diff to previous 1.530 (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.530 / (download) - annotate - [select for diffs], Tue May 5 21:26:09 2009 UTC (15 years, 5 months ago) by deraadt
Branch: MAIN
Changes since 1.529: +7 -1 lines
Diff to previous 1.529 (colored)

accept TZ hints from the ftplist

Revision 1.529 / (download) - annotate - [select for diffs], Tue May 5 21:23:58 2009 UTC (15 years, 5 months ago) by deraadt
Branch: MAIN
Changes since 1.528: +2 -2 lines
Diff to previous 1.528 (colored)

shorter default answer for the nameserver question

Revision 1.528 / (download) - annotate - [select for diffs], Tue May 5 21:22:14 2009 UTC (15 years, 5 months ago) by deraadt
Branch: MAIN
Changes since 1.527: +15 -4 lines
Diff to previous 1.527 (colored)

If only one interface, and it is running dhclient, skip the
default route / domainname / nameserver questions we already
know the answers to

Revision 1.527 / (download) - annotate - [select for diffs], Tue May 5 21:16:34 2009 UTC (15 years, 5 months ago) by deraadt
Branch: MAIN
Changes since 1.526: +3 -1 lines
Diff to previous 1.526 (colored)

count network interfaces as we configure them

Revision 1.526 / (download) - annotate - [select for diffs], Tue May 5 21:14:46 2009 UTC (15 years, 5 months ago) by deraadt
Branch: MAIN
Changes since 1.525: +5 -5 lines
Diff to previous 1.525 (colored)

avoid changing directories a bit

Revision 1.525 / (download) - annotate - [select for diffs], Tue May 5 21:11:57 2009 UTC (15 years, 5 months ago) by deraadt
Branch: MAIN
Changes since 1.524: +3 -3 lines
Diff to previous 1.524 (colored)

tabs and spaces and pedantry for the user entry

Revision 1.524 / (download) - annotate - [select for diffs], Tue May 5 21:09:54 2009 UTC (15 years, 5 months ago) by deraadt
Branch: MAIN
Changes since 1.523: +5 -2 lines
Diff to previous 1.523 (colored)

cope with users who cannot read the username question

Revision 1.523 / (download) - annotate - [select for diffs], Tue May 5 19:36:31 2009 UTC (15 years, 5 months ago) by sthen
Branch: MAIN
Changes since 1.522: +2 -13 lines
Diff to previous 1.522 (colored)

adjust for ftp -DSMALL changes. been in test kernels tested by many.
ok martynas, deraadt

Revision 1.522 / (download) - annotate - [select for diffs], Tue May 5 18:54:40 2009 UTC (15 years, 5 months ago) by todd
Branch: MAIN
Changes since 1.521: +2 -2 lines
Diff to previous 1.521 (colored)

fix for upgrade and vlans
noticed by naddy@, tested by me, ok deraadt@

Revision 1.521 / (download) - annotate - [select for diffs], Tue May 5 00:37:09 2009 UTC (15 years, 5 months ago) by deraadt
Branch: MAIN
Changes since 1.520: +4 -4 lines
Diff to previous 1.520 (colored)

spaces to tabs

Revision 1.520 / (download) - annotate - [select for diffs], Mon May 4 22:07:28 2009 UTC (15 years, 5 months ago) by deraadt
Branch: MAIN
Changes since 1.519: +3 -2 lines
Diff to previous 1.519 (colored)

Make the http fetcher capable of dealing with more complex index.txt files

Revision 1.519 / (download) - annotate - [select for diffs], Mon May 4 21:45:11 2009 UTC (15 years, 5 months ago) by deraadt
Branch: MAIN
Changes since 1.518: +4 -6 lines
Diff to previous 1.518 (colored)

pass desired set path to ftplist

Revision 1.518 / (download) - annotate - [select for diffs], Mon May 4 06:21:58 2009 UTC (15 years, 5 months ago) by deraadt
Branch: MAIN
Changes since 1.517: +2 -2 lines
Diff to previous 1.517 (colored)

a bit of wordsmithing for the SHA256 message

Revision 1.517 / (download) - annotate - [select for diffs], Mon May 4 03:30:00 2009 UTC (15 years, 5 months ago) by deraadt
Branch: MAIN
Changes since 1.516: +2 -2 lines
Diff to previous 1.516 (colored)

ok, but the jobs stderr redirect from guenther is good

Revision 1.516 / (download) - annotate - [select for diffs], Mon May 4 03:16:11 2009 UTC (15 years, 5 months ago) by deraadt
Branch: MAIN
Changes since 1.515: +2 -2 lines
Diff to previous 1.515 (colored)

no, that way of looking at the jobs does not work

Revision 1.515 / (download) - annotate - [select for diffs], Mon May 4 02:30:59 2009 UTC (15 years, 5 months ago) by deraadt
Branch: MAIN
Changes since 1.514: +2 -2 lines
Diff to previous 1.514 (colored)

cleaner job watcher by guenther

Revision 1.514 / (download) - annotate - [select for diffs], Sun May 3 21:21:26 2009 UTC (15 years, 5 months ago) by deraadt
Branch: MAIN
Changes since 1.513: +1 -2 lines
Diff to previous 1.513 (colored)

delete XXX comment about upgrades; it should work

Revision 1.513 / (download) - annotate - [select for diffs], Sun May 3 21:20:47 2009 UTC (15 years, 5 months ago) by sthen
Branch: MAIN
Changes since 1.512: +4 -4 lines
Diff to previous 1.512 (colored)

don't emit spurious error when no network is configured, also fix typos.
ok deraadt@

Revision 1.512 / (download) - annotate - [select for diffs], Sun May 3 06:19:14 2009 UTC (15 years, 5 months ago) by deraadt
Branch: MAIN
Changes since 1.511: +50 -19 lines
Diff to previous 1.511 (colored)

Use the new ftplist backend which tries to intelligently provide you with
the ftp server you probably want to use.  Some XXX's in the code still;
please report issues to me.
ok krw

Revision 1.511 / (download) - annotate - [select for diffs], Sun May 3 03:35:17 2009 UTC (15 years, 5 months ago) by deraadt
Branch: MAIN
Changes since 1.510: +3 -3 lines
Diff to previous 1.510 (colored)

the _oifs variables should be local; spotted by Alexander Hall

Revision 1.510 / (download) - annotate - [select for diffs], Sun May 3 00:27:28 2009 UTC (15 years, 5 months ago) by deraadt
Branch: MAIN
Changes since 1.509: +1 -3 lines
Diff to previous 1.509 (colored)

Remove an XXX handled in the previous 5 lines of code

Revision 1.509 / (download) - annotate - [select for diffs], Sat May 2 17:01:26 2009 UTC (15 years, 6 months ago) by deraadt
Branch: MAIN
Changes since 1.508: +19 -17 lines
Diff to previous 1.508 (colored)

If we are on the console we can assume the term type is either vt220 or
MDTERM, so we don't need to ask for the terminal type.  If we are not on
the console, don't ask for keyboard nationalization since we can't do that
for serial ports.

Revision 1.508 / (download) - annotate - [select for diffs], Fri May 1 16:36:07 2009 UTC (15 years, 6 months ago) by deraadt
Branch: MAIN
Changes since 1.507: +25 -22 lines
Diff to previous 1.507 (colored)

Simplify the initial script text to ask less questions.  Instead of asking
a stupid "are you sure" question, instead remind people (twice) that duh,
since this is Unix, ^C gets you out of trouble if you change your mind about
modifying your disk.

Revision 1.507 / (download) - annotate - [select for diffs], Fri May 1 16:14:12 2009 UTC (15 years, 6 months ago) by deraadt
Branch: MAIN
Changes since 1.506: +3 -1 lines
Diff to previous 1.506 (colored)

Only tell the user about new mail at install time (not upgrade); from Pierre Riteau

Revision 1.506 / (download) - annotate - [select for diffs], Fri May 1 15:52:15 2009 UTC (15 years, 6 months ago) by deraadt
Branch: MAIN
Changes since 1.505: +3 -3 lines
Diff to previous 1.505 (colored)

Clean up the keyboard type question

Revision 1.505 / (download) - annotate - [select for diffs], Fri May 1 01:06:17 2009 UTC (15 years, 6 months ago) by krw
Branch: MAIN
Changes since 1.504: +5 -1 lines
Diff to previous 1.504 (colored)

Since we no longer give an explicit chance to tweak the fstab used
during upgrade and therein change any normally ro ffs filesystems
to rw for the upgrade, just change any ffs filesystems to rw for
the upgrade. If we can't trust the upgrade process who can we trust?

Diff from RD Thrush.

Revision 1.504 / (download) - annotate - [select for diffs], Thu Apr 30 21:18:29 2009 UTC (15 years, 6 months ago) by deraadt
Branch: MAIN
Changes since 1.503: +7 -4 lines
Diff to previous 1.503 (colored)

Only do the snapshots vs release thingy for ftp or http transfers,
because the install*.iso media for instance has the files in the
release directory.  Oops.

Revision 1.503 / (download) - annotate - [select for diffs], Thu Apr 30 02:42:45 2009 UTC (15 years, 6 months ago) by deraadt
Branch: MAIN
Changes since 1.502: +3 -6 lines
Diff to previous 1.502 (colored)

since the installer now chooses the sets mostly by itself, the default
operation in the sets menu should be "done".
ok @krw with a tear in his eye

Revision 1.502 / (download) - annotate - [select for diffs], Thu Apr 30 01:03:28 2009 UTC (15 years, 6 months ago) by deraadt
Branch: MAIN
Changes since 1.501: +2 -1 lines
Diff to previous 1.501 (colored)

Allow the user's password to not be set, but in that case do not leave it
open, but * it out, since that is obviously what the administrator wants
ok krw

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

quotes around ? matches; Alexander Hall

Revision 1.500 / (download) - annotate - [select for diffs], Thu Apr 30 00:28:22 2009 UTC (15 years, 6 months ago) by deraadt
Branch: MAIN
Changes since 1.499: +6 -1 lines
Diff to previous 1.499 (colored)

if the kernel is a -current kernel, change the default path to snapshots

Revision 1.499 / (download) - annotate - [select for diffs], Wed Apr 29 22:45:20 2009 UTC (15 years, 6 months ago) by deraadt
Branch: MAIN
Changes since 1.498: +2 -2 lines
Diff to previous 1.498 (colored)

only encrypt passwords if they are set

Revision 1.498 / (download) - annotate - [select for diffs], Wed Apr 29 22:44:42 2009 UTC (15 years, 6 months ago) by deraadt
Branch: MAIN
Changes since 1.497: +2 -2 lines
Diff to previous 1.497 (colored)

in [ ] or [[ ]] use -z instead of ! -n since it is shorter

Revision 1.497 / (download) - annotate - [select for diffs], Wed Apr 29 22:43:46 2009 UTC (15 years, 6 months ago) by deraadt
Branch: MAIN
Changes since 1.496: +3 -3 lines
Diff to previous 1.496 (colored)

in [ ] or [[ ]] use -z instead of ! -n since it is shorter

Revision 1.496 / (download) - annotate - [select for diffs], Wed Apr 29 20:30:53 2009 UTC (15 years, 6 months ago) by deraadt
Branch: MAIN
Changes since 1.495: +8 -4 lines
Diff to previous 1.495 (colored)

If we netbooted, use that interface as the default choice in the interface
selector
ok sthen

Revision 1.495 / (download) - annotate - [select for diffs], Wed Apr 29 18:10:54 2009 UTC (15 years, 6 months ago) by deraadt
Branch: MAIN
Changes since 1.494: +2 -2 lines
Diff to previous 1.494 (colored)

no need for -g in ifconfig netboot group test; ok claudio

Revision 1.494 / (download) - annotate - [select for diffs], Wed Apr 29 17:26:07 2009 UTC (15 years, 6 months ago) by deraadt
Branch: MAIN
Changes since 1.493: +7 -2 lines
Diff to previous 1.493 (colored)

If the machine has any wsdisplay devices at all, we probably want the
X sets

Revision 1.493 / (download) - annotate - [select for diffs], Tue Apr 28 21:40:12 2009 UTC (15 years, 6 months ago) by deraadt
Branch: MAIN
Changes since 1.492: +11 -4 lines
Diff to previous 1.492 (colored)

When asking for network configs, prompt with the first interface name the
first time.  After one network has been configured, change the default
prompt to done.  Most people when installing only want to setup one interface,
and this lets them hit <return> instead of done<return>

Revision 1.492 / (download) - annotate - [select for diffs], Tue Apr 28 19:55:26 2009 UTC (15 years, 6 months ago) by sthen
Branch: MAIN
Changes since 1.491: +2 -2 lines
Diff to previous 1.491 (colored)

adjust comment to match code; vlan tag range is 1-4095 not 0-4095

Revision 1.491 / (download) - annotate - [select for diffs], Tue Apr 28 16:46:10 2009 UTC (15 years, 6 months ago) by deraadt
Branch: MAIN
Changes since 1.490: +54 -4 lines
Diff to previous 1.490 (colored)

If the RAMDISK kernel in use supports vlans, ask the right question
and configure it properly.
tested by jsg, some help from sthen

Revision 1.490 / (download) - annotate - [select for diffs], Mon Apr 27 18:05:33 2009 UTC (15 years, 6 months ago) by sthen
Branch: MAIN
Changes since 1.489: +2 -1 lines
Diff to previous 1.489 (colored)

if we netbooted (i.e. ifconfig -g netboot doesn't return an error),
select ftp rather than cd by default.

Revision 1.489 / (download) - annotate - [select for diffs], Sun Apr 26 21:21:12 2009 UTC (15 years, 6 months ago) by deraadt
Branch: MAIN
Changes since 1.488: +1 -3 lines
Diff to previous 1.488 (colored)

No need to say that we setup the timezone; the user can assume it happens because we move on to the next task

Revision 1.488 / (download) - annotate - [select for diffs], Sun Apr 26 21:20:27 2009 UTC (15 years, 6 months ago) by deraadt
Branch: MAIN
Changes since 1.487: +3 -3 lines
Diff to previous 1.487 (colored)

no more need for ftp -T option, since it is automatic now

Revision 1.487 / (download) - annotate - [select for diffs], Sun Apr 26 03:01:39 2009 UTC (15 years, 6 months ago) by deraadt
Branch: MAIN
Changes since 1.486: +2 -2 lines
Diff to previous 1.486 (colored)

substantial changes -> copyright date crank

Revision 1.486 / (download) - annotate - [select for diffs], Sun Apr 26 03:00:32 2009 UTC (15 years, 6 months ago) by deraadt
Branch: MAIN
Changes since 1.485: +3 -3 lines
Diff to previous 1.485 (colored)

extra spaces really matter on the media

Revision 1.485 / (download) - annotate - [select for diffs], Sat Apr 25 20:56:39 2009 UTC (15 years, 6 months ago) by miod
Branch: MAIN
Changes since 1.484: +11 -4 lines
Diff to previous 1.484 (colored)

stdsize() used to round the sector count to a multiple of 10**3, and
then would multiply by 512 and print the result. This means that, when
printing a partition size, the installer would print sizes rounded to
multiples of 512MB for partitions shorter than a few GB, for example.

Change this to round up one less 10**3 unit, then multiply by 512, then
complete the rounding.

ok krw@ long ago.

Revision 1.484 / (download) - annotate - [select for diffs], Sat Apr 25 19:25:29 2009 UTC (15 years, 6 months ago) by krw
Branch: MAIN
Changes since 1.483: +1 -12 lines
Diff to previous 1.483 (colored)

edit_tmp_file() no longer used, so nuke it.

Revision 1.483 / (download) - annotate - [select for diffs], Sat Apr 25 16:28:40 2009 UTC (15 years, 6 months ago) by krw
Branch: MAIN
Changes since 1.482: +5 -4 lines
Diff to previous 1.482 (colored)

Ask for IPv4 default route immediately after interfaces configured, not
after all DNS questions.

Requested by deraadt@.

Revision 1.482 / (download) - annotate - [select for diffs], Sat Apr 25 05:47:26 2009 UTC (15 years, 6 months ago) by deraadt
Branch: MAIN
Changes since 1.481: +3 -1 lines
Diff to previous 1.481 (colored)

Have to remember sets we installed

Revision 1.481 / (download) - annotate - [select for diffs], Sat Apr 25 05:46:44 2009 UTC (15 years, 6 months ago) by deraadt
Branch: MAIN
Changes since 1.480: +8 -1 lines
Diff to previous 1.480 (colored)

If any of the X sets is missing, there is no point in asking the X questions

Revision 1.480 / (download) - annotate - [select for diffs], Sat Apr 25 03:53:54 2009 UTC (15 years, 6 months ago) by deraadt
Branch: MAIN
Changes since 1.479: +3 -1 lines
Diff to previous 1.479 (colored)

ask people to read their mail upon their first login

Revision 1.479 / (download) - annotate - [select for diffs], Sat Apr 25 03:51:48 2009 UTC (15 years, 6 months ago) by deraadt
Branch: MAIN
Changes since 1.478: +2 -2 lines
Diff to previous 1.478 (colored)

For years now, the DNS server question has accepted a list of IP addresses
(because I asked for it :) so pluralize the question, and insert a little
missing word which everyone will understand.

Revision 1.478 / (download) - annotate - [select for diffs], Sat Apr 25 03:50:46 2009 UTC (15 years, 6 months ago) by deraadt
Branch: MAIN
Changes since 1.477: +2 -3 lines
Diff to previous 1.477 (colored)

Today, few people halt a machine and then reset it.  No, they really
want to use reboot, so be more clear and simple about it.

Revision 1.477 / (download) - annotate - [select for diffs], Sat Apr 25 03:21:51 2009 UTC (15 years, 6 months ago) by deraadt
Branch: MAIN
Changes since 1.476: +26 -9 lines
Diff to previous 1.476 (colored)

If the right conditions exist, ask if xdm should be started automatically.
Yes, there are machines where you X needs configuration, but let us be
realistic about it: THAT IS AN X BUG.  And there are machines where getty
and xdm fight: THAT IS A CONSOLE DRIVER BUG.  And this commit is going to
force those bugs to eventually matter enough so that they get fixed.   Just
watch.

Revision 1.476 / (download) - annotate - [select for diffs], Sat Apr 25 02:36:32 2009 UTC (15 years, 6 months ago) by deraadt
Branch: MAIN
Changes since 1.475: +2 -2 lines
Diff to previous 1.475 (colored)

one added word makes this a bit clearer for semi-newbies (actually, the
install script is changing so much, by 4.6 many people are going to be
newbies..)

Revision 1.475 / (download) - annotate - [select for diffs], Fri Apr 24 10:26:59 2009 UTC (15 years, 6 months ago) by deraadt
Branch: MAIN
Changes since 1.474: +3 -3 lines
Diff to previous 1.474 (colored)

make kbd table also use ? for listing; ok krw

Revision 1.474 / (download) - annotate - [select for diffs], Fri Apr 24 01:14:01 2009 UTC (15 years, 6 months ago) by krw
Branch: MAIN
Changes since 1.473: +1 -13 lines
Diff to previous 1.473 (colored)

Don't display network interface and route info during upgrades. If
you need it go look for it.

ok deraadt@

Revision 1.473 / (download) - annotate - [select for diffs], Fri Apr 24 01:04:33 2009 UTC (15 years, 6 months ago) by krw
Branch: MAIN
Changes since 1.472: +4 -6 lines
Diff to previous 1.472 (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.472 / (download) - annotate - [select for diffs], Fri Apr 24 00:15:21 2009 UTC (15 years, 6 months ago) by sthen
Branch: MAIN
Changes since 1.471: +2 -2 lines
Diff to previous 1.471 (colored)

use correct parenthesis; Alexander Hall

Revision 1.471 / (download) - annotate - [select for diffs], Thu Apr 23 23:15:08 2009 UTC (15 years, 6 months ago) by deraadt
Branch: MAIN
Changes since 1.470: +1 -18 lines
Diff to previous 1.470 (colored)

The active mode ftp stuff is archaic, so delete it.  People who still
have that problem can use the plethora of www servers we have instead of
ftp.  Or as sthen pointed out, this is almost assuredly not biting anyone
today since we have received no complaits of the ftplist fetching
failing (that did not use the -A flag)

Revision 1.470 / (download) - annotate - [select for diffs], Thu Apr 23 21:44:27 2009 UTC (15 years, 6 months ago) by deraadt
Branch: MAIN
Changes since 1.469: +2 -2 lines
Diff to previous 1.469 (colored)

simplify mount -v sed; from guenther

Revision 1.469 / (download) - annotate - [select for diffs], Thu Apr 23 21:02:15 2009 UTC (15 years, 6 months ago) by deraadt
Branch: MAIN
Changes since 1.468: +6 -3 lines
Diff to previous 1.468 (colored)

Cut the ctime= message strings out of the mount -v output to make this
a lot prettier.  We still leave this output in -v mode because we want
people to see how smart the install script is about making the different
partitions have different nosetuid, nodev modes
assistance with the right ksh code from drahn, beck, and espie

Revision 1.468 / (download) - annotate - [select for diffs], Thu Apr 23 20:23:35 2009 UTC (15 years, 6 months ago) by deraadt
Branch: MAIN
Changes since 1.467: +3 -2 lines
Diff to previous 1.467 (colored)

Give the user a copy of root's (install time) mail

Revision 1.467 / (download) - annotate - [select for diffs], Thu Apr 23 18:26:14 2009 UTC (15 years, 6 months ago) by deraadt
Branch: MAIN
Changes since 1.466: +45 -1 lines
Diff to previous 1.466 (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.466 / (download) - annotate - [select for diffs], Sun Apr 19 21:42:00 2009 UTC (15 years, 6 months ago) by krw
Branch: MAIN
Changes since 1.465: +11 -10 lines
Diff to previous 1.465 (colored)

When configuring the network assume the user means to assign
$(hostname -s) as the symbolic name of the first interface that is
configured. Subsequent interfaces still get the question.

Don't emit 'No more interfaces to initialize.'. Just move on to the
rest of the network configuration. Use the word 'configure' rather
than 'initialize'.

Suggested by & ok deraadt@

Revision 1.465 / (download) - annotate - [select for diffs], Sun Apr 19 17:56:01 2009 UTC (15 years, 6 months ago) by deraadt
Branch: MAIN
Changes since 1.464: +4 -1 lines
Diff to previous 1.464 (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.464 / (download) - annotate - [select for diffs], Sun Apr 19 00:59:39 2009 UTC (15 years, 6 months ago) by deraadt
Branch: MAIN
Changes since 1.463: +2 -2 lines
Diff to previous 1.463 (colored)

Use sysctl -n hw.disknames instead of the custom disknames program

Revision 1.463 / (download) - annotate - [select for diffs], Sun Apr 19 00:00:35 2009 UTC (15 years, 6 months ago) by krw
Branch: MAIN
Changes since 1.462: +3 -3 lines
Diff to previous 1.462 (colored)

Be consistant and make 'none' the last selection option presented.

Revision 1.462 / (download) - annotate - [select for diffs], Sat Apr 18 15:12:39 2009 UTC (15 years, 6 months ago) by deraadt
Branch: MAIN
Changes since 1.461: +1 -7 lines
Diff to previous 1.461 (colored)

remove some obvious text; ok krw

Revision 1.461 / (download) - annotate - [select for diffs], Sat Apr 18 01:07:48 2009 UTC (15 years, 6 months ago) by deraadt
Branch: MAIN
Changes since 1.460: +4 -3 lines
Diff to previous 1.460 (colored)

Get rid of the final "Are you ready to install sets?" question by adding
an 'abort' option to the previous question.  Another question goes *poof*
ok krw

Revision 1.460 / (download) - annotate - [select for diffs], Sat Apr 18 00:42:28 2009 UTC (15 years, 6 months ago) by deraadt
Branch: MAIN
Changes since 1.459: +3 -3 lines
Diff to previous 1.459 (colored)

18 characters per column is better, since xshareXX.tgz is a long name.
(This gets noticed on non-SMP architectures, since they do not have
the bsd.mp which pushes xshareXX.tgz to the 3rd column)

Revision 1.459 / (download) - annotate - [select for diffs], Sat Apr 18 00:38:50 2009 UTC (15 years, 6 months ago) by krw
Branch: MAIN
Changes since 1.458: +10 -32 lines
Diff to previous 1.458 (colored)

Don't bother trying to handle network interface media modifications
in the script. If that level of tweaking is needed, it is safer to
not pretend to handle it in the scripts and leave it to the expert
installer to do manually. Very very rarely used in any case.

Suggested by and 'just commit' deraadt@

Revision 1.458 / (download) - annotate - [select for diffs], Sat Apr 18 00:23:03 2009 UTC (15 years, 6 months ago) by deraadt
Branch: MAIN
Changes since 1.457: +1 -2 lines
Diff to previous 1.457 (colored)

If people want to edit their hosts file, they can do it in the next step
ok krw

Revision 1.457 / (download) - annotate - [select for diffs], Sat Apr 18 00:21:01 2009 UTC (15 years, 6 months ago) by deraadt
Branch: MAIN
Changes since 1.456: +2 -3 lines
Diff to previous 1.456 (colored)

Always enable DNS in the installer, without asking, since everyone just
hits return for the question and accepts it.  Welcome to the Internet,
everyone has it today. ok krw

Revision 1.456 / (download) - annotate - [select for diffs], Fri Apr 17 16:05:47 2009 UTC (15 years, 6 months ago) by deraadt
Branch: MAIN
Changes since 1.455: +2 -2 lines
Diff to previous 1.455 (colored)

silence delete of hash output file

Revision 1.455 / (download) - annotate - [select for diffs], Fri Apr 17 07:00:44 2009 UTC (15 years, 6 months ago) by deraadt
Branch: MAIN
Changes since 1.454: +3 -3 lines
Diff to previous 1.454 (colored)

undesireable tabs (waste space on the media)

Revision 1.454 / (download) - annotate - [select for diffs], Fri Apr 17 03:58:54 2009 UTC (15 years, 6 months ago) by deraadt
Branch: MAIN
Changes since 1.453: +17 -4 lines
Diff to previous 1.453 (colored)

For SHA256 hashes to be ready to go onto the install media, we must
build the sets before we build the media.  While there we can get rid
of DESTDIR/snapshot too, and simply install straight into RELEASEDIR.
(This also ends up saving an astounding amount of traffic/latency in a nfs
environment)

Revision 1.453 / (download) - annotate - [select for diffs], Mon Apr 13 02:04:11 2009 UTC (15 years, 6 months ago) by deraadt
Branch: MAIN
Changes since 1.452: +10 -6 lines
Diff to previous 1.452 (colored)

krw says comments only stripped when alone on a line

Revision 1.452 / (download) - annotate - [select for diffs], Mon Apr 13 01:59:19 2009 UTC (15 years, 6 months ago) by deraadt
Branch: MAIN
Changes since 1.451: +24 -5 lines
Diff to previous 1.451 (colored)

Print the sets list in 3 columns.  Some pathological case handling for
extremely siteXX-stupidlonghostname.tgz files worked out with krw
The shell script output is now substantially shorter than it was before
and blind people will appreciate this in our next release.

Revision 1.451 / (download) - annotate - [select for diffs], Mon Apr 13 01:48:05 2009 UTC (15 years, 6 months ago) by deraadt
Branch: MAIN
Changes since 1.450: +4 -4 lines
Diff to previous 1.450 (colored)

use the new ftp -T title mode to compress the install script output
a bit more (and it is a lot prettier, too) ok krw

Revision 1.450 / (download) - annotate - [select for diffs], Sat Mar 14 15:55:39 2009 UTC (15 years, 7 months ago) by krw
Branch: MAIN
Changes since 1.449: +1 -14 lines
Diff to previous 1.449 (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.449 / (download) - annotate - [select for diffs], Sat Mar 14 14:23:05 2009 UTC (15 years, 7 months ago) by krw
Branch: MAIN
Changes since 1.448: +11 -6 lines
Diff to previous 1.448 (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.448 / (download) - annotate - [select for diffs], Fri Mar 13 01:20:44 2009 UTC (15 years, 7 months ago) by krw
Branch: MAIN
Changes since 1.447: +2 -2 lines
Diff to previous 1.447 (colored)

Add tab's to the whitespace pattern used to eliminate existing entries
when adding a host line via addhost_entry(). Thus preventing the duplicate
entries for 127.0.0.1 we started inserting when we switched to using tabs
in the initial hosts file.

Revision 1.447 / (download) - annotate - [select for diffs], Thu Feb 19 02:11:32 2009 UTC (15 years, 8 months ago) by krw
Branch: MAIN
CVS Tags: OPENBSD_4_5_BASE, OPENBSD_4_5
Changes since 1.446: +1 -2 lines
Diff to previous 1.446 (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.446 / (download) - annotate - [select for diffs], Thu Feb 19 01:25:22 2009 UTC (15 years, 8 months ago) by krw
Branch: MAIN
Changes since 1.445: +3 -4 lines
Diff to previous 1.445 (colored)

No need for caveat about ignoring "\" when reading passwords, \r\n get
passed through just fine. Also add comment to note that leading and
trailing space will be trimmed.

Pointed out by 'x' on bugs@.

Revision 1.445 / (download) - annotate - [select for diffs], Wed Feb 18 00:03:06 2009 UTC (15 years, 8 months ago) by krw
Branch: MAIN
Changes since 1.444: +5 -2 lines
Diff to previous 1.444 (colored)

Use 'read -r' to read password, which allows "\" to be in the
password unless it's part of an escape sequence like "\r". Prompted
by Aaron W. Hsu via PR#6042.

ok deraadt@

Revision 1.444 / (download) - annotate - [select for diffs], Sat Feb 14 04:00:07 2009 UTC (15 years, 8 months ago) by krw
Branch: MAIN
Changes since 1.443: +2 -2 lines
Diff to previous 1.443 (colored)

Don't copy the 'full' installed protocols(5) or services(5) to the
ramdisk environment during an upgrade. They are large and potentially
modified beyond usefulness. The minimal ones on the install media
are sufficient.

ok ian@ guenther@ deraadt@

Revision 1.443 / (download) - annotate - [select for diffs], Sun Feb 8 21:02:20 2009 UTC (15 years, 8 months ago) by miod
Branch: MAIN
Changes since 1.442: +2 -2 lines
Diff to previous 1.442 (colored)

Move to 4.5-BETA

Revision 1.442 / (download) - annotate - [select for diffs], Sun Jan 25 21:27:27 2009 UTC (15 years, 9 months ago) by krw
Branch: MAIN
Changes since 1.441: +6 -6 lines
Diff to previous 1.441 (colored)

Only copy hosts file once during upgrades. Shorten a long variable name.

Revision 1.441 / (download) - annotate - [select for diffs], Sun Nov 23 01:57:06 2008 UTC (15 years, 11 months ago) by krw
Branch: MAIN
Changes since 1.440: +5 -1 lines
Diff to previous 1.440 (colored)

Create a new bpfN device whenever a dhclient is started. Multiple
interfaces can now be configured with dhcp during install and upgrades.
Problem most forcibly pointed out by Luis and Pedro at h2k8.

"go for it" deraadt@

Revision 1.440 / (download) - annotate - [select for diffs], Tue Nov 11 23:36:13 2008 UTC (15 years, 11 months ago) by krw
Branch: MAIN
Changes since 1.439: +4 -3 lines
Diff to previous 1.439 (colored)

Drop svnd lines from the munged fstab for upgrades, to avoid confusing
fsck. Reported by Sebastian Rother via tech@.

"sure" deraadt@

Revision 1.439 / (download) - annotate - [select for diffs], Tue Nov 11 00:55:21 2008 UTC (15 years, 11 months ago) by krw
Branch: MAIN
Changes since 1.438: +12 -12 lines
Diff to previous 1.438 (colored)

Replace some 4 space knf spacing with install space paranoia tabs, saving
33 characters.

Revision 1.438 / (download) - annotate - [select for diffs], Tue Sep 30 00:47:47 2008 UTC (16 years, 1 month ago) by deraadt
Branch: MAIN
Changes since 1.437: +2 -2 lines
Diff to previous 1.437 (colored)

install hostname.* files mode 640 root.wheel by default; ok krw

Revision 1.437 / (download) - annotate - [select for diffs], Sun Sep 7 14:09:37 2008 UTC (16 years, 1 month ago) by krw
Branch: MAIN
Changes since 1.436: +4 -4 lines
Diff to previous 1.436 (colored)

Nuke ifconfig '-m' uses. Use bare 'media' instead. Pointed out by
Paul de Weerd via source-changes@.

Revision 1.436 / (download) - annotate - [select for diffs], Mon Jul 7 15:53:15 2008 UTC (16 years, 3 months ago) by jdixon
Branch: MAIN
CVS Tags: OPENBSD_4_4_BASE, OPENBSD_4_4
Changes since 1.435: +4 -3 lines
Diff to previous 1.435 (colored)

Rework the ntpd question to default to no, and ask for the NTP server only if user chooses yes.  Easier than the 3-part question and requires far fewer keystrokes to enable the 'default'.

ok krw@

Revision 1.435 / (download) - annotate - [select for diffs], Sun Jul 6 14:31:19 2008 UTC (16 years, 3 months ago) by krw
Branch: MAIN
Changes since 1.434: +3 -3 lines
Diff to previous 1.434 (colored)

Make 'dhcp' the initial default when configuring the network. This
makes one more answer <cr>'able during install without changing any
existing behaviour.

Change 'NTP server?' default answer from 'none' to 'default'.

Suggested by thib@, supported by marco@, jsing@, millert@

Revision 1.434 / (download) - annotate - [select for diffs], Wed Jul 2 00:13:32 2008 UTC (16 years, 4 months ago) by deraadt
Branch: MAIN
Changes since 1.433: +2 -2 lines
Diff to previous 1.433 (colored)

move to 4.4-beta

Revision 1.433 / (download) - annotate - [select for diffs], Thu Jun 26 05:42:03 2008 UTC (16 years, 4 months ago) by ray
Branch: MAIN
Changes since 1.432: +1 -8 lines
Diff to previous 1.432 (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.432 / (download) - annotate - [select for diffs], Tue Jun 24 11:59:48 2008 UTC (16 years, 4 months ago) by tobias
Branch: MAIN
Changes since 1.431: +2 -1 lines
Diff to previous 1.431 (colored)

Remove leading zeros of subpart of partition's blocksize so ksh does not
interpret it as octal, leading to error messages like "048" is not a
number.

ok krw

Revision 1.431 / (download) - annotate - [select for diffs], Fri Jun 13 04:41:44 2008 UTC (16 years, 4 months ago) by krw
Branch: MAIN
Changes since 1.430: +21 -1 lines
Diff to previous 1.430 (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.430 / (download) - annotate - [select for diffs], Thu Apr 17 01:51:44 2008 UTC (16 years, 6 months ago) by deraadt
Branch: MAIN
Changes since 1.429: +2 -2 lines
Diff to previous 1.429 (colored)

force mode for hostname.* files to 600; ok krw

Revision 1.429 / (download) - annotate - [select for diffs], Sat Mar 15 05:28:31 2008 UTC (16 years, 7 months ago) by jsing
Branch: MAIN
Changes since 1.428: +2 -2 lines
Diff to previous 1.428 (colored)

When installing via NFS, only retry the mount five times (instead of the
default 10,000 times).

ok deraadt@ krw@ thib@

Revision 1.428 / (download) - annotate - [select for diffs], Sun Mar 9 02:00:42 2008 UTC (16 years, 7 months ago) by krw
Branch: MAIN
Changes since 1.427: +1 -2 lines
Diff to previous 1.427 (colored)

Remove question about keep alive option.

Requested by deraadt@

Revision 1.427 / (download) - annotate - [select for diffs], Sun Mar 9 00:42:08 2008 UTC (16 years, 7 months ago) by krw
Branch: MAIN
Changes since 1.426: +20 -15 lines
Diff to previous 1.426 (colored)

Consolidate FTP option handling, fixing one missing set of options
and adding a new question during install to allow the setting of
FTP's -k option in situations where intervening routers/firewalls
are prematurely killing connections.

Original idea and diff from espie@

ok espie@

Revision 1.426 / (download) - annotate - [select for diffs], Wed Mar 5 01:09:58 2008 UTC (16 years, 7 months ago) by krw
Branch: MAIN
CVS Tags: OPENBSD_4_3_BASE, OPENBSD_4_3
Changes since 1.425: +2 -2 lines
Diff to previous 1.425 (colored)

Tweak regexp replacing 'off' with 'on secure' so we don't end up with
'on secure secure'.

ok deraadt@

Revision 1.425 / (download) - annotate - [select for diffs], Tue Mar 4 00:36:38 2008 UTC (16 years, 7 months ago) by krw
Branch: MAIN
Changes since 1.424: +23 -53 lines
Diff to previous 1.424 (colored)

Redo serial console configuration logic. Smaller, easier to
understand.

Add serial console handling for alpha, macppc, zaurus.  No functional
change for i386/amd64.

All archs should now have automatic serial console configuration.

ok deraadt@

Revision 1.424 / (download) - annotate - [select for diffs], Wed Feb 20 17:46:50 2008 UTC (16 years, 8 months ago) by miod
Branch: MAIN
Changes since 1.423: +2 -2 lines
Diff to previous 1.423 (colored)

4.3-beta

Revision 1.423 / (download) - annotate - [select for diffs], Mon Feb 11 23:40:03 2008 UTC (16 years, 8 months ago) by krw
Branch: MAIN
Changes since 1.422: +20 -4 lines
Diff to previous 1.422 (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.422 / (download) - annotate - [select for diffs], Fri Dec 14 08:30:11 2007 UTC (16 years, 10 months ago) by otto
Branch: MAIN
Changes since 1.421: +2 -2 lines
Diff to previous 1.421 (colored)

make more clear that the NTP question is not a three way yes/no
question; ok deraadt@

Revision 1.421 / (download) - annotate - [select for diffs], Thu Aug 2 03:23:37 2007 UTC (17 years, 3 months ago) by david
Branch: MAIN
CVS Tags: OPENBSD_4_2_BASE, OPENBSD_4_2
Changes since 1.420: +3 -3 lines
Diff to previous 1.420 (colored)

spelling fixes in the comments

Revision 1.420 / (download) - annotate - [select for diffs], Fri Jul 27 01:34:32 2007 UTC (17 years, 3 months ago) by deraadt
Branch: MAIN
Changes since 1.419: +2 -2 lines
Diff to previous 1.419 (colored)

oops, forgot to crank to 4.2

Revision 1.419 / (download) - annotate - [select for diffs], Mon May 28 02:57:11 2007 UTC (17 years, 5 months ago) by krw
Branch: MAIN
Changes since 1.418: +3 -3 lines
Diff to previous 1.418 (colored)

Don't look for wt tape devices while installing.

Revision 1.418 / (download) - annotate - [select for diffs], Fri Apr 27 02:41:41 2007 UTC (17 years, 6 months ago) by deraadt
Branch: MAIN
Changes since 1.417: +2 -2 lines
Diff to previous 1.417 (colored)

caps for NTP server; from jdixon

Revision 1.417 / (download) - annotate - [select for diffs], Wed Apr 25 11:59:49 2007 UTC (17 years, 6 months ago) by krw
Branch: MAIN
Changes since 1.416: +2 -2 lines
Diff to previous 1.416 (colored)

Use 'ifconfig' and not 'ifconfig -a' as the -a is now the default.

Revision 1.416 / (download) - annotate - [select for diffs], Wed Apr 25 11:52:14 2007 UTC (17 years, 6 months ago) by krw
Branch: MAIN
Changes since 1.415: +13 -4 lines
Diff to previous 1.415 (colored)

Add capacity to specify one ntp 'server' (not 'servers') during install.

Suggested by deraadt@, nifty sed nit from ray@.

ok deraadt@ beck@ mbalmer@

Revision 1.415 / (download) - annotate - [select for diffs], Mon Mar 26 20:13:24 2007 UTC (17 years, 7 months ago) by otto
Branch: MAIN
Changes since 1.414: +2 -2 lines
Diff to previous 1.414 (colored)

Make the default behaviour to force a fsck when upgrading, as it
was before it became optional. ok krw@ beck@ pedro@

Revision 1.414 / (download) - annotate - [select for diffs], Mon Mar 26 12:09:13 2007 UTC (17 years, 7 months ago) by krw
Branch: MAIN
Changes since 1.413: +2 -2 lines
Diff to previous 1.413 (colored)

Don't pass fsck '--fp'. From Loic Tortay via PR #5422.

Revision 1.413 / (download) - annotate - [select for diffs], Fri Mar 16 22:33:39 2007 UTC (17 years, 7 months ago) by krw
Branch: MAIN
Changes since 1.412: +6 -7 lines
Diff to previous 1.412 (colored)

Give the upgrader an option to *not* fsck -f non-root filesystems. In
fact make that the default. Help upgraders with big filesystems and no
patience.

Suggested by & ok beck@.

Revision 1.412 / (download) - annotate - [select for diffs], Tue Mar 13 00:14:21 2007 UTC (17 years, 7 months ago) by krw
Branch: MAIN
Changes since 1.411: +2 -2 lines
Diff to previous 1.411 (colored)

Keep copyright year current.

Revision 1.411 / (download) - annotate - [select for diffs], Sun Mar 4 14:37:37 2007 UTC (17 years, 7 months ago) by krw
Branch: MAIN
CVS Tags: OPENBSD_4_1_BASE, OPENBSD_4_1
Changes since 1.410: +6 -1 lines
Diff to previous 1.410 (colored)

If INSTALL.<arch> isn't present at the given set location, give the
user a chance to bail out before selecting sets to install. Just in
case the user ended up in the wrong directory.

Suggested by beck@, feedback from various.

"emphatic ok" beck@ "go for it" deraadt@

Revision 1.410 / (download) - annotate - [select for diffs], Thu Mar 1 03:51:56 2007 UTC (17 years, 8 months ago) by deraadt
Branch: MAIN
Changes since 1.409: +6 -7 lines
Diff to previous 1.409 (colored)

shrink early text; input from frantisek holop, discussion and ok ok krw

Revision 1.409 / (download) - annotate - [select for diffs], Wed Feb 14 23:37:18 2007 UTC (17 years, 8 months ago) by krw
Branch: MAIN
Changes since 1.408: +10 -3 lines
Diff to previous 1.408 (colored)

Use new 'disknames' command to get names of disks and cds.

ok deraadt@

Revision 1.408 / (download) - annotate - [select for diffs], Mon Feb 12 13:10:02 2007 UTC (17 years, 8 months ago) by henning
Branch: MAIN
Changes since 1.407: +2 -2 lines
Diff to previous 1.407 (colored)

4.1-beta

Revision 1.407 / (download) - annotate - [select for diffs], Sun Feb 11 18:59:31 2007 UTC (17 years, 8 months ago) by krw
Branch: MAIN
Changes since 1.406: +27 -56 lines
Diff to previous 1.406 (colored)

Nuke MDFSTYPE and MDFSOPTS, 'mount -t ...' and giving the user the
option to choose a filesystem type when mounting a disk. Rely on the
filesystem information provided by the disklabel.

When there is only one usable partition on the selected disk, just
mount it without bothering the user with a question.

Ensure that msdos filesystems are mounted with '-s' so that the names
of the install sets will be in lower case and thus visible to the
script.

msdos problems noted by Rodolfo Gouveia, who did a lot of testing and
debugging. 'mount -t ...' silliness pointed out by deraadt@.

Revision 1.406 / (download) - annotate - [select for diffs], Tue Aug 29 01:02:49 2006 UTC (18 years, 2 months ago) by krw
Branch: MAIN
CVS Tags: OPENBSD_4_0_BASE, OPENBSD_4_0
Changes since 1.405: +3 -2 lines
Diff to previous 1.405 (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.405 / (download) - annotate - [select for diffs], Wed Jul 26 20:34:11 2006 UTC (18 years, 3 months ago) by deraadt
Branch: MAIN
Changes since 1.404: +2 -5 lines
Diff to previous 1.404 (colored)

crank to 4.0-beta

Revision 1.404 / (download) - annotate - [select for diffs], Thu May 18 11:56:09 2006 UTC (18 years, 5 months ago) by krw
Branch: MAIN
Changes since 1.403: +5 -4 lines
Diff to previous 1.403 (colored)

Don't ask for a password for ftp transfers if the username 'ftp' is used.

Suggested by deraadt@, 'looks good to me' deraadt@

Revision 1.403 / (download) - annotate - [select for diffs], Wed Mar 15 01:17:12 2006 UTC (18 years, 7 months ago) by krw
Branch: MAIN
Changes since 1.402: +5 -6 lines
Diff to previous 1.402 (colored)

Make 'no' the default answer to 'Display the list of XXX servers?'.

Suggested by otto@, various people chiming in to agree.

While here fix one ask_yn misuse and update copyright to 2006.

Revision 1.402 / (download) - annotate - [select for diffs], Sat Mar 11 19:23:31 2006 UTC (18 years, 7 months ago) by krw
Branch: MAIN
Changes since 1.401: +2 -2 lines
Diff to previous 1.401 (colored)

Change default answer for 'Do you expect to run the X Window System?'
to 'no'.

Requested by deraadt@

Revision 1.401 / (download) - annotate - [select for diffs], Tue Feb 28 20:33:55 2006 UTC (18 years, 8 months ago) by matthieu
Branch: MAIN
CVS Tags: OPENBSD_3_9_BASE, OPENBSD_3_9
Changes since 1.400: +4 -1 lines
Diff to previous 1.400 (colored)

Remove old static X modules from previous versions. Patch by krw@, ok deraadt@

Revision 1.400 / (download) - annotate - [select for diffs], Thu Jan 19 03:30:04 2006 UTC (18 years, 9 months ago) by deraadt
Branch: MAIN
Changes since 1.399: +2 -2 lines
Diff to previous 1.399 (colored)

crank to 3.8-beta

Revision 1.399 / (download) - annotate - [select for diffs], Tue Nov 22 19:29:15 2005 UTC (18 years, 11 months ago) by krw
Branch: MAIN
Changes since 1.398: +3 -3 lines
Diff to previous 1.398 (colored)

'?' may not be easily found until the keyboard is mapped. Make 'L' the
command to list the major keymaps. Also accept 'l' and '?' without
explictly mentioning them in the user prompt.

A varient of a suggestion by And??s (sic) Delfino, seconded by jmc@.

ok millert@ deraadt@

Revision 1.398 / (download) - annotate - [select for diffs], Fri Oct 28 13:30:50 2005 UTC (19 years ago) by jmc
Branch: MAIN
Changes since 1.397: +2 -2 lines
Diff to previous 1.397 (colored)

selected install sets are denoted by `[X]', not `[x]';
ok krw@

Revision 1.397 / (download) - annotate - [select for diffs], Wed Oct 26 00:06:51 2005 UTC (19 years ago) by krw
Branch: MAIN
Changes since 1.396: +19 -9 lines
Diff to previous 1.396 (colored)

Sync mygate handling with latest netstart changes so upgrades work.

Revision 1.396 / (download) - annotate - [select for diffs], Thu Oct 20 02:31:52 2005 UTC (19 years ago) by krw
Branch: MAIN
Changes since 1.395: +4 -5 lines
Diff to previous 1.395 (colored)

Always give user a chance to confirm/modify TERM and keymap when
running install or upgrade.

ok deraadt@

Revision 1.395 / (download) - annotate - [select for diffs], Sun Oct 16 05:01:59 2005 UTC (19 years ago) by krw
Branch: MAIN
Changes since 1.394: +5 -4 lines
Diff to previous 1.394 (colored)

Bring enable_network() into line with /etc/netstart by not attempting
to use mygate if any interface attempts dhcp.

Revision 1.394 / (download) - annotate - [select for diffs], Sun Oct 16 03:06:12 2005 UTC (19 years ago) by krw
Branch: MAIN
Changes since 1.393: +3 -3 lines
Diff to previous 1.393 (colored)

Use 'rtsolif' in enable_network(), rather than 'rtsif', to make it more
closely resemble netstart. No functional change.

Revision 1.393 / (download) - annotate - [select for diffs], Wed Oct 12 02:48:49 2005 UTC (19 years ago) by krw
Branch: MAIN
Changes since 1.392: +11 -2 lines
Diff to previous 1.392 (colored)

Comments are now allowed in myname and mygate. Steal stripcom() from
/etc/netstart and use in myname and mygate processing. Fixes problems
with (U)pgrade's. Discovered while preparing for Todd's new mygate
functionality.

ok todd@

Revision 1.392 / (download) - annotate - [select for diffs], Mon Oct 10 19:23:06 2005 UTC (19 years ago) by krw
Branch: MAIN
Changes since 1.391: +11 -1 lines
Diff to previous 1.391 (colored)

Provide some verbiage about MDSERIAL. Suggested by miod@.

Revision 1.391 / (download) - annotate - [select for diffs], Wed Oct 5 02:07:27 2005 UTC (19 years ago) by krw
Branch: MAIN
Changes since 1.390: +4 -5 lines
Diff to previous 1.390 (colored)

Apply Todd's netstart r1.106 fix to evaluation of dhcp and rtsol lines
in hostname.if files.

Revision 1.390 / (download) - annotate - [select for diffs], Mon Aug 29 17:47:55 2005 UTC (19 years, 2 months ago) by krw
Branch: MAIN
CVS Tags: OPENBSD_3_8_BASE, OPENBSD_3_8
Changes since 1.389: +5 -3 lines
Diff to previous 1.389 (colored)

addhostent() shouldn't delete the hosts entry for the 'other' address
family. Specifying an IPv6 address will no longer remove an IPv4 entry
from hosts, nor visa verse. Noted by mickey@.

ok deraadt@.

Revision 1.389 / (download) - annotate - [select for diffs], Tue Aug 9 00:46:12 2005 UTC (19 years, 2 months ago) by deraadt
Branch: MAIN
Changes since 1.388: +2 -2 lines
Diff to previous 1.388 (colored)

move to 3.8-beta

Revision 1.388 / (download) - annotate - [select for diffs], Sat Jul 2 00:55:48 2005 UTC (19 years, 4 months ago) by uwe
Branch: MAIN
Changes since 1.387: +3 -3 lines
Diff to previous 1.387 (colored)

During set selection, ask for a "file name pattern" rather than a
"regular expression" because the answer is processed by the shell.
ok krw@

Revision 1.387 / (download) - annotate - [select for diffs], Mon Jun 13 23:42:38 2005 UTC (19 years, 4 months ago) by krw
Branch: MAIN
Changes since 1.386: +3 -3 lines
Diff to previous 1.386 (colored)

Typo. ${version} -> ${VERSION}. Spotted by David Krause.

Revision 1.386 / (download) - annotate - [select for diffs], Tue May 24 22:38:41 2005 UTC (19 years, 5 months ago) by krw
Branch: MAIN
Changes since 1.385: +3 -3 lines
Diff to previous 1.385 (colored)

Checking for the address '0.0.0.0' no longer works as test for
dhclient failure.  Just check if any inet address was assigned.

Revision 1.385 / (download) - annotate - [select for diffs], Sat Apr 30 14:09:41 2005 UTC (19 years, 6 months ago) by krw
Branch: MAIN
Changes since 1.384: +2 -2 lines
Diff to previous 1.384 (colored)

Fix rtsol IPv6 install - check correct directory for hostname.* files.

Found & ok dlg@.

Revision 1.384 / (download) - annotate - [select for diffs], Tue Apr 19 00:49:20 2005 UTC (19 years, 6 months ago) by krw
Branch: MAIN
Changes since 1.383: +3 -6 lines
Diff to previous 1.383 (colored)

There is no reliable way to detect a working network interface. So
always offer ftp and http as set sources.

Problem noted by uwe@, ok deraadt@

Revision 1.383 / (download) - annotate - [select for diffs], Mon Apr 18 23:56:21 2005 UTC (19 years, 6 months ago) by deraadt
Branch: MAIN
Changes since 1.382: +3 -3 lines
Diff to previous 1.382 (colored)

restore tab before [X] list; krw ok

Revision 1.382 / (download) - annotate - [select for diffs], Fri Apr 15 23:45:29 2005 UTC (19 years, 6 months ago) by krw
Branch: MAIN
Changes since 1.381: +21 -28 lines
Diff to previous 1.381 (colored)

Report dhcp success *only* if the interface is UP, and an address other
than 0.0.0.0 has been assigned to it. Fixes problem of interfaces
being removed from the available list even if dhcp fails because there
is no link.

Some code cleanup and shrinkage.

Pointed out a long time ago by a friend of Henning's, whose email I
read again this afternoon and now can't find for the life of me.

Revision 1.381 / (download) - annotate - [select for diffs], Wed Apr 13 03:45:51 2005 UTC (19 years, 6 months ago) by krw
Branch: MAIN
Changes since 1.380: +5 -3 lines
Diff to previous 1.380 (colored)

Tweak set source option testing. Don't offer nfs if no active interface
is found - even if /sbin/mount_nfs is present.

Revision 1.380 / (download) - annotate - [select for diffs], Wed Apr 13 03:12:42 2005 UTC (19 years, 6 months ago) by deraadt
Branch: MAIN
Changes since 1.379: +3 -3 lines
Diff to previous 1.379 (colored)

spacing

Revision 1.379 / (download) - annotate - [select for diffs], Wed Apr 13 02:52:52 2005 UTC (19 years, 6 months ago) by krw
Branch: MAIN
Changes since 1.378: +3 -6 lines
Diff to previous 1.378 (colored)

Display 'none' as v6 default address when no v6 address is detected.
Tighten some code.

Revision 1.378 / (download) - annotate - [select for diffs], Wed Apr 13 02:18:10 2005 UTC (19 years, 6 months ago) by krw
Branch: MAIN
Changes since 1.377: +48 -70 lines
Diff to previous 1.377 (colored)

Only show sets locations that might work. e.g. no /sbin/nfs == don't
offer nfs as a location. Eliminate (m)ounted source in favour of an
extra question for disk sources. Bit of cleanup and overall shrinkage.

ok deraadt@ miod@

Revision 1.377 / (download) - annotate - [select for diffs], Wed Apr 13 02:03:38 2005 UTC (19 years, 6 months ago) by krw
Branch: MAIN
Changes since 1.376: +10 -4 lines
Diff to previous 1.376 (colored)

Allow any valid kbd(8) mapping to be specified (e.g. us.dvorak). Be
more terse both in prompts and output. Show list of major tables only
on request. Problem noted by Matt Jibson.

ok deraadt@

Revision 1.376 / (download) - annotate - [select for diffs], Sat Apr 9 23:47:34 2005 UTC (19 years, 6 months ago) by deraadt
Branch: MAIN
Changes since 1.375: +9 -9 lines
Diff to previous 1.375 (colored)

spaces

Revision 1.375 / (download) - annotate - [select for diffs], Sat Apr 9 15:21:28 2005 UTC (19 years, 6 months ago) by krw
Branch: MAIN
Changes since 1.374: +4 -9 lines
Diff to previous 1.374 (colored)

Create on the installed system all disk, cd and tape devices found in
dmesg.boot, not just the ones that happen to be referenced by the
install process.

ok deraadt@ miod@

Revision 1.374 / (download) - annotate - [select for diffs], Sat Apr 9 00:47:58 2005 UTC (19 years, 6 months ago) by krw
Branch: MAIN
Changes since 1.373: +19 -20 lines
Diff to previous 1.373 (colored)

Don't error out on mount just because someone confuses (m)ounted with
(d)isk sources and tries to mount an already mounted partition. Using
(d)isk where (m)ounted was meant should now just work.

ok nick@ deraadt@

Revision 1.373 / (download) - annotate - [select for diffs], Thu Apr 7 20:47:15 2005 UTC (19 years, 6 months ago) by krw
Branch: MAIN
Changes since 1.372: +13 -11 lines
Diff to previous 1.372 (colored)

If a UDF 'c' partition is found on a CD, just mount it without asking
questions. Just as ISO9660 'c' partitions are mounted w/o questions.

ok deraadt@

Revision 1.372 / (download) - annotate - [select for diffs], Tue Apr 5 01:00:46 2005 UTC (19 years, 6 months ago) by krw
Branch: MAIN
Changes since 1.371: +3 -3 lines
Diff to previous 1.371 (colored)

Use 'route -qn' for the IPv6 default route command in hostname.if.

Don't use local link address as possible IPv6 manual address.

From todd@.

Revision 1.371 / (download) - annotate - [select for diffs], Sun Apr 3 19:33:59 2005 UTC (19 years, 6 months ago) by krw
Branch: MAIN
Changes since 1.370: +13 -23 lines
Diff to previous 1.370 (colored)

More shrinkage with a bit of code factoring.

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

Scrounge a few characters of whitespace.

Revision 1.369 / (download) - annotate - [select for diffs], Sat Apr 2 13:02:52 2005 UTC (19 years, 7 months ago) by krw
Branch: MAIN
Changes since 1.368: +111 -11 lines
Diff to previous 1.368 (colored)

Initial IPv6 install/upgrade support.

ok deraadt@

Revision 1.368 / (download) - annotate - [select for diffs], Sun Mar 27 15:13:50 2005 UTC (19 years, 7 months ago) by krw
Branch: MAIN
Changes since 1.367: +8 -4 lines
Diff to previous 1.367 (colored)

Use new skeleton kbd(8) '-l' to generalize kbd(8) use.  Eliminate
fixed list of available maps and machine dependant md_set_term()
functions.

Any ramdisk with /sbin/kbd present (amd64, cats, i386 at the moment)
will now present list of available keyboard encodings.

ok deraadt@

Revision 1.367 / (download) - annotate - [select for diffs], Sat Mar 26 15:40:21 2005 UTC (19 years, 7 months ago) by krw
Branch: MAIN
Changes since 1.366: +11 -18 lines
Diff to previous 1.366 (colored)

More cleanup & cleanup. Use more '[[]]' over '[]' to eliminate "'s,
use pattern matching in '[[]]' rather than case statement.

Revision 1.366 / (download) - annotate - [select for diffs], Sat Mar 26 05:08:26 2005 UTC (19 years, 7 months ago) by krw
Branch: MAIN
Changes since 1.365: +7 -7 lines
Diff to previous 1.365 (colored)

More cleanup. ${MODE} -> $MODE.

Revision 1.365 / (download) - annotate - [select for diffs], Sat Mar 26 03:54:40 2005 UTC (19 years, 7 months ago) by krw
Branch: MAIN
Changes since 1.364: +3 -23 lines
Diff to previous 1.364 (colored)

More cleanup. Nuke isalphanumeric() and assume anything that
successfully ifconfig's is a valid interface.

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

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

Revision 1.363 / (download) - annotate - [select for diffs], Mon Mar 14 02:29:33 2005 UTC (19 years, 7 months ago) by krw
Branch: MAIN
CVS Tags: OPENBSD_3_7_BASE, OPENBSD_3_7
Changes since 1.362: +9 -4 lines
Diff to previous 1.362 (colored)

Present list of dns servers supplied by dhcp as blank separated list,
not newline separted list.

Spotted by & ok deraadt@.

Revision 1.362 / (download) - annotate - [select for diffs], Tue Mar 8 17:56:00 2005 UTC (19 years, 7 months ago) by deraadt
Branch: MAIN
Changes since 1.361: +3 -3 lines
Diff to previous 1.361 (colored)

append to rc.conf.local; david

Revision 1.361 / (download) - annotate - [select for diffs], Tue Mar 8 13:13:54 2005 UTC (19 years, 7 months ago) by deraadt
Branch: MAIN
Changes since 1.360: +7 -1 lines
Diff to previous 1.360 (colored)

ask about ntpd(8) in install script; ok krw henning
this is pending an improvement from henning to ntpd to make it utterly
silent during startup.

Revision 1.360 / (download) - annotate - [select for diffs], Mon Mar 7 00:05:59 2005 UTC (19 years, 7 months ago) by deraadt
Branch: MAIN
Changes since 1.359: +2 -2 lines
Diff to previous 1.359 (colored)

move to 3.7-beta

Revision 1.359 / (download) - annotate - [select for diffs], Wed Feb 16 02:04:31 2005 UTC (19 years, 8 months ago) by krw
Branch: MAIN
Changes since 1.358: +13 -40 lines
Diff to previous 1.358 (colored)

Validate successful installation of required sets by seeing if they
are still in DEFAULTSETS. Better than checking random file/dir we
expect set to provide.

Give the user the option to complete an installation/upgrade without
installing all the sets we think are required.

Shrinks code a bit. From an idea by beck@.

ok deraadt@ nick@

Revision 1.358 / (download) - annotate - [select for diffs], Sun Feb 13 06:57:59 2005 UTC (19 years, 8 months ago) by david
Branch: MAIN
Changes since 1.357: +2 -2 lines
Diff to previous 1.357 (colored)

zap whitespace at eol; ok krw@

Revision 1.357 / (download) - annotate - [select for diffs], Sun Nov 28 04:15:09 2004 UTC (19 years, 11 months ago) by krw
Branch: MAIN
Changes since 1.356: +12 -6 lines
Diff to previous 1.356 (colored)

When dhcp configuration is attempted add the network interface to a
'dhcp' group . Present 'dhcp' as the default value for the ip address
of interfaces in the 'dhcp' group, not the address the previous dhcp
configuration might have obtained. Makes it 'safer' to restart
installs after network configuration.

Suggested by/ok mickey@, ok deraadt@, henning@.

Revision 1.356 / (download) - annotate - [select for diffs], Thu Nov 11 21:48:06 2004 UTC (19 years, 11 months ago) by deraadt
Branch: MAIN
Changes since 1.355: +2 -2 lines
Diff to previous 1.355 (colored)

typo; bad krw

Revision 1.355 / (download) - annotate - [select for diffs], Tue Oct 12 21:57:07 2004 UTC (20 years ago) by krw
Branch: MAIN
Changes since 1.354: +52 -80 lines
Diff to previous 1.354 (colored)


Bring the tape install code up to current standards and
add a few enhancements:

- allow installation of all files on a tape without rewinding
- ask for and use a blocksize for each file
- provide a list of tape devices to users
- force use of 'nr<tape>' devices
- check for /bin/mt before trying to install

makedev() is simplified a bit to rely on errors from MAKEDEV rather
than checking for specific devices being present.

Revision 1.354 / (download) - annotate - [select for diffs], Sat Oct 2 18:45:08 2004 UTC (20 years, 1 month ago) by krw
Branch: MAIN
Changes since 1.353: +4 -6 lines
Diff to previous 1.353 (colored)

Minor code cleanup and shrinkage. No functional change.

Revision 1.353 / (download) - annotate - [select for diffs], Wed Sep 29 00:05:14 2004 UTC (20 years, 1 month ago) by krw
Branch: MAIN
Changes since 1.352: +79 -191 lines
Diff to previous 1.352 (colored)

Code cleanup and shrinkage (~2K).

Factor out drive/partition handling for CD and disk installs. Should
only affect installs/upgrades from non-ISO CDs and unmounted disk partitions.

Tested by Otto@.

'It is that high risk time' deraadt@.

Revision 1.352 / (download) - annotate - [select for diffs], Thu Sep 16 22:23:44 2004 UTC (20 years, 1 month ago) by mcbride
Branch: MAIN
Changes since 1.351: +2 -2 lines
Diff to previous 1.351 (colored)

Set the console device speed before instead of after selecting it as the
console. Fixes booting on Soekris net4501 without a cable connected.

ok tom@ markus@

Revision 1.351 / (download) - annotate - [select for diffs], Mon Aug 9 18:08:50 2004 UTC (20 years, 2 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_3_6_BASE, OPENBSD_3_6
Changes since 1.350: +2 -2 lines
Diff to previous 1.350 (colored)

move to 3.6-beta

Revision 1.350 / (download) - annotate - [select for diffs], Sun Jul 25 03:33:04 2004 UTC (20 years, 3 months ago) by krw
Branch: MAIN
Changes since 1.349: +2 -2 lines
Diff to previous 1.349 (colored)

Don't need to specify 9600 as the default speed, since it is first on the
list of speeds and thus the default default.

Revision 1.349 / (download) - annotate - [select for diffs], Sun Jul 18 03:26:21 2004 UTC (20 years, 3 months ago) by krw
Branch: MAIN
Changes since 1.348: +2 -2 lines
Diff to previous 1.348 (colored)

Make bsd.rd a default set.

ok deraadt@

Revision 1.348 / (download) - annotate - [select for diffs], Sun Jul 18 01:12:32 2004 UTC (20 years, 3 months ago) by deraadt
Branch: MAIN
Changes since 1.347: +4 -4 lines
Diff to previous 1.347 (colored)

spaces

Revision 1.347 / (download) - annotate - [select for diffs], Sun Jul 18 00:46:14 2004 UTC (20 years, 3 months ago) by krw
Branch: MAIN
Changes since 1.346: +1 -11 lines
Diff to previous 1.346 (colored)

For set installation via URL or NFS, assume the network has been configured
to the user's satisfaction.

ok tdeval@ deraadt@

Revision 1.346 / (download) - annotate - [select for diffs], Sat Jul 17 03:46:12 2004 UTC (20 years, 3 months ago) by krw
Branch: MAIN
Changes since 1.345: +2 -2 lines
Diff to previous 1.345 (colored)

Delete unused local vars.

Revision 1.345 / (download) - annotate - [select for diffs], Sat Jul 17 03:26:07 2004 UTC (20 years, 3 months ago) by krw
Branch: MAIN
Changes since 1.344: +2 -2 lines
Diff to previous 1.344 (colored)

Add 'stty <tty> <speed>' line to boot.conf if serial console is
made the default console. Ensures specified speed is actually used.

Pointed out by Derick Siddoway and Bob Humphrey.

ok deraadt@

Revision 1.344 / (download) - annotate - [select for diffs], Sat Jul 17 02:13:53 2004 UTC (20 years, 3 months ago) by krw
Branch: MAIN
Changes since 1.343: +6 -6 lines
Diff to previous 1.343 (colored)

Don't add '/'s to timezone path when null input entered
as sub-timezone.

Pointed out by cloder@.

Revision 1.343 / (download) - annotate - [select for diffs], Sat Jun 26 20:10:17 2004 UTC (20 years, 4 months ago) by krw
Branch: MAIN
Changes since 1.342: +48 -15 lines
Diff to previous 1.342 (colored)

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

ok beck@ deraadt@

Revision 1.342 / (download) - annotate - [select for diffs], Tue Jun 22 20:43:58 2004 UTC (20 years, 4 months ago) by krw
Branch: MAIN
Changes since 1.341: +2 -2 lines
Diff to previous 1.341 (colored)

Don't make xetc a default install set.

ok matthieu@

Revision 1.341 / (download) - annotate - [select for diffs], Tue Jun 22 00:42:11 2004 UTC (20 years, 4 months ago) by matthieu
Branch: MAIN
Changes since 1.340: +3 -3 lines
Diff to previous 1.340 (colored)

introduce the new xetc set. ok deraadt@, miod@, krw@.

Revision 1.340 / (download) - annotate - [select for diffs], Sun Jun 20 05:13:14 2004 UTC (20 years, 4 months ago) by krw
Branch: MAIN
Changes since 1.339: +6 -2 lines
Diff to previous 1.339 (colored)

If all default sets have been successfully installed, make [done] the
default answer to 'Where are the install sets?'.

Requested by various, most recently Henning and Theo.

Revision 1.339 / (download) - annotate - [select for diffs], Sun Jun 13 22:00:50 2004 UTC (20 years, 4 months ago) by deraadt
Branch: MAIN
Changes since 1.338: +2 -2 lines
Diff to previous 1.338 (colored)

if bsd.mp exists... let a user install it

Revision 1.338 / (download) - annotate - [select for diffs], Mon Apr 12 22:55:11 2004 UTC (20 years, 6 months ago) by krw
Branch: MAIN
Changes since 1.337: +84 -75 lines
Diff to previous 1.337 (colored)

Refactor network initialization code into explicit v4 routines to
prepare for v6 initialization. Minor verbiage changes, and not asking
for v4 default route if no v4 addresses were configured are the only
user visible changes.

ok deraadt@.

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

Update copyrights to 2004.

ok deraadt@.

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

Don't ask for timezone info during an upgrade.

Suggestion by Tom Cosgrove.

ok miod@ millert@ deraadt@.

Revision 1.335 / (download) - annotate - [select for diffs], Tue Mar 16 01:11:57 2004 UTC (20 years, 7 months ago) by deraadt
Branch: MAIN
Changes since 1.334: +2 -2 lines
Diff to previous 1.334 (colored)

save 2 bytes due to tabs

Revision 1.334 / (download) - annotate - [select for diffs], Sun Mar 14 20:55:02 2004 UTC (20 years, 7 months ago) by krw
Branch: MAIN
Changes since 1.333: +7 -15 lines
Diff to previous 1.333 (colored)

Fix sane_install() tests to use relevant directories/files. Tighten
emitted error messages.

Change default response to 'Use the nameserver now?' from a 'y' to
'yes' to be consistant with other ask_yn() usages.

ok beck@ deraadt@.

Revision 1.333 / (download) - annotate - [select for diffs], Tue Mar 9 03:58:34 2004 UTC (20 years, 7 months ago) by krw
Branch: MAIN
Changes since 1.332: +43 -8 lines
Diff to previous 1.332 (colored)

URL-encode all usercode/password characters between 0x20 and 0x7e so that
more weird usercodes and passwords work. Embedded blanks especially.

ok beck@.

Revision 1.332 / (download) - annotate - [select for diffs], Sat Feb 28 20:24:14 2004 UTC (20 years, 8 months ago) by krw
Branch: MAIN
Changes since 1.331: +3 -4 lines
Diff to previous 1.331 (colored)

Revert v1.314 changes adding '~' to user supplied relative ftp paths,
since today's ftp/fetch.c commit fixes real issue, and v1.314 broke
'ftp' user.

Problems with 'ftp' user reported by Stephen Kirkham of UofA.

Revision 1.331 / (download) - annotate - [select for diffs], Fri Feb 27 18:02:46 2004 UTC (20 years, 8 months ago) by deraadt
Branch: MAIN
Changes since 1.330: +2 -2 lines
Diff to previous 1.330 (colored)

move to 3.5-beta

Revision 1.330 / (download) - annotate - [select for diffs], Sun Feb 8 20:38:02 2004 UTC (20 years, 8 months ago) by krw
Branch: MAIN
Changes since 1.329: +4 -5 lines
Diff to previous 1.329 (colored)

Shave a few more characters.

Revision 1.329 / (download) - annotate - [select for diffs], Sun Feb 8 17:42:28 2004 UTC (20 years, 8 months ago) by krw
Branch: MAIN
Changes since 1.328: +4 -4 lines
Diff to previous 1.328 (colored)

Replace 'localhost' with '127.0.0.1' and add -q to route invocations
in enable_network(). From /etc/netstart.

Revision 1.328 / (download) - annotate - [select for diffs], Sun Feb 8 11:31:43 2004 UTC (20 years, 8 months ago) by krw
Branch: MAIN
Changes since 1.327: +10 -9 lines
Diff to previous 1.327 (colored)

Add loopback routes late during upgrades, as /etc/netstart does now.
Scavange a couple of characters while in the area.

Revision 1.327 / (download) - annotate - [select for diffs], Sun Feb 8 01:01:10 2004 UTC (20 years, 8 months ago) by krw
Branch: MAIN
Changes since 1.326: +2 -2 lines
Diff to previous 1.326 (colored)

Fix typo: 2>&2 -> 2>&1.

Revision 1.326 / (download) - annotate - [select for diffs], Sat Feb 7 17:45:04 2004 UTC (20 years, 8 months ago) by krw
Branch: MAIN
Changes since 1.325: +5 -10 lines
Diff to previous 1.325 (colored)

Simplify inet line processing in inet_info().

Revision 1.325 / (download) - annotate - [select for diffs], Sun Jan 11 18:57:02 2004 UTC (20 years, 9 months ago) by krw
Branch: MAIN
Changes since 1.324: +2 -12 lines
Diff to previous 1.324 (colored)

With wonderful new dhclient there is no need to try to kill a running
client or to run it with -1.

Revision 1.324 / (download) - annotate - [select for diffs], Sun Dec 21 21:45:41 2003 UTC (20 years, 10 months ago) by krw
Branch: MAIN
Changes since 1.323: +2 -2 lines
Diff to previous 1.323 (colored)

Bowing to the relentless pressure from Nick Holland, change the default answer
to 'Use the nameserver now?' to 'yes'. ok deraadt@.

Revision 1.323 / (download) - annotate - [select for diffs], Thu Dec 4 20:17:02 2003 UTC (20 years, 10 months ago) by deraadt
Branch: MAIN
Changes since 1.322: +13 -13 lines
Diff to previous 1.322 (colored)

shorten a teeny bit more

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

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

Revision 1.321 / (download) - annotate - [select for diffs], Mon Sep 22 01:31:39 2003 UTC (21 years, 1 month ago) by krw
Branch: MAIN
Changes since 1.320: +62 -64 lines
Diff to previous 1.320 (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.320 / (download) - annotate - [select for diffs], Sat Aug 23 22:22:02 2003 UTC (21 years, 2 months ago) by krw
Branch: MAIN
CVS Tags: OPENBSD_3_4_BASE, OPENBSD_3_4
Changes since 1.319: +2 -1 lines
Diff to previous 1.319 (colored)

If any interface has been configured using DHCP, assume the default route
will be set by DHCP.

ok drahn@ beck@ henning@

Revision 1.319 / (download) - annotate - [select for diffs], Sun Aug 17 18:51:54 2003 UTC (21 years, 2 months ago) by krw
Branch: MAIN
Changes since 1.318: +7 -7 lines
Diff to previous 1.318 (colored)

'Security' fix/cleanup/shrinkage.

Don't leave ftp password in a global variable. It is re-initialized
each time it is used anyway. Use a shorter (_passwd vs
_ftp_server_password) local variable name to save a few bytes.

Revision 1.318 / (download) - annotate - [select for diffs], Sun Aug 17 18:18:50 2003 UTC (21 years, 2 months ago) by krw
Branch: MAIN
Changes since 1.317: +30 -38 lines
Diff to previous 1.317 (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.317 / (download) - annotate - [select for diffs], Sat Aug 16 20:37:24 2003 UTC (21 years, 2 months ago) by krw
Branch: MAIN
Changes since 1.316: +2 -2 lines
Diff to previous 1.316 (colored)

Minor cosmetic cleanup.

Use '<msg>...done.' consistantly by replacing last five varient uses. Out with
'<msg> ... done.', '<msg>...Done.', etc.

Revision 1.316 / (download) - annotate - [select for diffs], Mon Aug 11 14:52:42 2003 UTC (21 years, 2 months ago) by deraadt
Branch: MAIN
Changes since 1.315: +2 -2 lines
Diff to previous 1.315 (colored)

move to 3.4-beta

Revision 1.315 / (download) - annotate - [select for diffs], Thu Aug 7 19:13:00 2003 UTC (21 years, 2 months ago) by deraadt
Branch: MAIN
Changes since 1.314: +3 -3 lines
Diff to previous 1.314 (colored)

spaces

Revision 1.314 / (download) - annotate - [select for diffs], Thu Jul 10 15:03:19 2003 UTC (21 years, 3 months ago) by krw
Branch: MAIN
Changes since 1.313: +4 -3 lines
Diff to previous 1.313 (colored)

Try to ensure that ftp gets install sets from the same directory it
looked in to get the list of available sets.

The list of available sets is obtained by connecting to the ftp server
interactively and issuing the commands

user <user> <pass>
cd <dir>
ls

where <dir> is treated as a relative path unless the user enters an
initial '/'. But the files are obtained by issuing the command

ftp ftp://<user>:<pass>@<host>/<dir>

and here <dir> is treated as an absolute path.

When using non-anonymous ftp this difference in the treatment of <dir>
could result in

a) Unhelpful error messages and unsuccessfull transfers.

b) Different sets than intended being installed.

c) Incorrect lists of available sets being displayed.

Now, the non-anonymous ftp transfer command with relative paths (i.e.
no leading '/' or '~') will look like

ftp ftp://<user>:<pass>@<host>/~/<dir>

Problem reported by (amoung others) Sebastian Stark, Nick Holland,
Steven Boothe, Sam Smith, Sergey Smitienko, Stephen Marley, Brad Ely.

ok millert@.

Revision 1.313 / (download) - annotate - [select for diffs], Thu Jul 10 14:12:54 2003 UTC (21 years, 3 months ago) by krw
Branch: MAIN
Changes since 1.312: +6 -1 lines
Diff to previous 1.312 (colored)

Ensure that the install/upgrade process is not troubled by any ulimit
settings. Set them all to 'unlimited'.

Problem with datasize limit vs fsck of large filesystem noted by
millert@.

ok millert@.

Revision 1.312 / (download) - annotate - [select for diffs], Thu Jul 3 15:19:01 2003 UTC (21 years, 4 months ago) by krw
Branch: MAIN
Changes since 1.311: +6 -6 lines
Diff to previous 1.311 (colored)

Use numeric comparison operators when testing numeric values.

Revision 1.311 / (download) - annotate - [select for diffs], Thu Jul 3 13:42:03 2003 UTC (21 years, 4 months ago) by krw
Branch: MAIN
Changes since 1.310: +10 -21 lines
Diff to previous 1.310 (colored)

Clarify and shrink.

In addel(), use $* and isin to avoid a duplicated traversal of the
argument list.

In bsort() remove code designed to prevent a trailing space in sorted
list. With the elimination of cutlast() and cutword() this is not
longer necessary.

The usual [] -> [[]], etc. in areas being revised.

Revision 1.310 / (download) - annotate - [select for diffs], Wed Jul 2 16:42:19 2003 UTC (21 years, 4 months ago) by krw
Branch: MAIN
Changes since 1.309: +10 -27 lines
Diff to previous 1.309 (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.309 / (download) - annotate - [select for diffs], Mon Jun 30 17:49:14 2003 UTC (21 years, 4 months ago) by krw
Branch: MAIN
Changes since 1.308: +26 -29 lines
Diff to previous 1.308 (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.308 / (download) - annotate - [select for diffs], Mon Jun 30 14:25:53 2003 UTC (21 years, 4 months ago) by krw
Branch: MAIN
Changes since 1.307: +16 -25 lines
Diff to previous 1.307 (colored)

Use built in pattern matching rather than cutlast() when extracting
timezone name from '/etc/localtime' link. Use cutword() rather than
cutlast() to see if there is more than one possible root disk. As
these were the last two uses of cutlast(), eradicate it.

Usual [...] -> [[...]], `` -> $(), extra '{}' and '"' eliminations in
areas being fixed up.

Revision 1.307 / (download) - annotate - [select for diffs], Fri Jun 27 22:40:40 2003 UTC (21 years, 4 months ago) by krw
Branch: MAIN
Changes since 1.306: +18 -2 lines
Diff to previous 1.306 (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.306 / (download) - annotate - [select for diffs], Mon Jun 23 00:38:57 2003 UTC (21 years, 4 months ago) by krw
Branch: MAIN
Changes since 1.305: +1 -9 lines
Diff to previous 1.305 (colored)

Minor cleanups.

1) Don't check for the existance of /mnt/etc/hosts twice. Since we
bail out at the first check the 2nd one is superfluous.

2) Shorten and clarify the upgrade network configuration logic.

3) Always ask if manual network configuration is desired when
upgrading. Allows the upgrader to decline to use the existing network
configuration and still have an explicit opportunity to configure the
network.

4) Don't bail out if the existing network configuration fails. Instead
(see 3)) offer manual network configuration and let the user decide if
it is worthwhile to continue.

5) Refer to actual file that is missing when bailing out, rather than
forcing user to be alert enough to prepend '/mnt'.

Revision 1.305 / (download) - annotate - [select for diffs], Sat Jun 21 23:02:32 2003 UTC (21 years, 4 months ago) by krw
Branch: MAIN
Changes since 1.304: +14 -15 lines
Diff to previous 1.304 (colored)

Make file selection more resistant to unexpected user input.

Rather than evaluating the expression

	case _f in
	$resp) ...
	esac

use the equivalent form

	case _f in
	@($resp)) ...
	esac

so that user input with multiple file names, user input with some
special characters like ';', etc. do not cause syntax errors and
premature ejection from the selection loop. A determined user can
still cause problems, e.g. by using quotes.

Clean up and simplify the code while in the area.

Problems noted by todd@.

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

licence cleanup; agreement from krw and millert

Revision 1.303 / (download) - annotate - [select for diffs], Mon May 12 19:01:58 2003 UTC (21 years, 5 months ago) by krw
Branch: MAIN
Changes since 1.302: +40 -41 lines
Diff to previous 1.302 (colored)

More cleanup and fixes in url installs.

1) Filter appropriate lines (ftp or http) from ftplist once when it is
downloaded rather than everytime the lines are needed.

2) Don't display the 'ftp://' or 'http://' part of the listed url's as
all displayed url's are of the same type. Partially compensates for
the last increase in the width of the 'cat -n' line number field.

3) Store filtered lines in /tmp/serverlist instead of /tmp/ftplist,
since it can be a list of http servers too. Makes it more obvious that
it is not a copy of ftplist.

4) Avoid 'ftplist: No such file' message, but add more informative
'Getting...done.' or 'Getting...FAILED.' message. Display the actual
ftp error that caused the FAILED status.

5) Add 'done' to the list of available options when asking for a
server location, allowing the user to return to set location selection
without having to enter a server.

6) Mention the '?' option in the prompt. It re-displays the list of
servers.

7) Eliminate unneeded variables 'host' and 'maxlines'. Make global
tline a local (_line). Change _ftp_get_list global to more generic
_get_server_list.

8) General logic cleanup.

Revision 1.302 / (download) - annotate - [select for diffs], Mon May 12 18:16:15 2003 UTC (21 years, 5 months ago) by krw
Branch: MAIN
Changes since 1.301: +2 -2 lines
Diff to previous 1.301 (colored)

Fix 'eval' statement in _url_base construction so that we use the
contents of ftp_server_dir or http_server_dir, and not their names.

ftp and http installs now work again.

Revision 1.301 / (download) - annotate - [select for diffs], Sun May 11 22:07:42 2003 UTC (21 years, 5 months ago) by krw
Branch: MAIN
Changes since 1.300: +10 -16 lines
Diff to previous 1.300 (colored)

More cleanup and fixes in url installs.

1) Rework _url_base to eliminate need for _url_pass and _url_login
variables.

2) Shorten and make more consistant with other messages the prompt for
the list of ftp/http servers.

3) Don't refer to _ftp_server_dir, use ${_url_type}_server_dir so that
a default prompt is available for both ftp and http installs.

4) Eliminate a couple of unneeded {}'s.

Revision 1.300 / (download) - annotate - [select for diffs], Sun May 11 20:05:56 2003 UTC (21 years, 5 months ago) by krw
Branch: MAIN
Changes since 1.299: +5 -12 lines
Diff to previous 1.299 (colored)

Shrink & clarify code around ftp/http proxy identification.

Eliminate unnecessary _proxy_host variable that merely kept a copy of
the value of ftp_proxy and http_proxy.

Revision 1.299 / (download) - annotate - [select for diffs], Sun May 11 17:27:15 2003 UTC (21 years, 5 months ago) by krw
Branch: MAIN
Changes since 1.298: +8 -7 lines
Diff to previous 1.298 (colored)

Don't reject a perfectly valid absolute path to sets just because the
user was observant enough to see where the filesystems are mounted.

Suggested by espie@.

Revision 1.298 / (download) - annotate - [select for diffs], Wed May 7 00:43:06 2003 UTC (21 years, 5 months ago) by krw
Branch: MAIN
Changes since 1.297: +4 -4 lines
Diff to previous 1.297 (colored)

Use -h option in tar invocations so that upgrades respect links.

Recover two of the three extra characters by deleting unneeded '-'s in
the tar invocations used in tape installs.

Problem noted and solution suggested by millert@.

Revision 1.297 / (download) - annotate - [select for diffs], Wed Apr 30 23:56:30 2003 UTC (21 years, 6 months ago) by krw
Branch: MAIN
Changes since 1.296: +29 -35 lines
Diff to previous 1.296 (colored)

Rework munge_fstab to shrink and clarify code.

Collect all tests that cause a line to be skipped into one test by
using ksh string pattern features instead of case statements.

Simply sed expressions by not worrying about extra commas in the
options field (they're ignored during mount) and assuming 'rw',
'noauto', 'xx' do not appear as substrings in any valid option.

Leave out fs_freq and fs_passno fields as unnecessary during
install/upgrade.

Eliminate special test for '/' mount point and simply strip any
trailing slash from all mount points.

Kicked off my wifried@'s 'xx'/altroot change, and ok'ed in various
incarnations by wilfried@ deraadt@ millert@.

Revision 1.296 / (download) - annotate - [select for diffs], Wed Apr 23 12:06:55 2003 UTC (21 years, 6 months ago) by wilfried
Branch: MAIN
Changes since 1.295: +8 -7 lines
Diff to previous 1.295 (colored)

ignore altroot filesystem when upgrading, ok krw@

Revision 1.295 / (download) - annotate - [select for diffs], Thu Apr 17 19:15:49 2003 UTC (21 years, 6 months ago) by deraadt
Branch: MAIN
Changes since 1.294: +13 -13 lines
Diff to previous 1.294 (colored)

remove extra spaces, make smaller, krw you keep adding them back! ;)

Revision 1.294 / (download) - annotate - [select for diffs], Wed Apr 16 23:47:01 2003 UTC (21 years, 6 months ago) by krw
Branch: MAIN
Changes since 1.293: +2 -3 lines
Diff to previous 1.293 (colored)

Always do 'route -n show' not 'route show'. Even saves some space.

From deraadt@

Revision 1.293 / (download) - annotate - [select for diffs], Thu Mar 6 04:19:45 2003 UTC (21 years, 7 months ago) by david
Branch: MAIN
CVS Tags: OPENBSD_3_3_BASE, OPENBSD_3_3
Changes since 1.292: +2 -2 lines
Diff to previous 1.292 (colored)

spelling fixes
ok henning@

Revision 1.292 / (download) - annotate - [select for diffs], Thu Mar 6 00:27:41 2003 UTC (21 years, 7 months ago) by krw
Branch: MAIN
Changes since 1.291: +3 -2 lines
Diff to previous 1.291 (colored)

Delete the password from the ftp url shown when no sets are found.

a) We shouldn't display passwords.

b) If it is encoded, and thus different from what was entered,
installers will leap to the incorrect conclusion that the logon
failed.

c) At this point the logon to the server was successful so the
password worked, and the user shouldn't have forgotten it already.

ok deraadt@.

Revision 1.291 / (download) - annotate - [select for diffs], Sun Mar 2 00:17:20 2003 UTC (21 years, 8 months ago) by krw
Branch: MAIN
Changes since 1.290: +4 -2 lines
Diff to previous 1.290 (colored)

Fix default route handling during installation to preserve active
default route even if 'none' or 'dhcp' is selected as the default
route for the installed system. Previously, specifying 'none' or
'dhcp' would delete the existing default route, making ftp installs
from non-local servers impossible.

This is done by only deleting the existing default route when a change
is attempted, and putting back the previous default route if the
change fails.

Problem noticed by drahn@.

Revision 1.290 / (download) - annotate - [select for diffs], Sun Feb 16 23:25:40 2003 UTC (21 years, 8 months ago) by krw
Branch: MAIN
Changes since 1.289: +15 -16 lines
Diff to previous 1.289 (colored)

Fix up some DNS verbiage to make it consistant.

Fix up default route selection by

a) Forcing user to explicitly chose 'dhcp' as a mechanism for
specifying a default route, rather than guessing based on one or more
interfaces being configured by dhcp.

b) If the user specified default route does not work, re-present the
existing default route rather than losing it.

c) Move default route selection to after nameserver activation so the
user can specify a hostname as the default route.

Change /etc/netstart so that /etc/mygate wins if a default route was
already specified (i.e. by dhcp).

ok deraadt@.

Revision 1.289 / (download) - annotate - [select for diffs], Sat Feb 15 20:36:18 2003 UTC (21 years, 8 months ago) by krw
Branch: MAIN
Changes since 1.288: +2 -2 lines
Diff to previous 1.288 (colored)

Make bsd.rd an install/upgrade set.

Suggestion by Nick Holland out of comments by deraadt@ and miod@.

ok deraadt@ millert@

Revision 1.288 / (download) - annotate - [select for diffs], Wed Feb 12 23:07:28 2003 UTC (21 years, 8 months ago) by deraadt
Branch: MAIN
Changes since 1.287: +2 -2 lines
Diff to previous 1.287 (colored)

move to 3.3-beta

Revision 1.287 / (download) - annotate - [select for diffs], Sun Jan 26 15:53:13 2003 UTC (21 years, 9 months ago) by krw
Branch: MAIN
Changes since 1.286: +110 -141 lines
Diff to previous 1.286 (colored)

Last (?) big cleanup in distrib/miniroot this release cycle.

Simplify and clarify logic around selecting/installing sets.

Rename do_selection_list() to select_sets(), and install_get_files()
to install_files().

Eliminate glob_selection() and get_get_files() and the global
GET_FILES, folding logic into select_sets() and install_files().

Show the user entire 'url' when no sets are found, rather than trying
to hide mount points, etc.

Eliminate VERSION_MAJOR and VERSION_MINOR since they were always used
together. Instead, simply construct a few variables (SETDIR, FTPDIR,
OBSD) holding the strings these were used to construct.

Various 'standard' cleanups of quotes, braces, etc. in modified areas.

Also shrinks install.sub by 681 bytes.

Revision 1.286 / (download) - annotate - [select for diffs], Sat Jan 25 15:46:52 2003 UTC (21 years, 9 months ago) by krw
Branch: MAIN
Changes since 1.285: +6 -7 lines
Diff to previous 1.285 (colored)

Eliminate unused global SETSDONE.

Add (back?) function SETSDONE was probably supposed to be doing
(preventing the automatic selection of already installed sets) by
manipulating DEFAULTSETS instead. Remove successfully installed sets
from DEFAULTSETS, and add 'problem' sets detected in sane_install()
back into DEFAULTSETS.

Revision 1.285 / (download) - annotate - [select for diffs], Sat Dec 14 15:33:35 2002 UTC (21 years, 10 months ago) by krw
Branch: MAIN
Changes since 1.284: +12 -12 lines
Diff to previous 1.284 (colored)

Expunge some trailing whitespace.

From David Krause.

Revision 1.284 / (download) - annotate - [select for diffs], Sun Dec 8 20:24:56 2002 UTC (21 years, 10 months ago) by krw
Branch: MAIN
Changes since 1.283: +9 -14 lines
Diff to previous 1.283 (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.283 / (download) - annotate - [select for diffs], Sun Dec 8 19:30:40 2002 UTC (21 years, 10 months ago) by krw
Branch: MAIN
Changes since 1.282: +61 -110 lines
Diff to previous 1.282 (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.282 / (download) - annotate - [select for diffs], Wed Dec 4 03:39:07 2002 UTC (21 years, 10 months ago) by krw
Branch: MAIN
Changes since 1.281: +57 -97 lines
Diff to previous 1.281 (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.281 / (download) - annotate - [select for diffs], Tue Dec 3 00:58:35 2002 UTC (21 years, 11 months ago) by krw
Branch: MAIN
Changes since 1.280: +58 -42 lines
Diff to previous 1.280 (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.280 / (download) - annotate - [select for diffs], Sun Dec 1 23:19:33 2002 UTC (21 years, 11 months ago) by krw
Branch: MAIN
Changes since 1.279: +52 -40 lines
Diff to previous 1.279 (colored)

Code consolidation. Create edit_tmp_file(), manual_net_cfg(), inet_info()
to abstract repeated code blocks.

Current score: 3.2      install+upgrade+install.sub = 40,062 bytes
               -current    "        "         "     = 38,051

Revision 1.279 / (download) - annotate - [select for diffs], Sun Dec 1 16:51:14 2002 UTC (21 years, 11 months ago) by krw
Branch: MAIN
Changes since 1.278: +11 -26 lines
Diff to previous 1.278 (colored)

Create kill_dhclient(). Use before any attempt to run dhclient, to
avoid problems with the single bpf interface available on install
media.

Move umount'ing of filesystems to the start of any install or upgrade
execution.

Eliminate now vestigal cleanup_on_exit() and all associated traps.

Shrinks scripts, makes more reliable, improves intuitiveness of
re-running install or upgrade, eliminates an install/upgrade time
message, leaves filesystems available if install/upgrade script
interrupted.

Revision 1.278 / (download) - annotate - [select for diffs], Fri Nov 29 00:24:58 2002 UTC (21 years, 11 months ago) by krw
Branch: MAIN
Changes since 1.277: +7 -19 lines
Diff to previous 1.277 (colored)

Ask for DNS domain name *after* the interfaces are configured, at the
same time as we ask for the default route and name server addresses.

This allows users to override any DHCP supplied domain information the
same way they could override DHCP supplied default route and name server
addresses. As a result, remove the now superfluous warning about
not supplying information DHCP is going to overwrite.

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

spaces

Revision 1.276 / (download) - annotate - [select for diffs], Thu Nov 28 01:54:58 2002 UTC (21 years, 11 months ago) by krw
Branch: MAIN
Changes since 1.275: +10 -10 lines
Diff to previous 1.275 (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.275 / (download) - annotate - [select for diffs], Thu Nov 28 01:11:05 2002 UTC (21 years, 11 months ago) by krw
Branch: MAIN
Changes since 1.274: +9 -11 lines
Diff to previous 1.274 (colored)

Save a few bytes;

1) The one '/sbin/ifconfig' -> 'ifconfig'.

2) Eliminate local variable and thereby unneeded '\n' in welcome().

Revision 1.274 / (download) - annotate - [select for diffs], Thu Nov 28 00:44:56 2002 UTC (21 years, 11 months ago) by krw
Branch: MAIN
Changes since 1.273: +3 -3 lines
Diff to previous 1.273 (colored)

Fix indent botch.

Revision 1.273 / (download) - annotate - [select for diffs], Sun Nov 10 01:08:33 2002 UTC (21 years, 11 months ago) by krw
Branch: MAIN
Changes since 1.272: +24 -13 lines
Diff to previous 1.272 (colored)

Fix makedev() so that if the device nodes are *not* created, makedev()
returns false, and the device is *not* added to DEVSMADE.

Revision 1.272 / (download) - annotate - [select for diffs], Sat Nov 9 06:16:06 2002 UTC (21 years, 11 months ago) by krw
Branch: MAIN
Changes since 1.271: +23 -58 lines
Diff to previous 1.271 (colored)

Code cleanup, simplification and shrinkage.

Eliminate the function get_setsdir() by merging it into
install_mounted_fs(). Eliminate global SETSDIR as a result.

Move the loop logic used to select the directory to use on a mounted
filesystem to a 'done' style loop. i.e. loop until valid input (a
directory which exists) or 'done'. 'done' implies abandoning effort to
find a directory.

Eliminate the test for and associated error message about no
filesystems being mounted below the mount point passed to
install_mounted_fs(). This served little purpose not addressed by the
message generated when a non-existant directory is entered.  i.e.
novices won't understand and experts can '!' out to investigate.

Remove the option to list mounted filesystems. Same reasons as for
eliminating the test for mounted filesystems.

Move repeated tests for an empty GET_FILES into the function
invariably called after the tests (install_get_files()).

Revision 1.271 / (download) - annotate - [select for diffs], Sat Nov 9 04:41:56 2002 UTC (21 years, 11 months ago) by krw
Branch: MAIN
Changes since 1.270: +9 -9 lines
Diff to previous 1.270 (colored)

Fix two problems:

1) When asked to choose a device, a user could enter two identical
words separated by a blank (e.g. 'a a') and thereby confuse the check
for selection validity. Quote user response before using it.

2) When asked to choose a sub-timezone, the user could escape to
a shell and when returning only see half the sub-timezone prompt
redisplayed. Put entire prompt into ask() parameter rather than
displaying first half in a separate echo -n.

Also change a "(or done)" to "(or 'done')" to be consistant with
other similar displays and move the initial comment for mount_a_disk()
to before the function to conform to normal usage.

Revision 1.270 / (download) - annotate - [select for diffs], Thu Nov 7 01:28:52 2002 UTC (21 years, 11 months ago) by krw
Branch: MAIN
Changes since 1.269: +40 -104 lines
Diff to previous 1.269 (colored)

Treat 'bsd' like just another filename in THESETS, no more 'kernel'
logic.  As result, MDSETS gone from everything but mac68k.

MDSETS now treated as a list of complete file names to add to THESETS,
allowing more MD flexibility, i.e. may or may not be .tgz files.

All traces of tar.gz removed. Not used for sets since 2.7 or so. As a
result of code simplification from not having to consider tar.gz, the
functions get_sets(), make_lastset(), and set_not_done() are
eliminated, along with the global SETS.

Build THESETS and DEFAULTSETS to contain full file names.

Always install sets in the order they appear in THESETS, keeping
siteXX last but without needing special logic. More predictable for
user if a lot of set additions and removals done before being
satisfied, as the sets are now installed in the same order they appear
in the selection list.

Remove ability to look for non-set .tgz/.tar.gz files. The job of the
install scripts is to install the standard sets in a simple and
rational way. Not to install general tar balls. The user can do that
post-install or simply '!' out to do it during install. On their head
be it.

If no sets are found in a specified source, list the filenames in
THESETS to show what is being looked for.

Revision 1.269 / (download) - annotate - [select for diffs], Fri Nov 1 01:08:15 2002 UTC (22 years ago) by krw
Branch: MAIN
Changes since 1.268: +4 -16 lines
Diff to previous 1.268 (colored)

Cleanup. Don't bother complaining when the user selects some non-existant
set. Just re-display the selection list unchanged. Smaller, cleaner.

Revision 1.268 / (download) - annotate - [select for diffs], Thu Oct 31 00:30:31 2002 UTC (22 years ago) by krw
Branch: MAIN
Changes since 1.267: +19 -8 lines
Diff to previous 1.267 (colored)

Introduce some better feedback during attempted ftp installations. In
this pass check the file list returned by ftp_list_file() for two
common errors ('Login failed.' and 'No such file or directory.') and
display the error messages rather than just complaining that no sets
were found.

Delete an unused local variable.

Do not allow the user to continue with the install/upgrade if the
sanity checks fail. Keep asking them to install more sets until the
checks succeed.

ok millert@.

Revision 1.267 / (download) - annotate - [select for diffs], Mon Oct 28 00:36:04 2002 UTC (22 years ago) by krw
Branch: MAIN
Changes since 1.266: +63 -56 lines
Diff to previous 1.266 (colored)

Rework/reword the install sanity checks and associated logic slightly.

1) Do all three sanity checks (for bsd, base32, etc32) every time so
the user is aware of all three problems asap. Make the error messages
stand out, and refer explicitly to the sets that should fix the
problem.

2) Use standard 'done' logic to exit the set selection loop rather than
ask a separate question. One side effect: a <cr> at the set location
prompt now just causes the redisplay of the prompt rather than an
error.

3) Remove 'suspect' sets from the SETSDONE list so that if bsd, base32
or etc32 are found to be wanting, they are automatically selected the
next time they appear on the list of available sets.

4) But the $MDSETS (and therefore the 'bsd' set) first on the
selection list. This puts all three 'required' sets at the top of the
list where they seem to belong.

Revision 1.266 / (download) - annotate - [select for diffs], Sun Oct 27 14:05:21 2002 UTC (22 years ago) by krw
Branch: MAIN
Changes since 1.265: +21 -2 lines
Diff to previous 1.265 (colored)

Ensure that 'siteXX.tgz' and 'siteXX.tar.gz' are the *last* sets
installed.

This should guarantee that any site-specific files which are intended
to replace files installed from 'normal' sets will do so.

Revision 1.265 / (download) - annotate - [select for diffs], Fri Oct 4 01:22:39 2002 UTC (22 years ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_3_2_BASE, OPENBSD_3_2
Changes since 1.264: +2 -5 lines
Diff to previous 1.264 (colored)

krw fucked up; i must re-tag this file

Revision 1.264 / (download) - annotate - [select for diffs], Thu Oct 3 00:56:44 2002 UTC (22 years, 1 month ago) by krw
Branch: MAIN
Changes since 1.263: +38 -43 lines
Diff to previous 1.263 (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.263 / (download) - annotate - [select for diffs], Mon Sep 30 07:07:55 2002 UTC (22 years, 1 month ago) by deraadt
Branch: MAIN
Changes since 1.262: +4 -4 lines
Diff to previous 1.262 (colored)

a few new spaces -> tabs

Revision 1.262 / (download) - annotate - [select for diffs], Sun Sep 29 22:52:21 2002 UTC (22 years, 1 month ago) by krw
Branch: MAIN
Changes since 1.261: +14 -3 lines
Diff to previous 1.261 (colored)

Keep track of all devices that makedev() creates and recreate
them in the installed system.

ok deraadt@. (which I forgot to mention for the last commit).

Revision 1.261 / (download) - annotate - [select for diffs], Sun Sep 29 22:45:44 2002 UTC (22 years, 1 month ago) by krw
Branch: MAIN
Changes since 1.260: +11 -20 lines
Diff to previous 1.260 (colored)

Modify makedev so that it does not attempt to create network interface
devices, to allow ask_which() to be used for interface configuration.

Rework network interface configuration logic to use ask_which() instead
of local code. This

1) May fix the problem noted by David Norman, where the prompts are
somehow broken, since no such problems have been noted with the
ask_which() code.

2) Shrinks the install output by a few lines.

3) Makes the install script smaller and clearer.

4) Makes interface configuration consistant with other 'device'
configurations.

5) Makes it impossible for a user to configure an interface more than
once.

Add the interface name to the 'IP address (or dhcp)' question. This
makes it more informative, especially if a '!' or '!foo' shell escape
has been used and overwritten the list of interfaces and the display of
the name of the one being configured.

Revision 1.260 / (download) - annotate - [select for diffs], Sat Sep 28 23:35:12 2002 UTC (22 years, 1 month ago) by krw
Branch: MAIN
Changes since 1.259: +29 -24 lines
Diff to previous 1.259 (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.259 / (download) - annotate - [select for diffs], Tue Sep 24 01:26:15 2002 UTC (22 years, 1 month ago) by krw
Branch: MAIN
Changes since 1.258: +16 -14 lines
Diff to previous 1.258 (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.258 / (download) - annotate - [select for diffs], Sun Sep 22 22:42:25 2002 UTC (22 years, 1 month ago) by krw
Branch: MAIN
Changes since 1.257: +11 -7 lines
Diff to previous 1.257 (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.257 / (download) - annotate - [select for diffs], Fri Sep 20 00:15:00 2002 UTC (22 years, 1 month ago) by millert
Branch: MAIN
Changes since 1.256: +2 -2 lines
Diff to previous 1.256 (colored)

Add pflog, vlan and gif to list of interfaces filtered; krw@ OK

Revision 1.256 / (download) - annotate - [select for diffs], Tue Sep 17 16:15:25 2002 UTC (22 years, 1 month ago) by krw
Branch: MAIN
Changes since 1.255: +1 -1 lines
Diff to previous 1.255 (colored)

Fix commit botch that deleted '#' at beginning of '$OpenBSD$' tag line.

Revision 1.255 / (download) - annotate - [select for diffs], Tue Sep 17 12:28:54 2002 UTC (22 years, 1 month ago) by krw
Branch: MAIN
Changes since 1.254: +121 -195 lines
Diff to previous 1.254 (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.254 / (download) - annotate - [select for diffs], Tue Sep 10 21:36:56 2002 UTC (22 years, 1 month ago) by deraadt
Branch: MAIN
Changes since 1.253: +2 -2 lines
Diff to previous 1.253 (colored)

move to 3.2-beta

Revision 1.253 / (download) - annotate - [select for diffs], Tue Aug 27 02:27:07 2002 UTC (22 years, 2 months ago) by krw
Branch: MAIN
Changes since 1.252: +5 -2 lines
Diff to previous 1.252 (colored)

Missed file in last commit.

Revision 1.252 / (download) - annotate - [select for diffs], Thu Aug 15 22:56:03 2002 UTC (22 years, 2 months ago) by krw
Branch: MAIN
Changes since 1.251: +4 -2 lines
Diff to previous 1.251 (colored)

Fix a problem with re-started installs that caused the domain
name to be repeatedly appended to the host name. Simply strip
the domain name from the host name read from /tmp/myname.

Problem noted by Nick Holland.

Revision 1.251 / (download) - annotate - [select for diffs], Sun Jul 28 01:14:58 2002 UTC (22 years, 3 months ago) by krw
Branch: MAIN
Changes since 1.250: +2 -1 lines
Diff to previous 1.250 (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.250 / (download) - annotate - [select for diffs], Sat Jul 27 04:05:08 2002 UTC (22 years, 3 months ago) by krw
Branch: MAIN
Changes since 1.249: +36 -28 lines
Diff to previous 1.249 (colored)

Fix two problems.

1) Even if /sbin/mount_nfs is present, do *not* try to automatically
mount nfs file systems. Because not all name resolution mechanisms are
present during upgrade (e.g. yp) it is not safe to do so. The user
must manually mount nfs file systems if they are the source of any
sets.  Problem noted by miod@, change seconded by deraadt@.

2) Change initial verbiage so that a brief introduction is displayed,
along with the information about !foo or !, before the terminal type
is requested.  After the terminal type is known display the rest of
the introductory text using less -XE. This belts and suspender fix
makes both the install and upgrade text fit in 'page' size (<24 lines)
chunks and ensures that if the text ever grows beyond a page a more
informative prompt is displayed. Problem noted by millert@.

Revision 1.249 / (download) - annotate - [select for diffs], Mon Jul 22 00:13:01 2002 UTC (22 years, 3 months ago) by krw
Branch: MAIN
Changes since 1.248: +3 -3 lines
Diff to previous 1.248 (colored)

Undo a cvs botch in the last commit that reverted a few lines.

Revision 1.248 / (download) - annotate - [select for diffs], Thu Jul 18 00:36:44 2002 UTC (22 years, 3 months ago) by krw
Branch: MAIN
Changes since 1.247: +24 -14 lines
Diff to previous 1.247 (colored)

Rework upgrade's fstab handling so

1) All filesystem with a corresponding /sbin/mount_<type> available
will be mounted. i.e. don't restrict automounting to ffs filesystems
when the user can later mount the others manually.

2) All non-ffs filesystems will be mounted ro, just as currently is
the case for user-mounted filesystems.

3) fsck all to-be-mounted filesystems that have a corresponding
/sbin/fsck_<type> program present.

Some verbiage adjustment and related code cleanup as well.

ok deraadt@.

Revision 1.247 / (download) - annotate - [select for diffs], Sat Jul 13 16:32:13 2002 UTC (22 years, 3 months ago) by krw
Branch: MAIN
Changes since 1.246: +30 -43 lines
Diff to previous 1.246 (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.246 / (download) - annotate - [select for diffs], Sat Jul 13 13:18:05 2002 UTC (22 years, 3 months ago) by krw
Branch: MAIN
Changes since 1.245: +50 -75 lines
Diff to previous 1.245 (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.245 / (download) - annotate - [select for diffs], Fri Jul 12 01:25:44 2002 UTC (22 years, 3 months ago) by krw
Branch: MAIN
Changes since 1.244: +3 -34 lines
Diff to previous 1.244 (colored)

Eliminate list_has_sets() by eliminating its only use. Instead of
checking for sets when the a valid directory is given in
get_setsdir(), rely on eqivalent check in get_sets() instead.

Reduces code duplication and eliminates a possible duplicated error
message about not finding sets in a directory.

Revision 1.244 / (download) - annotate - [select for diffs], Fri Jul 12 00:07:33 2002 UTC (22 years, 3 months ago) by krw
Branch: MAIN
Changes since 1.243: +27 -39 lines
Diff to previous 1.243 (colored)

Consolidate repeated logic to get non-empty $resp into a
function ask_until().

Eliminate some unnecessary ':' statements used to initialize
variables by doing initialization in first reference - i.e.
when passing the variable to ask_until().

Shrinks and clarifies.

Revision 1.243 / (download) - annotate - [select for diffs], Tue Jul 9 23:19:10 2002 UTC (22 years, 3 months ago) by krw
Branch: MAIN
Changes since 1.242: +2 -2 lines
Diff to previous 1.242 (colored)

Fix typo (get_sets_list -> get_sets) that caused ftp installs to fail.

Noticed by STeve Andre

Revision 1.242 / (download) - annotate - [select for diffs], Sun Jul 7 02:34:00 2002 UTC (22 years, 3 months ago) by krw
Branch: MAIN
Changes since 1.241: +93 -122 lines
Diff to previous 1.241 (colored)

More cleanup/shrinkage/clarification.

a) Eliminate single invocation here document functions
   not_going_to_install(), congrats() by putting the here
   document at the point of invocation.

b) Make (deliberately) global variables consistantly upper case and
   with no leading '_'. Many variables that could be local are still
   creating globals.

c) Make all get_* functions names conform to a convention of
   get_<global variable name>, where the <global_variable_name>
   is the global variable set by the function, or whose new
   value is returned by the function.

d) Change _IFS to IFDEVS to be consistant with CDDEVS and DKDEVS,
   and initialize it at the same place.

e) Handle bare '+', '-' in same place other selections are parsed
   rather than in a separate case statement.

f) eliminate '[ "$var" ] || var=value' constructs with ': ${var:=value}'
   constructs.

g) Rename local_sets_dir -> SETSDIR.

h) Rework logic around ftp passwords to eliminate duplications
   and ensure a new password is asked for each time.

i) Some minor cosmetic adjustments.

Revision 1.241 / (download) - annotate - [select for diffs], Sat Jul 6 16:18:13 2002 UTC (22 years, 3 months ago) by krw
Branch: MAIN
Changes since 1.240: +3 -3 lines
Diff to previous 1.240 (colored)

Fix typo in get_get_files_list() that prevented sets from
being found for install/upgrade.

Revision 1.240 / (download) - annotate - [select for diffs], Thu Jul 4 23:36:35 2002 UTC (22 years, 3 months ago) by krw
Branch: MAIN
Changes since 1.239: +56 -71 lines
Diff to previous 1.239 (colored)

More cleanup/shrinkage/clarification.

a) Abstract selection list handling into a function
   do_selection_list() rather than repeating the
   code twice.

b) Eliminate function get_selection() and put limited
   remaining functionality directly into only caller,
   get_get_file_list().

c) Remove unused parameters in glob_selection() and
   invocations of same.

d) Remove unused parameters from install_get_files_list()
   invocations.

e) Remove unnecessary local parameter '_file_list' in
   install_mounted_fs().

Revision 1.239 / (download) - annotate - [select for diffs], Thu Jul 4 21:51:16 2002 UTC (22 years, 3 months ago) by krw
Branch: MAIN
Changes since 1.238: +15 -39 lines
Diff to previous 1.238 (colored)

Eliminate the separate display_* functions. A little more
consolidation reduces calls to these functions to either 0
(display_failure_msg()) or 1.

Just put the here documents in place of the invocation.

Revision 1.238 / (download) - annotate - [select for diffs], Thu Jul 4 17:23:42 2002 UTC (22 years, 3 months ago) by krw
Branch: MAIN
Changes since 1.237: +5 -5 lines
Diff to previous 1.237 (colored)

Since the directory /var/run is now present during install/upgrade,
put dmesg.boot there rather than the non-normal location
/tmp/dmesg.boot.

Revision 1.237 / (download) - annotate - [select for diffs], Thu Jul 4 16:01:21 2002 UTC (22 years, 3 months ago) by krw
Branch: MAIN
Changes since 1.236: +25 -52 lines
Diff to previous 1.236 (colored)

Fix set selection list logic so that when extracting more sets

a) The selection list does not display default sets already
transferred.

b) Saying 'done' does not seem to mysteriously skip the sets
erroneously shown as selected due to a).

This problem was found by miod@.

In the process

a) Use _setsdone only to record sets that have successfully been
extracted.

b) Don't loop on fetching files if a transfer fails. Just let the user
know, and let the normal logic offer them a chance to extract the
failed sets from the same or different source.

c) Eliminate some (newly) dead variables, especially the global
_osetsdone.

Revision 1.236 / (download) - annotate - [select for diffs], Sat Jun 29 20:01:34 2002 UTC (22 years, 4 months ago) by krw
Branch: MAIN
Changes since 1.235: +26 -16 lines
Diff to previous 1.235 (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.235 / (download) - annotate - [select for diffs], Tue Jun 25 00:31:59 2002 UTC (22 years, 4 months ago) by krw
Branch: MAIN
Changes since 1.234: +79 -84 lines
Diff to previous 1.234 (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.234 / (download) - annotate - [select for diffs], Sat Jun 15 16:03:40 2002 UTC (22 years, 4 months ago) by fgsch
Branch: MAIN
Changes since 1.233: +2 -2 lines
Diff to previous 1.233 (colored)

rename install_from_mounted_fs to install_mounted_fs here as well; krw@ ok.

Revision 1.233 / (download) - annotate - [select for diffs], Tue Jun 11 04:25:49 2002 UTC (22 years, 4 months ago) by krw
Branch: MAIN
Changes since 1.232: +48 -67 lines
Diff to previous 1.232 (colored)

Rework get_localdir() so that

1) It takes two parameters, the mount point and a default
directory.

2) It has one step escape ('abort') instead of asking user if they are
really sure an empty pathname is what they want. Empty entry with no
default value now just re-presents the prompt. More consistant with the
behaviour of other prompts.

3) Provide separate error messages for non-existant directory and a
directory with no sets.

Rework install_mounted_fs() (renamed from install_from_mounted_fs to
be consistant with install_disk, etc.) so that

1) It takes two parameters, the mount point and the default directory.

2) It calls get_localdir(), passing the parameters along.

Rework install_disk(), install_cdrom() and install_nfs() to eliminate
local queries for local dir and rely on get_local() via
install_mounted_fs() instead.

Make mount_a_disk() return 0 on success to make testing its return
value more obvious. Use this in install_disk() to make logic clearer
and eliminate the need for a return.

Revision 1.232 / (download) - annotate - [select for diffs], Tue Jun 11 03:12:22 2002 UTC (22 years, 4 months ago) by krw
Branch: MAIN
Changes since 1.231: +10 -10 lines
Diff to previous 1.231 (colored)

Delete an extraneous 'mkdir /mnt2' in install_nfs().

Mount NFS servers with -o ro the same as all other install
sets sources.

Check for /sbin/mount_nfs in install_nfs() rather before
the call in install_sets(). Makes install_sets() more
consistant in both code and reactions to failed attempts
to find sets.

Revision 1.231 / (download) - annotate - [select for diffs], Mon Jun 10 23:03:32 2002 UTC (22 years, 4 months ago) by krw
Branch: MAIN
Changes since 1.230: +3 -2 lines
Diff to previous 1.230 (colored)

Be more paranoid about option fiddling in munge_fs, in case someone
ever adds an option with a name too similar to the name of the one
being manipulated.

Only softdep at the moment but some more option fiddling coming.

Revision 1.230 / (download) - annotate - [select for diffs], Mon Jun 10 22:38:12 2002 UTC (22 years, 4 months ago) by krw
Branch: MAIN
Changes since 1.229: +2 -9 lines
Diff to previous 1.229 (colored)

Eliminate unused _installed_via_${_url_type} variables.

Don't bother returning a value of 1 from installed_get_files_list()
now, since it was only used to set the eliminated variables.

Revision 1.229 / (download) - annotate - [select for diffs], Mon Jun 10 21:09:51 2002 UTC (22 years, 4 months ago) by krw
Branch: MAIN
Changes since 1.228: +8 -7 lines
Diff to previous 1.228 (colored)

Move '[ "$_didnet" ] || donetconfig' lines into install_url and
install_nfs rather than before function calls.

Eliminates duplicate calls before install_url and now network will not
be configured if install_nfs is not a valid choice.

Revision 1.228 / (download) - annotate - [select for diffs], Mon Jun 10 19:50:16 2002 UTC (22 years, 4 months ago) by krw
Branch: MAIN
Changes since 1.227: +5 -10 lines
Diff to previous 1.227 (colored)

Pass 'ftp' or 'http' to install_url, rather than '-ftp' or '-http' and
just assign $1 to _url_type rather than translating -ftp to ftp and
-http to http in a case statement.

Smaller. Simpler. Clearer.

Revision 1.227 / (download) - annotate - [select for diffs], Sun Jun 9 05:53:54 2002 UTC (22 years, 4 months ago) by todd
Branch: MAIN
Changes since 1.226: +7 -7 lines
Diff to previous 1.226 (colored)

knf

Revision 1.226 / (download) - annotate - [select for diffs], Sat Jun 8 21:52:02 2002 UTC (22 years, 4 months ago) by krw
Branch: MAIN
Changes since 1.225: +9 -3 lines
Diff to previous 1.225 (colored)

Add FQDN to contents of /etc/myname during install.

Also remove a few extraneous braces.

Requested by and OK'd by two different Todds.

Revision 1.225 / (download) - annotate - [select for diffs], Wed May 22 01:48:38 2002 UTC (22 years, 5 months ago) by krw
Branch: MAIN
Changes since 1.224: +3 -3 lines
Diff to previous 1.224 (colored)

Fix quoting botch in earlier commit. Make sure MDDISKDEVS and
MDCDDEVS actually work with non-empty values as well as the
supplied default this time.

Problem first detected by jsyn@.

Revision 1.224 / (download) - annotate - [select for diffs], Mon May 20 16:53:57 2002 UTC (22 years, 5 months ago) by krw
Branch: MAIN
Changes since 1.223: +20 -6 lines
Diff to previous 1.223 (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.223 / (download) - annotate - [select for diffs], Mon May 20 02:45:08 2002 UTC (22 years, 5 months ago) by krw
Branch: MAIN
Changes since 1.222: +5 -8 lines
Diff to previous 1.222 (colored)

Move verbiage about '!' and '!foo' at prompts to welcome_banner() from
separate here document. This moves it before first questions are
asked, which makes more sense.

Replace 'especially on a PC' with 'especially on a machine', since it
is displayed on all installs/upgrades regardless of architecture.

Revision 1.222 / (download) - annotate - [select for diffs], Sat May 18 17:56:03 2002 UTC (22 years, 5 months ago) by krw
Branch: MAIN
Changes since 1.221: +20 -9 lines
Diff to previous 1.221 (colored)

Eliminate md_get_diskdevs() and md_get_cddevs() by

1) Saving one boot's worth of dmesg in /tmp/dmesg.boot
2) Using sed to scan for devices and pull out names in
   new get_diskdevs() and get_cddevs() in install.sub
3) Saving any md disk/cd sed patterns in MDDISKDEVS and
   MDCDDEVS variables.

Revision 1.221 / (download) - annotate - [select for diffs], Tue May 14 01:49:25 2002 UTC (22 years, 5 months ago) by krw
Branch: MAIN
Changes since 1.220: +13 -22 lines
Diff to previous 1.220 (colored)

Eliminate md_native_fstype() and md_native_fsopts(). Both functions
simply echo'd a single word if present at all.

Replace with variables MDFSTYPE and MDFSOPTS if required. Rework logic
in install.sub's mount_a_disk() to always include 'ro' as an option to
the mount command. This allows even those arch's with MDFSTYPE to
usually get by without MDFSOPTS.

ok deraadt@

Revision 1.220 / (download) - annotate - [select for diffs], Thu May 9 21:54:46 2002 UTC (22 years, 5 months ago) by krw
Branch: MAIN
Changes since 1.219: +67 -8 lines
Diff to previous 1.219 (colored)

Elminate md_welcome_banner() and md_not_going_to_install() as the
output of both was essentially identical on all architectures. Replace
with welcome_banner() and not_going_to_install() in install.sub.

Abstract common verbiage from md_congrats() into congrats() which
calls md_congrats() for any architecture specific additional verbiage.

Reword things so ${MODE} can be plausibly used in more places.

Remove extraneous #!/bin/sh in hp300 install.md.

ok deraadt@ espie@

Revision 1.219 / (download) - annotate - [select for diffs], Wed May 8 23:01:46 2002 UTC (22 years, 5 months ago) by krw
Branch: MAIN
Changes since 1.218: +27 -17 lines
Diff to previous 1.218 (colored)

Abstract out common md_set_term() code into set_term() in install.sub,
calling md_set_term() from set_term() to do machine dependent stuff.
Currently only i386 does anything - keyboard mappings.

Add MDTERM variable to allow install.md to set proper default terminal
type. Default to vt220.

Eliminate md_get_partition_range() as useless since every architecture
returned '[a-p]'.

Make default term for all mvme* architectures vt100 as requested by miod@.

ok deraadt@ millert@ miod@

Revision 1.218 / (download) - annotate - [select for diffs], Sat May 4 22:21:21 2002 UTC (22 years, 5 months ago) by krw
Branch: MAIN
Changes since 1.217: +33 -42 lines
Diff to previous 1.217 (colored)

Clean up the logic in install_url():

a) Eliminate extraneous cat invocations that are piped to
   grep by simply calling grep with the file name.
b) Eliminate the only use of isnumeric() by using a ksh'ism
   left exposed in sh: '+([0-9])'. Eliminate isnumeric().
c) Test for a http/ftp list index of '0' and treat as an out
   of range error rather than an IP address.
d) Reorganize to make smaller and more clear.

Add documentation to sh(1) for ksh patterns that are available.

ok millert@, miod@

Revision 1.217 / (download) - annotate - [select for diffs], Tue Apr 30 23:26:27 2002 UTC (22 years, 6 months ago) by krw
Branch: MAIN
Changes since 1.216: +16 -25 lines
Diff to previous 1.216 (colored)

Clean up configure_all_interfaces() a bit.

Always make the default answer the first unconfigured interface, and
when there are no unconfigured interfaces make the default answer
'done'.

As a result _reprompt would always be set to 1, so eliminate it and
the if statement testing it.

Revision 1.216 / (download) - annotate - [select for diffs], Tue Apr 30 04:04:47 2002 UTC (22 years, 6 months ago) by deraadt
Branch: MAIN
Changes since 1.215: +1 -2 lines
Diff to previous 1.215 (colored)

this is not run by hand, no need for #!/bin/sh; krw ok

Revision 1.215 / (download) - annotate - [select for diffs], Mon Apr 29 01:49:49 2002 UTC (22 years, 6 months ago) by krw
Branch: MAIN
Changes since 1.214: +5 -4 lines
Diff to previous 1.214 (colored)

Expose a few more comments to stripping: must be on separate line, and
must *not* start with consecutive '#'s.

Revision 1.214 / (download) - annotate - [select for diffs], Mon Apr 29 01:38:06 2002 UTC (22 years, 6 months ago) by krw
Branch: MAIN
Changes since 1.213: +3 -17 lines
Diff to previous 1.213 (colored)

Eliminate basename(). Just use parameter expansion syntax to remove
everything up to and including the last '/'.  Also removes a now
unnecessary variable from install_tape().

Which brings up the question 'Does anyone use tape installs?'.

Revision 1.213 / (download) - annotate - [select for diffs], Mon Apr 29 00:59:35 2002 UTC (22 years, 6 months ago) by krw
Branch: MAIN
Changes since 1.212: +28 -39 lines
Diff to previous 1.212 (colored)

Rely on [] evaluating empty string as false, non-empty string as true
to eliminate a lot of -z and -n tests.

Thus,

'[ -z "$x" ] && cmd' -> '[ "$x" ] || cmd'
'if [ -z "$x" ]; then; y; fi' -> '[ "$x" ] || y'.
'[ -n "$x" ]' -> '[ "$x" ]'

Use variable default value syntax in a couple of places rather than if
statements. e.g. ': ${_ouranswer:=$_ifs}'.

Suggestions from millert@, aaron@, espie@, miod@ at various times.

Revision 1.212 / (download) - annotate - [select for diffs], Sun Apr 28 20:41:15 2002 UTC (22 years, 6 months ago) by krw
Branch: MAIN
Changes since 1.211: +30 -30 lines
Diff to previous 1.211 (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.211 / (download) - annotate - [select for diffs], Sun Apr 28 14:44:01 2002 UTC (22 years, 6 months ago) by krw
Branch: MAIN
Changes since 1.210: +63 -104 lines
Diff to previous 1.210 (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.210 / (download) - annotate - [select for diffs], Sat Apr 27 19:12:57 2002 UTC (22 years, 6 months ago) by krw
Branch: MAIN
Changes since 1.209: +2 -2 lines
Diff to previous 1.209 (colored)

Fix typo ('remel' -> 'rmel') in glob_selection.

Revision 1.209 / (download) - annotate - [select for diffs], Fri Apr 26 02:43:14 2002 UTC (22 years, 6 months ago) by krw
Branch: MAIN
Changes since 1.208: +20 -43 lines
Diff to previous 1.208 (colored)

Rework glob_selection() to eliminate 'Major hack' and a 'Eww' by
getting eval to work correctly. Some other logic cleanups in
glob_selection.

Eliminate 'dead' code trying to use dns to resolve
ftp.openbsd.org. Not only was the code dead, $_resolver_enabled
having been eliminated a while ago, but unnecessary as Theo has
promised the IP address will not change.

Spell 'occurrences' correctly.

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

Revision 1.208 / (download) - annotate - [select for diffs], Fri Apr 26 02:26:15 2002 UTC (22 years, 6 months ago) by krw
Branch: MAIN
Changes since 1.207: +23 -45 lines
Diff to previous 1.207 (colored)

Change 'while $1; shift' loops to 'for _b;' loops.

Move more 'if [] then; x; fi' to '[] && x' or
'[] || x' idioms.

Remove code supporting an optional IFS parameter in cutlast(),
as it was never used. Also redo logic a bit in cutlast() to
use eval to better effect.

Improve logic a bit in bsort.

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

Revision 1.207 / (download) - annotate - [select for diffs], Fri Apr 26 02:14:23 2002 UTC (22 years, 6 months ago) by krw
Branch: MAIN
Changes since 1.206: +10 -20 lines
Diff to previous 1.206 (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.206 / (download) - annotate - [select for diffs], Sat Apr 20 13:42:52 2002 UTC (22 years, 6 months ago) by krw
Branch: MAIN
Changes since 1.205: +30 -32 lines
Diff to previous 1.205 (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.205 / (download) - annotate - [select for diffs], Sat Apr 13 21:03:58 2002 UTC (22 years, 6 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_3_1_BASE, OPENBSD_3_1
Changes since 1.204: +3 -3 lines
Diff to previous 1.204 (colored)

allow todd to do very weird things at the timezone prompt; fix from krw

Revision 1.204 / (download) - annotate - [select for diffs], Sat Apr 13 21:03:31 2002 UTC (22 years, 6 months ago) by deraadt
Branch: MAIN
Changes since 1.203: +6 -3 lines
Diff to previous 1.203 (colored)

only fsck root once in upgrade; from krw

Revision 1.203 / (download) - annotate - [select for diffs], Sat Apr 13 00:46:46 2002 UTC (22 years, 6 months ago) by deraadt
Branch: MAIN
Changes since 1.202: +1 -2 lines
Diff to previous 1.202 (colored)

do not check filesystems; krw ok

Revision 1.202 / (download) - annotate - [select for diffs], Wed Apr 10 19:29:15 2002 UTC (22 years, 6 months ago) by deraadt
Branch: MAIN
Changes since 1.201: +17 -1 lines
Diff to previous 1.201 (colored)

If disk device nodes are missing, and MAKEDEV can be found on the media,
use it to make 'em.  Now you can install with as many disks as you want.
cleanup by espie, tests by jason

Revision 1.201 / (download) - annotate - [select for diffs], Tue Apr 9 01:59:41 2002 UTC (22 years, 6 months ago) by krw
Branch: MAIN
Changes since 1.200: +52 -63 lines
Diff to previous 1.200 (colored)

Move introductory blocks of comments to above their functions.

Eliminate some blank lines.

Only comments and blank lines affected, no code.

Suggested by deraadt@

Revision 1.200 / (download) - annotate - [select for diffs], Tue Apr 9 01:01:19 2002 UTC (22 years, 6 months ago) by krw
Branch: MAIN
Changes since 1.199: +790 -865 lines
Diff to previous 1.199 (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.199 / (download) - annotate - [select for diffs], Fri Apr 5 23:44:54 2002 UTC (22 years, 6 months ago) by krw
Branch: MAIN
Changes since 1.198: +8 -3 lines
Diff to previous 1.198 (colored)

Tune get_selection() so that

1) If there are no unselected sets then the default
   becomes 'done'.

2) A bare '-' or '+' is ignored, since it causes
   problems for the functions that call get_selection().

Revision 1.198 / (download) - annotate - [select for diffs], Fri Apr 5 02:51:59 2002 UTC (22 years, 6 months ago) by krw
Branch: MAIN
Changes since 1.197: +188 -97 lines
Diff to previous 1.197 (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.197 / (download) - annotate - [select for diffs], Tue Apr 2 01:25:34 2002 UTC (22 years, 7 months ago) by krw
Branch: MAIN
Changes since 1.196: +43 -51 lines
Diff to previous 1.196 (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.196 / (download) - annotate - [select for diffs], Sun Mar 31 15:30:42 2002 UTC (22 years, 7 months ago) by krw
Branch: MAIN
Changes since 1.195: +89 -89 lines
Diff to previous 1.195 (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.195 / (download) - annotate - [select for diffs], Sun Mar 31 03:05:04 2002 UTC (22 years, 7 months ago) by krw
Branch: MAIN
Changes since 1.194: +166 -173 lines
Diff to previous 1.194 (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.194 / (download) - annotate - [select for diffs], Sat Mar 30 13:34:51 2002 UTC (22 years, 7 months ago) by krw
Branch: MAIN
Changes since 1.193: +5 -3 lines
Diff to previous 1.193 (colored)

Keep all comments on separate lines so they are stripped
from scripts put on floppy images.

Revision 1.193 / (download) - annotate - [select for diffs], Sat Mar 30 01:29:18 2002 UTC (22 years, 7 months ago) by deraadt
Branch: MAIN
Changes since 1.192: +192 -270 lines
Diff to previous 1.192 (colored)

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

Revision 1.192 / (download) - annotate - [select for diffs], Sat Mar 30 00:56:10 2002 UTC (22 years, 7 months ago) by deraadt
Branch: MAIN
Changes since 1.191: +2 -2 lines
Diff to previous 1.191 (colored)

shrink 4 more bytes

Revision 1.191 / (download) - annotate - [select for diffs], Sat Mar 30 00:55:32 2002 UTC (22 years, 7 months ago) by deraadt
Branch: MAIN
Changes since 1.190: +2 -2 lines
Diff to previous 1.190 (colored)

remove extra spaces

Revision 1.190 / (download) - annotate - [select for diffs], Sat Mar 30 00:50:57 2002 UTC (22 years, 7 months ago) by krw
Branch: MAIN
Changes since 1.189: +9 -9 lines
Diff to previous 1.189 (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.189 / (download) - annotate - [select for diffs], Tue Mar 26 01:50:08 2002 UTC (22 years, 7 months ago) by krw
Branch: MAIN
Changes since 1.188: +4 -7 lines
Diff to previous 1.188 (colored)

Cleanup (and shrink) ftp_list_files() in install.sub by removing
some unneeded intermediate local variables and just using the
parameters.

Make upgrade fsck output for root partition consistant with later
fsck output for other partitions.

ok deraadt@

Revision 1.188 / (download) - annotate - [select for diffs], Fri Mar 22 23:29:28 2002 UTC (22 years, 7 months ago) by deraadt
Branch: MAIN
Changes since 1.187: +2 -2 lines
Diff to previous 1.187 (colored)

move to 3.1-beta

Revision 1.187 / (download) - annotate - [select for diffs], Fri Mar 22 01:41:54 2002 UTC (22 years, 7 months ago) by krw
Branch: MAIN
Changes since 1.186: +6 -25 lines
Diff to previous 1.186 (colored)

Clean up getresp() by

1) Deleting code for '-s' option, which was never used.

2) Deleting code for >1 parameters after optional '-n'.
   Also never used.

@ok millert

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

Update Copyright(c)'s to 2002

Revision 1.185 / (download) - annotate - [select for diffs], Mon Mar 4 13:54:28 2002 UTC (22 years, 8 months ago) by krw
Branch: MAIN
Changes since 1.184: +130 -147 lines
Diff to previous 1.184 (colored)

Change the default install sets to include everything but the X sets.
This should cut down on the inquires on @misc/@tech about missing
compilers, etc. In the days of 180GB disks we should not run out of
space too often.

Clean up some logic, removing references to -reuse and -minpat
arguments in install_url(), as install_url() is only called with -http
or -ftp.

Simplify selector setup by noting that $_sets is carefully initialized
to hold only file names ending in .tgz or .tar.gz.

@ok millert

Revision 1.184 / (download) - annotate - [select for diffs], Sun Mar 3 00:43:37 2002 UTC (22 years, 8 months ago) by krw
Branch: MAIN
Changes since 1.183: +95 -123 lines
Diff to previous 1.183 (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.183 / (download) - annotate - [select for diffs], Thu Jan 24 23:01:18 2002 UTC (22 years, 9 months ago) by millert
Branch: MAIN
Changes since 1.182: +2 -2 lines
Diff to previous 1.182 (colored)

Fix `necesary' typos; Alexander Yurchenko

Alas many of these were introduced by yours truly as necessary
just doesn't look right to me for some reason ;-)

Revision 1.182 / (download) - annotate - [select for diffs], Sun Dec 23 16:54:04 2001 UTC (22 years, 10 months ago) by krw
Branch: MAIN
Changes since 1.181: +18 -19 lines
Diff to previous 1.181 (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.181 / (download) - annotate - [select for diffs], Sat Dec 22 18:53:45 2001 UTC (22 years, 10 months ago) by krw
Branch: MAIN
Changes since 1.180: +23 -31 lines
Diff to previous 1.180 (colored)

Enable users to fix filesystem problems encountered by fsck in
check_fs() and unmount_fs() by restricting i/o redirection to the
reading of fstab.

Fix a typo ('succes' -> 'success').

Indent lines inside check_fs() and unmount_fs() functions.

Eliminate an unused variable _mps in check_fs().

ok millert@

Revision 1.180 / (download) - annotate - [select for diffs], Mon Dec 17 00:41:50 2001 UTC (22 years, 10 months ago) by krw
Branch: MAIN
Changes since 1.179: +1 -21 lines
Diff to previous 1.179 (colored)

Use actual files for short versions of /etc/protocols and
/etc/services used during installations.

This way it is not necessary to run the install script before
using commands requiring these files.

Requested by deraadt@.

Revision 1.179 / (download) - annotate - [select for diffs], Thu Dec 13 01:40:15 2001 UTC (22 years, 10 months ago) by krw
Branch: MAIN
Changes since 1.178: +22 -2 lines
Diff to previous 1.178 (colored)

Remove /etc/protocols and /etc/services from install media
that use the miniroot install scripts.

During an install, donetconfig() in miniroot/install.sub now
creates a minimal /etc/protocols and /etc/services.

During an upgrade, enable_network() now copies the existing
protocols and services files into /etc.

Saves approximately 13K on floppy/cd images.

Revision 1.178 / (download) - annotate - [select for diffs], Sun Nov 25 21:43:08 2001 UTC (22 years, 11 months ago) by krw
Branch: MAIN
Changes since 1.177: +113 -108 lines
Diff to previous 1.177 (colored)

Squeeze all obvious <blank>+<tab> and <tab><blank>+ combinations
out. Save about 287 bytes. Based on diff from deraadt@.

Update Copyright (ok deraadt@).

Revision 1.177 / (download) - annotate - [select for diffs], Sat Nov 24 14:27:42 2001 UTC (22 years, 11 months ago) by krw
Branch: MAIN
Changes since 1.176: +11 -2 lines
Diff to previous 1.176 (colored)

Fix bsort() so that trailing spaces are not emitted.

When a system is rebooted rather than power cycled it is possible
for duplicate entries for a disk or cd to appear in the dmesg
output. One from the previous boot and one from the current
reboot.

bsort() correctly filtered out the duplicates, but could emit a
trailing space.

This trailing space caused problems when, for instance, the root
disk was being determined. With the trailing space present, the
install or upgrade script would not fill in the default root disk,
even if the system only had one disk.

Revision 1.176 / (download) - annotate - [select for diffs], Thu Nov 22 00:56:13 2001 UTC (22 years, 11 months ago) by krw
Branch: MAIN
Changes since 1.175: +24 -17 lines
Diff to previous 1.175 (colored)

Fix getresp() so that imbedded or trailing blanks in the
default response ($1) are preserved in $resp.

Fix handling of _ftp_server_login, _ftp_server_password and
_url_base so any blanks present are preserved.

Problem with blanks pointed out by drahn@.

Revision 1.175 / (download) - annotate - [select for diffs], Tue Nov 20 01:02:49 2001 UTC (22 years, 11 months ago) by krw
Branch: MAIN
Changes since 1.174: +16 -3 lines
Diff to previous 1.174 (colored)

Encode usercode/password in ftp url's as required by RFC 1738,
section 3.1. Allows for use of '@', ':' and '/' in usercodes
and passwords without confusion.

ok deraadt@

Revision 1.174 / (download) - annotate - [select for diffs], Mon Nov 19 01:09:43 2001 UTC (22 years, 11 months ago) by deraadt
Branch: MAIN
Changes since 1.173: +7 -7 lines
Diff to previous 1.173 (colored)

remove 6 spaces or tabs at end of line, making this file 6 bytes smaller.  eat your heart out krw

Revision 1.173 / (download) - annotate - [select for diffs], Sun Nov 18 22:48:58 2001 UTC (22 years, 11 months ago) by krw
Branch: MAIN
Changes since 1.172: +52 -40 lines
Diff to previous 1.172 (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.172 / (download) - annotate - [select for diffs], Sat Nov 17 20:23:23 2001 UTC (22 years, 11 months ago) by krw
Branch: MAIN
Changes since 1.171: +57 -35 lines
Diff to previous 1.171 (colored)

Improve/enhance network handling during installations.

a) Allow user to enter empty FQDN and assume DHCP will supply one.
b) Silently check for any DHCP supplied FQDN after network
   interfaces are initialized. *NOTE* DHCP information will
   now override any user supplied FQDN.
c) Apply FQDN information to hosts file only after DHCP has had a
   chance to supply information.
d) Don't modify hosts file if FQDN is empty.
e) Don't preserve hosts file across install script restarts.
f) Don't preserve hostname.* files across install script restarts.
g) Don't preserve decision to use resolver during install across
   install script restarts.
h) Don't allow DHCP to force use of resolver during install.
i) Ensure DHCP created resolv.conf file is saved as /etc/resolv.conf.
j) Add IPv6 localhost ('::1') line to hosts file. (Closes PR#2155)
k) Make IPv4 and IPv6 localhost lines in hosts file look like
   'X localhost.domain.name localhost'

Bonus: install.sub on the floppy image is 51 bytes smaller.

ok millert@

Revision 1.171 / (download) - annotate - [select for diffs], Wed Oct 31 01:33:24 2001 UTC (23 years ago) by krw
Branch: MAIN
Changes since 1.170: +4 -4 lines
Diff to previous 1.170 (colored)

Fix creation of /etc/hosts file in install.

Obtaining the FQDN *after* calling configurenetwork(), so that
DHCP info can be used, turns out to not be a good idea because
/etc/hosts is created in configurenetwork().

As a result the /etc/hosts created by the 3.0 install script
contains bogus entries with a '.' instead of '.<domain name>'.

So, put configurenetwork() back where it was pre-3.0, i.e. after
FQDN is determined.

Noticed by David Krause (PR#2155).

Other /etc/hosts issues (including David's ipv6 suggestion) under
investigation.

Revision 1.170 / (download) - annotate - [select for diffs], Mon Oct 15 22:58:59 2001 UTC (23 years ago) by krw
Branch: MAIN
CVS Tags: OPENBSD_3_0_BASE, OPENBSD_3_0
Changes since 1.169: +168 -69 lines
Diff to previous 1.169 (colored)

Resync the upgrade script's enable_network() function with the
current /etc/netstart, leaving out all code relevant to IPv6 and
multicasting.

In addition, ignore any '!' lines in hostname.if files and ignore
any bridge.if files.

This change enables dhcp configured interfaces to work during the
upgrade process, amoung other improvements.

Also rework FQDN handling to ensure that it is set *after* any
dhcp activity and is set both during installs and upgrades. FQDN
is now set from the last DOMAIN or SEARCH statement in
resolv.conf.

Architecture specific install.sub's (macppc, mvme68k, mvme88k,
mvmeppc, sparc64) are not being updated for 3.0.

ok deraadt@

Revision 1.169 / (download) - annotate - [select for diffs], Wed Sep 19 00:04:02 2001 UTC (23 years, 1 month ago) by krw
Branch: MAIN
Changes since 1.168: +2 -2 lines
Diff to previous 1.168 (colored)

Fix typo: succesfully -> successfully

Revision 1.168 / (download) - annotate - [select for diffs], Tue Sep 11 13:11:18 2001 UTC (23 years, 1 month ago) by deraadt
Branch: MAIN
Changes since 1.167: +2 -2 lines
Diff to previous 1.167 (colored)

move to 3.0-beta

Revision 1.167 / (download) - annotate - [select for diffs], Tue Aug 7 15:00:09 2001 UTC (23 years, 2 months ago) by markus
Branch: MAIN
Changes since 1.166: +2 -2 lines
Diff to previous 1.166 (colored)

suggest CET, not MET, ok deraadt@

Revision 1.166 / (download) - annotate - [select for diffs], Fri Apr 20 01:55:51 2001 UTC (23 years, 6 months ago) by krw
Branch: MAIN
CVS Tags: OPENBSD_2_9_BASE, OPENBSD_2_9
Changes since 1.165: +19 -19 lines
Diff to previous 1.165 (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.165 / (download) - annotate - [select for diffs], Mon Apr 16 19:43:28 2001 UTC (23 years, 6 months ago) by krw
Branch: MAIN
Changes since 1.164: +2 -2 lines
Diff to previous 1.164 (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.164 / (download) - annotate - [select for diffs], Sun Apr 15 02:35:08 2001 UTC (23 years, 6 months ago) by deraadt
Branch: MAIN
Changes since 1.163: +2 -2 lines
Diff to previous 1.163 (colored)

move to 2.9-beta

Revision 1.163 / (download) - annotate - [select for diffs], Fri Feb 23 17:53:10 2001 UTC (23 years, 8 months ago) by marc
Branch: MAIN
Changes since 1.162: +1 -2 lines
Diff to previous 1.162 (colored)


back out prev change.   I should read ALL of my mail before acting

Revision 1.162 / (download) - annotate - [select for diffs], Fri Feb 23 17:51:09 2001 UTC (23 years, 8 months ago) by marc
Branch: MAIN
Changes since 1.161: +2 -1 lines
Diff to previous 1.161 (colored)

create dhclient.leases when needed; ok deraadt@

Revision 1.161 / (download) - annotate - [select for diffs], Mon Feb 12 09:54:09 2001 UTC (23 years, 8 months ago) by deraadt
Branch: MAIN
Changes since 1.160: +2 -2 lines
Diff to previous 1.160 (colored)

fix http handling; reported as busted by don@research-cistw.saic.com

Revision 1.160 / (download) - annotate - [select for diffs], Sun Dec 10 02:40:39 2000 UTC (23 years, 10 months ago) by deraadt
Branch: MAIN
Changes since 1.159: +6 -1 lines
Diff to previous 1.159 (colored)

ignore filesystems marked "xx"; os@atina.ar

Revision 1.159 / (download) - annotate - [select for diffs], Mon Nov 20 13:11:16 2000 UTC (23 years, 11 months ago) by deraadt
Branch: MAIN
Changes since 1.158: +2 -2 lines
Diff to previous 1.158 (colored)

correct url handling; canacar@eee.metu.edu.tr

Revision 1.158 / (download) - annotate - [select for diffs], Mon Oct 9 22:47:22 2000 UTC (24 years ago) by naddy
Branch: MAIN
CVS Tags: OPENBSD_2_8_BASE, OPENBSD_2_8
Changes since 1.157: +2 -2 lines
Diff to previous 1.157 (colored)

Replace gratuitous eval by results of the evaluation, in particular
don't eval ${_ftp_server_password}.  This should allow FTP passwords
that contain shell meta characters.

ok millert@

Revision 1.157 / (download) - annotate - [select for diffs], Wed Sep 13 05:11:35 2000 UTC (24 years, 1 month ago) by rahnds
Branch: MAIN
Changes since 1.156: +2 -2 lines
Diff to previous 1.156 (colored)

Fix problem with bsort and multiple input data, original fix by
me, bytes saved by millert, OKed by mickey, millert.

Revision 1.156 / (download) - annotate - [select for diffs], Mon Aug 21 21:13:40 2000 UTC (24 years, 2 months ago) by deraadt
Branch: MAIN
Changes since 1.155: +2 -2 lines
Diff to previous 1.155 (colored)

2.8-beta (so that X11 can distinguish login.conf)

Revision 1.155 / (download) - annotate - [select for diffs], Fri Jun 23 18:53:24 2000 UTC (24 years, 4 months ago) by mickey
Branch: MAIN
Changes since 1.154: +28 -1 lines
Diff to previous 1.154 (colored)

implement bubble sort in ksh instead of using sort(1).
i think i'll fix sparc next week to use it.

Revision 1.154 / (download) - annotate - [select for diffs], Fri Jun 16 03:19:42 2000 UTC (24 years, 4 months ago) by deraadt
Branch: MAIN
Changes since 1.153: +3 -15 lines
Diff to previous 1.153 (colored)

ssl package no longer needed (will be tested)

Revision 1.153 / (download) - annotate - [select for diffs], Mon May 8 21:28:03 2000 UTC (24 years, 5 months ago) by millert
Branch: MAIN
CVS Tags: OPENBSD_2_7_BASE, OPENBSD_2_7
Changes since 1.152: +73 -42 lines
Diff to previous 1.152 (colored)

If there are no CD devices, abort early.
For ISO9660 CDs we can take advantage of the label spoofing and not
ask the user for partition/fstype.  Also shorten a few variable names.
This makes CD installs go more smoothly.

Revision 1.152 / (download) - annotate - [select for diffs], Sun May 7 17:08:26 2000 UTC (24 years, 5 months ago) by millert
Branch: MAIN
Changes since 1.151: +25 -15 lines
Diff to previous 1.151 (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.151 / (download) - annotate - [select for diffs], Thu Apr 27 16:11:05 2000 UTC (24 years, 6 months ago) by deraadt
Branch: MAIN
Changes since 1.150: +9 -9 lines
Diff to previous 1.150 (colored)

ssl is now a tgz

Revision 1.150 / (download) - annotate - [select for diffs], Sat Apr 8 05:06:25 2000 UTC (24 years, 6 months ago) by deraadt
Branch: MAIN
Changes since 1.149: +2 -2 lines
Diff to previous 1.149 (colored)

2.7-beta

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

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

Revision 1.148 / (download) - annotate - [select for diffs], Fri Feb 25 01:39:13 2000 UTC (24 years, 8 months ago) by krw
Branch: MAIN
Changes since 1.147: +6 -6 lines
Diff to previous 1.147 (colored)

'ie.' -> 'e.g.' or 'i.e.' as appropriate

Revision 1.147 / (download) - annotate - [select for diffs], Thu Nov 11 02:36:02 1999 UTC (24 years, 11 months ago) by millert
Branch: MAIN
Changes since 1.146: +13 -2 lines
Diff to previous 1.146 (colored)

Only allow dhcp as an option if /sbin/dhclient exists; deraadt@

Revision 1.146 / (download) - annotate - [select for diffs], Tue Oct 26 22:56:54 1999 UTC (25 years ago) by deraadt
Branch: MAIN
Changes since 1.145: +4 -3 lines
Diff to previous 1.145 (colored)

siteXX.tar.gz set also choosable, starting next release; mho@stacken.kth.se

Revision 1.145 / (download) - annotate - [select for diffs], Mon Oct 18 05:25:26 1999 UTC (25 years ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_2_6_BASE, OPENBSD_2_6
Changes since 1.144: +2 -2 lines
Diff to previous 1.144 (colored)

default to man set included, from cd/disk too

Revision 1.144 / (download) - annotate - [select for diffs], Sun Oct 17 16:57:26 1999 UTC (25 years ago) by deraadt
Branch: MAIN
Changes since 1.143: +2 -2 lines
Diff to previous 1.143 (colored)

another stupid typo

Revision 1.143 / (download) - annotate - [select for diffs], Sun Oct 17 16:45:14 1999 UTC (25 years ago) by deraadt
Branch: MAIN
Changes since 1.142: +3 -3 lines
Diff to previous 1.142 (colored)

fix errors

Revision 1.142 / (download) - annotate - [select for diffs], Sun Oct 17 15:35:51 1999 UTC (25 years ago) by deraadt
Branch: MAIN
Changes since 1.141: +2 -2 lines
Diff to previous 1.141 (colored)

pretty reuse prompt; requested by kwesterback@home.com

Revision 1.141 / (download) - annotate - [select for diffs], Sun Oct 17 06:53:40 1999 UTC (25 years ago) by deraadt
Branch: MAIN
Changes since 1.140: +9 -5 lines
Diff to previous 1.140 (colored)

damnit: complete disgusting dual-matching for ssl libraries which really shows
how little sh i know (and how incapable i am of reading the sh manpage after 7
guiness).  thanks to various people for going through the grief of discovering
this problem first hand, after a few people in michigan had not gotten around
to testing their work (tsk tsk tsk!)

Revision 1.140 / (download) - annotate - [select for diffs], Sat Oct 16 19:01:22 1999 UTC (25 years ago) by deraadt
Branch: MAIN
Changes since 1.139: +145 -1 lines
Diff to previous 1.139 (colored)

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

Revision 1.139 / (download) - annotate - [select for diffs], Sat Oct 16 17:37:36 1999 UTC (25 years ago) by deraadt
Branch: MAIN
Changes since 1.138: +4 -4 lines
Diff to previous 1.138 (colored)

pretty; fries

Revision 1.138 / (download) - annotate - [select for diffs], Fri Oct 15 16:55:00 1999 UTC (25 years ago) by millert
Branch: MAIN
Changes since 1.137: +14 -12 lines
Diff to previous 1.137 (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.137 / (download) - annotate - [select for diffs], Thu Oct 14 17:29:04 1999 UTC (25 years ago) by deraadt
Branch: MAIN
Changes since 1.136: +17 -18 lines
Diff to previous 1.136 (colored)

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

Revision 1.136 / (download) - annotate - [select for diffs], Thu Oct 14 17:17:46 1999 UTC (25 years ago) by millert
Branch: MAIN
Changes since 1.135: +146 -122 lines
Diff to previous 1.135 (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.135 / (download) - annotate - [select for diffs], Thu Oct 7 21:35:47 1999 UTC (25 years ago) by deraadt
Branch: MAIN
Changes since 1.134: +3 -3 lines
Diff to previous 1.134 (colored)

use pkg_add -I for ssl package

Revision 1.134 / (download) - annotate - [select for diffs], Sat Oct 2 18:53:24 1999 UTC (25 years, 1 month ago) by deraadt
Branch: MAIN
Changes since 1.133: +2 -2 lines
Diff to previous 1.133 (colored)

fix local disk package install

Revision 1.133 / (download) - annotate - [select for diffs], Sat Oct 2 13:32:43 1999 UTC (25 years, 1 month ago) by aaron
Branch: MAIN
Changes since 1.132: +2 -2 lines
Diff to previous 1.132 (colored)

Fix a typo; ian@darwinsys.com

Revision 1.132 / (download) - annotate - [select for diffs], Thu Sep 23 21:33:43 1999 UTC (25 years, 1 month ago) by aaron
Branch: MAIN
Changes since 1.131: +7 -7 lines
Diff to previous 1.131 (colored)

Formatting, typo, and grammar fixes.

Revision 1.131 / (download) - annotate - [select for diffs], Thu Sep 23 19:02:20 1999 UTC (25 years, 1 month ago) by deraadt
Branch: MAIN
Changes since 1.130: +13 -5 lines
Diff to previous 1.130 (colored)

first cut at ssl chroot package install

Revision 1.130 / (download) - annotate - [select for diffs], Thu Sep 23 18:59:02 1999 UTC (25 years, 1 month ago) by deraadt
Branch: MAIN
Changes since 1.129: +2 -2 lines
Diff to previous 1.129 (colored)

put man package in the default; get used to it people

Revision 1.129 / (download) - annotate - [select for diffs], Thu Sep 23 18:58:19 1999 UTC (25 years, 1 month ago) by deraadt
Branch: MAIN
Changes since 1.128: +1 -11 lines
Diff to previous 1.128 (colored)

ask for ftp password once

Revision 1.128 / (download) - annotate - [select for diffs], Thu Sep 23 18:57:39 1999 UTC (25 years, 1 month ago) by deraadt
Branch: MAIN
Changes since 1.127: +2 -2 lines
Diff to previous 1.127 (colored)

crank to 26

Revision 1.127 / (download) - annotate - [select for diffs], Sun Aug 15 09:53:36 1999 UTC (25 years, 2 months ago) by millert
Branch: MAIN
Changes since 1.126: +136 -117 lines
Diff to previous 1.126 (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.126 / (download) - annotate - [select for diffs], Tue Aug 10 23:07:24 1999 UTC (25 years, 2 months ago) by deraadt
Branch: MAIN
Changes since 1.125: +2 -2 lines
Diff to previous 1.125 (colored)

typo

Revision 1.125 / (download) - annotate - [select for diffs], Fri Jul 30 00:31:27 1999 UTC (25 years, 3 months ago) by deraadt
Branch: MAIN
Changes since 1.124: +19 -3 lines
Diff to previous 1.124 (colored)

leave async mode before installboot is run...

Revision 1.124 / (download) - annotate - [select for diffs], Sat Jul 24 22:46:32 1999 UTC (25 years, 3 months ago) by deraadt
Branch: MAIN
Changes since 1.123: +3 -3 lines
Diff to previous 1.123 (colored)

do install using -o async mounts, faster

Revision 1.123 / (download) - annotate - [select for diffs], Sun May 30 08:34:51 1999 UTC (25 years, 5 months ago) by deraadt
Branch: MAIN
Changes since 1.122: +2 -2 lines
Diff to previous 1.122 (colored)

improve ftp/http proxy prompt

Revision 1.122 / (download) - annotate - [select for diffs], Sat Apr 10 04:39:50 1999 UTC (25 years, 6 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_2_5_BASE, OPENBSD_2_5
Changes since 1.121: +2 -2 lines
Diff to previous 1.121 (colored)

spelling

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

save bytes; move swapon question

Revision 1.120 / (download) - annotate - [select for diffs], Mon Apr 5 00:26:49 1999 UTC (25 years, 7 months ago) by millert
Branch: MAIN
Changes since 1.119: +19 -13 lines
Diff to previous 1.119 (colored)

Fix persistence of potential servers answer
Don't make NFS an option if no /sbin/mount_nfs
Fix syntax error when user hits return at ftp/http IP/name prompt

Revision 1.119 / (download) - annotate - [select for diffs], Fri Apr 2 17:50:01 1999 UTC (25 years, 7 months ago) by millert
Branch: MAIN
Changes since 1.118: +54 -54 lines
Diff to previous 1.118 (colored)

Remember the value for "Do you want a list of potential servers"
Update ftp.openbsd.org IP addr
shave a few bytes

Revision 1.118 / (download) - annotate - [select for diffs], Fri Apr 2 05:51:16 1999 UTC (25 years, 7 months ago) by millert
Branch: MAIN
Changes since 1.117: +2 -2 lines
Diff to previous 1.117 (colored)

Change a = to -eq in test statement.  Otherwise we get an error if someone just hits return at the Server IP prompt during an ftp install

Revision 1.117 / (download) - annotate - [select for diffs], Thu Apr 1 21:25:48 1999 UTC (25 years, 7 months ago) by deraadt
Branch: MAIN
Changes since 1.116: +81 -177 lines
Diff to previous 1.116 (colored)

shrink by merging local variable decl

Revision 1.116 / (download) - annotate - [select for diffs], Thu Apr 1 17:41:26 1999 UTC (25 years, 7 months ago) by millert
Branch: MAIN
Changes since 1.115: +2 -2 lines
Diff to previous 1.115 (colored)

ignore bridge[0-9] when prompting for interfaces to bring up

Revision 1.115 / (download) - annotate - [select for diffs], Tue Mar 23 07:58:08 1999 UTC (25 years, 7 months ago) by deraadt
Branch: MAIN
Changes since 1.114: +3 -3 lines
Diff to previous 1.114 (colored)

put fqdn first; matter@research.suspicious.org

Revision 1.114 / (download) - annotate - [select for diffs], Tue Mar 23 02:30:31 1999 UTC (25 years, 7 months ago) by millert
Branch: MAIN
Changes since 1.113: +2 -2 lines
Diff to previous 1.113 (colored)

(h)ttp, not h(ttp),; brad@openbsd.org

Revision 1.113 / (download) - annotate - [select for diffs], Sat Dec 19 18:31:57 1998 UTC (25 years, 10 months ago) by deraadt
Branch: MAIN
Changes since 1.112: +4 -4 lines
Diff to previous 1.112 (colored)

merge text into base

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

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

Revision 1.111 / (download) - annotate - [select for diffs], Tue Nov 3 04:35:16 1998 UTC (26 years ago) by aaron
Branch: MAIN
Changes since 1.110: +6 -6 lines
Diff to previous 1.110 (colored)

it's -> its where appropriate

Revision 1.110 / (download) - annotate - [select for diffs], Wed Oct 28 18:55:20 1998 UTC (26 years ago) by millert
Branch: MAIN
Changes since 1.109: +2 -2 lines
Diff to previous 1.109 (colored)

isnumeric did not check the last char in a string

Revision 1.109 / (download) - annotate - [select for diffs], Wed Oct 28 17:51:14 1998 UTC (26 years ago) by millert
Branch: MAIN
Changes since 1.108: +21 -1 lines
Diff to previous 1.108 (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.108 / (download) - annotate - [select for diffs], Mon Oct 19 19:22:18 1998 UTC (26 years ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_2_4_BASE, OPENBSD_2_4
Changes since 1.107: +3 -3 lines
Diff to previous 1.107 (colored)

oops

Revision 1.107 / (download) - annotate - [select for diffs], Mon Oct 19 09:36:58 1998 UTC (26 years ago) by todd
Branch: MAIN
Changes since 1.106: +3 -3 lines
Diff to previous 1.106 (colored)

add xshare
it is shared across all X platforms and came from xbase so it IS required.

Revision 1.106 / (download) - annotate - [select for diffs], Mon Oct 19 05:28:07 1998 UTC (26 years ago) by deraadt
Branch: MAIN
Changes since 1.105: +3 -3 lines
Diff to previous 1.105 (colored)

load xshare

Revision 1.105 / (download) - annotate - [select for diffs], Sun Oct 18 20:31:46 1998 UTC (26 years ago) by millert
Branch: MAIN
Changes since 1.104: +5 -1 lines
Diff to previous 1.104 (colored)

Check for selection == empty string in glob_selection so we don't get syntax errors when we use that as part of a case statement

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

prettier prompts

Revision 1.103 / (download) - annotate - [select for diffs], Sat Oct 10 20:54:24 1998 UTC (26 years ago) by deraadt
Branch: MAIN
Changes since 1.102: +2 -2 lines
Diff to previous 1.102 (colored)

move blank line in extraction process

Revision 1.102 / (download) - annotate - [select for diffs], Sat Oct 10 08:42:29 1998 UTC (26 years ago) by deraadt
Branch: MAIN
Changes since 1.101: +2 -2 lines
Diff to previous 1.101 (colored)

non-verbose tar extract for cd install too

Revision 1.101 / (download) - annotate - [select for diffs], Wed Sep 30 08:02:26 1998 UTC (26 years, 1 month ago) by deraadt
Branch: MAIN
Changes since 1.100: +52 -5 lines
Diff to previous 1.100 (colored)

significant enhancements to the ftp/http fetching areas

Revision 1.100 / (download) - annotate - [select for diffs], Mon Sep 28 13:38:39 1998 UTC (26 years, 1 month ago) by deraadt
Branch: MAIN
Changes since 1.99: +3 -3 lines
Diff to previous 1.99 (colored)

use ftp file:/ URL support for filebased (cdrom, nfs, etc) installs

Revision 1.99 / (download) - annotate - [select for diffs], Mon Sep 28 13:28:36 1998 UTC (26 years, 1 month ago) by deraadt
Branch: MAIN
Changes since 1.98: +8 -6 lines
Diff to previous 1.98 (colored)

toast the obviously untested nfs changes

Revision 1.98 / (download) - annotate - [select for diffs], Mon Sep 28 12:34:06 1998 UTC (26 years, 1 month ago) by deraadt
Branch: MAIN
Changes since 1.97: +6 -8 lines
Diff to previous 1.97 (colored)

nfs root patches; todd@

Revision 1.97 / (download) - annotate - [select for diffs], Thu Sep 24 21:55:08 1998 UTC (26 years, 1 month ago) by deraadt
Branch: MAIN
Changes since 1.96: +37 -4 lines
Diff to previous 1.96 (colored)

totally gruesome dhcp hacks.. for bad bad dhcp servers... like shaw

Revision 1.96 / (download) - annotate - [select for diffs], Thu Sep 24 06:39:07 1998 UTC (26 years, 1 month ago) by millert
Branch: MAIN
Changes since 1.95: +8 -6 lines
Diff to previous 1.95 (colored)

Make cutword operate on all lines of a file, not just the first,
so we can use it like cut(1).  Also fix a typo.

Revision 1.95 / (download) - annotate - [select for diffs], Thu Sep 24 06:13:09 1998 UTC (26 years, 1 month ago) by millert
Branch: MAIN
Changes since 1.94: +2 -2 lines
Diff to previous 1.94 (colored)

use cutword instead of sed

Revision 1.94 / (download) - annotate - [select for diffs], Wed Sep 23 07:22:34 1998 UTC (26 years, 1 month ago) by deraadt
Branch: MAIN
Changes since 1.93: +3 -3 lines
Diff to previous 1.93 (colored)

better example

Revision 1.93 / (download) - annotate - [select for diffs], Sun Sep 20 08:50:16 1998 UTC (26 years, 1 month ago) by deraadt
Branch: MAIN
Changes since 1.92: +2 -2 lines
Diff to previous 1.92 (colored)

use dhclient -1: permits retrying of dhcp configurations

Revision 1.92 / (download) - annotate - [select for diffs], Sat Sep 19 23:02:49 1998 UTC (26 years, 1 month ago) by deraadt
Branch: MAIN
Changes since 1.91: +5 -4 lines
Diff to previous 1.91 (colored)

use new ftp -m mode for status bar

Revision 1.91 / (download) - annotate - [select for diffs], Sat Sep 19 23:02:16 1998 UTC (26 years, 1 month ago) by deraadt
Branch: MAIN
Changes since 1.90: +5 -5 lines
Diff to previous 1.90 (colored)

media directives; not link-layer arguments

Revision 1.90 / (download) - annotate - [select for diffs], Sat Sep 19 07:05:11 1998 UTC (26 years, 1 month ago) by deraadt
Branch: MAIN
Changes since 1.89: +2 -1 lines
Diff to previous 1.89 (colored)

apply media directives before running dhclient

Revision 1.89 / (download) - annotate - [select for diffs], Sat Sep 19 07:03:24 1998 UTC (26 years, 1 month ago) by deraadt
Branch: MAIN
Changes since 1.88: +3 -3 lines
Diff to previous 1.88 (colored)

fix a mistake; jbi130@mail.usask.ca

Revision 1.88 / (download) - annotate - [select for diffs], Fri Sep 18 18:40:51 1998 UTC (26 years, 1 month ago) by deraadt
Branch: MAIN
Changes since 1.87: +3 -3 lines
Diff to previous 1.87 (colored)

support media directives on dhcp interfaces

Revision 1.87 / (download) - annotate - [select for diffs], Thu Sep 17 23:24:32 1998 UTC (26 years, 1 month ago) by deraadt
Branch: MAIN
Changes since 1.86: +21 -3 lines
Diff to previous 1.86 (colored)

detect dhclient failing and re-query.  (there may be a dhclient process lying
around, and i cannot figure out how to kill it yet)

Revision 1.86 / (download) - annotate - [select for diffs], Thu Sep 17 01:25:16 1998 UTC (26 years, 1 month ago) by deraadt
Branch: MAIN
Changes since 1.85: +4 -4 lines
Diff to previous 1.85 (colored)

do not permit duplicate hostnames in /etc/hosts
encode /etc/hostname.* files with an IP address, not a hostname

Revision 1.85 / (download) - annotate - [select for diffs], Thu Sep 17 00:50:01 1998 UTC (26 years, 1 month ago) by deraadt
Branch: MAIN
Changes since 1.84: +2 -2 lines
Diff to previous 1.84 (colored)

pretty up device unmounting

Revision 1.84 / (download) - annotate - [select for diffs], Thu Sep 17 00:44:35 1998 UTC (26 years, 1 month ago) by deraadt
Branch: MAIN
Changes since 1.83: +23 -29 lines
Diff to previous 1.83 (colored)

permit re-configuring of ip addresses..

Revision 1.83 / (download) - annotate - [select for diffs], Tue Sep 15 21:48:27 1998 UTC (26 years, 1 month ago) by deraadt
Branch: MAIN
Changes since 1.82: +42 -23 lines
Diff to previous 1.82 (colored)

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

Revision 1.82 / (download) - annotate - [select for diffs], Mon Sep 14 15:16:01 1998 UTC (26 years, 1 month ago) by millert
Branch: MAIN
Changes since 1.81: +2 -2 lines
Diff to previous 1.81 (colored)

use sed, not cut since not all platforms have cut on the floppy

Revision 1.81 / (download) - annotate - [select for diffs], Sat Sep 12 08:33:57 1998 UTC (26 years, 1 month ago) by deraadt
Branch: MAIN
Changes since 1.80: +27 -18 lines
Diff to previous 1.80 (colored)

handle ifconfig media support; remove link0-2 support

Revision 1.80 / (download) - annotate - [select for diffs], Fri Sep 11 22:45:52 1998 UTC (26 years, 1 month ago) by millert
Branch: MAIN
Changes since 1.79: +7 -2 lines
Diff to previous 1.79 (colored)

mi get_ifdevs()

Revision 1.79 / (download) - annotate - [select for diffs], Thu Jul 9 00:02:34 1998 UTC (26 years, 3 months ago) by millert
Branch: MAIN
Changes since 1.78: +4 -9 lines
Diff to previous 1.78 (colored)

treat 'all' just like '*'

Revision 1.78 / (download) - annotate - [select for diffs], Thu Jun 25 16:35:26 1998 UTC (26 years, 4 months ago) by millert
Branch: MAIN
Changes since 1.77: +3 -3 lines
Diff to previous 1.77 (colored)

use POSIX sh builtin arithmetic, not expr

Revision 1.77 / (download) - annotate - [select for diffs], Fri Jun 5 01:24:15 1998 UTC (26 years, 5 months ago) by deraadt
Branch: MAIN
Changes since 1.76: +6 -6 lines
Diff to previous 1.76 (colored)

continent; map@stacken.kth.se

Revision 1.76 / (download) - annotate - [select for diffs], Tue Apr 28 16:25:03 1998 UTC (26 years, 6 months ago) by millert
Branch: MAIN
Changes since 1.75: +60 -175 lines
Diff to previous 1.75 (colored)

move globbing code into its own function

Revision 1.75 / (download) - annotate - [select for diffs], Wed Apr 15 15:21:07 1998 UTC (26 years, 6 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_2_3_BASE, OPENBSD_2_3
Changes since 1.74: +2 -2 lines
Diff to previous 1.74 (colored)

spelling

Revision 1.74 / (download) - annotate - [select for diffs], Tue Apr 14 17:25:31 1998 UTC (26 years, 6 months ago) by millert
Branch: MAIN
Changes since 1.73: +46 -26 lines
Diff to previous 1.73 (colored)

1) If the user selects a set multiple times in a session only
   extract once.  This is a problem now that default sets are
   selected automatically.
2) Don't select any default sets that have already been installed.

Revision 1.73 / (download) - annotate - [select for diffs], Mon Apr 13 16:12:28 1998 UTC (26 years, 6 months ago) by deraadt
Branch: MAIN
Changes since 1.72: +3 -3 lines
Diff to previous 1.72 (colored)

ls -F the zoneinfo files, shows what is a zone-dir and what is a zone-file

Revision 1.72 / (download) - annotate - [select for diffs], Sun Apr 5 23:53:17 1998 UTC (26 years, 6 months ago) by deraadt
Branch: MAIN
Changes since 1.71: +3 -3 lines
Diff to previous 1.71 (colored)

look for seperate xfont archives

Revision 1.71 / (download) - annotate - [select for diffs], Fri Apr 3 18:56:13 1998 UTC (26 years, 7 months ago) by deraadt
Branch: MAIN
Changes since 1.70: +2 -2 lines
Diff to previous 1.70 (colored)

another timezone example

Revision 1.70 / (download) - annotate - [select for diffs], Wed Apr 1 20:21:49 1998 UTC (26 years, 7 months ago) by millert
Branch: MAIN
Changes since 1.69: +3 -3 lines
Diff to previous 1.69 (colored)

move xlink to i386 md sets

Revision 1.69 / (download) - annotate - [select for diffs], Tue Mar 31 03:22:01 1998 UTC (26 years, 7 months ago) by millert
Branch: MAIN
Changes since 1.68: +3 -3 lines
Diff to previous 1.68 (colored)

Kill unnecesary newline.

Revision 1.68 / (download) - annotate - [select for diffs], Mon Mar 30 20:56:37 1998 UTC (26 years, 7 months ago) by deraadt
Branch: MAIN
Changes since 1.67: +3 -3 lines
Diff to previous 1.67 (colored)

know about X sets

Revision 1.67 / (download) - annotate - [select for diffs], Sun Mar 29 20:34:02 1998 UTC (26 years, 7 months ago) by millert
Branch: MAIN
Changes since 1.66: +23 -1 lines
Diff to previous 1.66 (colored)

Select base*, etc* and bsd by default in the file selector.

Revision 1.66 / (download) - annotate - [select for diffs], Sun Mar 29 19:54:50 1998 UTC (26 years, 7 months ago) by millert
Branch: MAIN
Changes since 1.65: +87 -13 lines
Diff to previous 1.65 (colored)

Allow +/- in file selector (works with glob patterns too).

Revision 1.65 / (download) - annotate - [select for diffs], Sun Mar 29 17:48:16 1998 UTC (26 years, 7 months ago) by millert
Branch: MAIN
Changes since 1.64: +5 -5 lines
Diff to previous 1.64 (colored)

glob against files in the selector not in the total file list
(although it would be nice to be able to do that too).
Now '*' does what the user might expect.

Revision 1.64 / (download) - annotate - [select for diffs], Sun Mar 29 01:11:32 1998 UTC (26 years, 7 months ago) by millert
Branch: MAIN
Changes since 1.63: +1042 -1015 lines
Diff to previous 1.63 (colored)

Fix a typo
Move fileset selector code into its own function
Add support for globbing patters in the file selector (needs documenting)
    Ie: `*.gz' or even `*23.tar.gz|bsd'

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

oops

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

copyrights

Revision 1.61 / (download) - annotate - [select for diffs], Thu Mar 26 05:17:48 1998 UTC (26 years, 7 months ago) by millert
Branch: MAIN
Changes since 1.60: +11 -1 lines
Diff to previous 1.60 (colored)

For non-anonymous ftp, ask for the password twice and and make sure
they match.  This is because passwords are no longer echo'd so we
want to make sure they are correct before we do any xfers.

Revision 1.60 / (download) - annotate - [select for diffs], Thu Mar 26 03:57:43 1998 UTC (26 years, 7 months ago) by deraadt
Branch: MAIN
Changes since 1.59: +2 -2 lines
Diff to previous 1.59 (colored)

fix disk prompt

Revision 1.59 / (download) - annotate - [select for diffs], Thu Mar 26 03:49:19 1998 UTC (26 years, 7 months ago) by millert
Branch: MAIN
Changes since 1.58: +152 -32 lines
Diff to previous 1.58 (colored)

Make nfs/cdrom/localdisk install the same as ftp/http install.
Ie: select the sets once and then extract en mass.

Revision 1.58 / (download) - annotate - [select for diffs], Tue Mar 24 06:38:56 1998 UTC (26 years, 7 months ago) by millert
Branch: MAIN
Changes since 1.57: +44 -29 lines
Diff to previous 1.57 (colored)

 o sanitize ftp/http url handling (too many evals make my head spin)
 o proxied ftp can have a username too
 o make first ethernet device the default
 o if there is only one disk device make it the default

Revision 1.57 / (download) - annotate - [select for diffs], Mon Mar 23 05:33:38 1998 UTC (26 years, 7 months ago) by deraadt
Branch: MAIN
Changes since 1.56: +3 -3 lines
Diff to previous 1.56 (colored)

do not mislead user with numbers; johns

Revision 1.56 / (download) - annotate - [select for diffs], Mon Mar 23 05:29:21 1998 UTC (26 years, 7 months ago) by deraadt
Branch: MAIN
Changes since 1.55: +4 -4 lines
Diff to previous 1.55 (colored)

make sure people do not use numbers for disk types; johns

Revision 1.55 / (download) - annotate - [select for diffs], Thu Mar 12 09:42:40 1998 UTC (26 years, 7 months ago) by deraadt
Branch: MAIN
Changes since 1.54: +3 -1 lines
Diff to previous 1.54 (colored)

formatting

Revision 1.54 / (download) - annotate - [select for diffs], Thu Mar 12 08:59:45 1998 UTC (26 years, 7 months ago) by deraadt
Branch: MAIN
Changes since 1.53: +2 -2 lines
Diff to previous 1.53 (colored)

a nice little space

Revision 1.53 / (download) - annotate - [select for diffs], Thu Mar 12 08:13:52 1998 UTC (26 years, 7 months ago) by deraadt
Branch: MAIN
Changes since 1.52: +8 -10 lines
Diff to previous 1.52 (colored)

various prompt and message changes

Revision 1.52 / (download) - annotate - [select for diffs], Sun Mar 1 19:49:03 1998 UTC (26 years, 8 months ago) by millert
Branch: MAIN
Changes since 1.51: +3 -3 lines
Diff to previous 1.51 (colored)

Remove an extra "-o -" so the kernel doesn't go to stdout.  Noted by pefo.

Revision 1.51 / (download) - annotate - [select for diffs], Tue Feb 17 23:19:09 1998 UTC (26 years, 8 months ago) by millert
Branch: MAIN
Changes since 1.50: +18 -14 lines
Diff to previous 1.50 (colored)

Use ftp's new -o flag and give the user the option of using
active ftp (default is passive with auto-fallback to active).

Revision 1.50 / (download) - annotate - [select for diffs], Sat Jan 10 02:22:57 1998 UTC (26 years, 9 months ago) by deraadt
Branch: MAIN
Changes since 1.49: +44 -4 lines
Diff to previous 1.49 (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.48.2.1 / (download) - annotate - [select for diffs], Wed Oct 29 21:49:17 1997 UTC (27 years ago) by deraadt
Branch: OPENBSD_2_2
Changes since 1.48: +2 -2 lines
Diff to previous 1.48 (colored) next main 1.49 (colored)

merge in 1.49: clarify a prompt

Revision 1.49 / (download) - annotate - [select for diffs], Wed Oct 29 21:38:17 1997 UTC (27 years ago) by deraadt
Branch: MAIN
Changes since 1.48: +2 -2 lines
Diff to previous 1.48 (colored)

clarify a prompt

Revision 1.48 / (download) - annotate - [select for diffs], Sat Oct 25 05:22:19 1997 UTC (27 years ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_2_2_BASE
Branch point for: OPENBSD_2_2
Changes since 1.47: +2 -1 lines
Diff to previous 1.47 (colored)

ask for netmask

Revision 1.47 / (download) - annotate - [select for diffs], Sun Oct 19 09:07:47 1997 UTC (27 years ago) by deraadt
Branch: MAIN
Changes since 1.46: +4 -4 lines
Diff to previous 1.46 (colored)

do not indent $_DKDEVS

Revision 1.46 / (download) - annotate - [select for diffs], Fri Oct 17 12:35:01 1997 UTC (27 years ago) by deraadt
Branch: MAIN
Changes since 1.45: +2 -2 lines
Diff to previous 1.45 (colored)

look at ftp.openbsd.org not ftp.usa... the ftp one is now fast

Revision 1.45 / (download) - annotate - [select for diffs], Fri Oct 17 12:20:28 1997 UTC (27 years ago) by deraadt
Branch: MAIN
Changes since 1.44: +4 -6 lines
Diff to previous 1.44 (colored)

pretty a bit more

Revision 1.44 / (download) - annotate - [select for diffs], Fri Oct 17 12:05:57 1997 UTC (27 years ago) by deraadt
Branch: MAIN
Changes since 1.43: +47 -35 lines
Diff to previous 1.43 (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.43 / (download) - annotate - [select for diffs], Fri Oct 17 08:57:24 1997 UTC (27 years ago) by deraadt
Branch: MAIN
Changes since 1.42: +5 -5 lines
Diff to previous 1.42 (colored)

indent disk list

Revision 1.42 / (download) - annotate - [select for diffs], Fri Oct 17 08:13:58 1997 UTC (27 years ago) by deraadt
Branch: MAIN
Changes since 1.41: +3 -3 lines
Diff to previous 1.41 (colored)

clarify

Revision 1.41 / (download) - annotate - [select for diffs], Fri Oct 17 04:31:18 1997 UTC (27 years ago) by deraadt
Branch: MAIN
Changes since 1.40: +2 -2 lines
Diff to previous 1.40 (colored)

... especially on PC machines...

Revision 1.40 / (download) - annotate - [select for diffs], Fri Oct 3 20:26:35 1997 UTC (27 years, 1 month ago) by deraadt
Branch: MAIN
Changes since 1.39: +3 -3 lines
Diff to previous 1.39 (colored)

choose install-from disk correctly; matthieu@mipnet.fr, PR#325

Revision 1.39 / (download) - annotate - [select for diffs], Thu Sep 25 05:16:43 1997 UTC (27 years, 1 month ago) by millert
Branch: MAIN
Changes since 1.38: +2 -2 lines
Diff to previous 1.38 (colored)

Fix typo, noted by johns@heuris.com.

Revision 1.38 / (download) - annotate - [select for diffs], Wed Jul 16 22:33:03 1997 UTC (27 years, 3 months ago) by pefo
Branch: MAIN
Changes since 1.37: +2 -2 lines
Diff to previous 1.37 (colored)

Fix the frigging CD rom mount bug!!

Revision 1.37 / (download) - annotate - [select for diffs], Wed Jul 9 15:15:37 1997 UTC (27 years, 3 months ago) by millert
Branch: MAIN
Changes since 1.36: +12 -21 lines
Diff to previous 1.36 (colored)

Don't do needless sync and change -fast to -check in unmount_fs()

Revision 1.36 / (download) - annotate - [select for diffs], Thu May 29 09:15:47 1997 UTC (27 years, 5 months ago) by niklas
Branch: MAIN
Changes since 1.35: +40 -12 lines
Diff to previous 1.35 (colored)

Be nicer about the partition query

Revision 1.35 / (download) - annotate - [select for diffs], Sun May 18 23:12:02 1997 UTC (27 years, 5 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_2_1_BASE, OPENBSD_2_1
Changes since 1.34: +6 -2 lines
Diff to previous 1.34 (colored)

provide link0/link1 examples

Revision 1.34 / (download) - annotate - [select for diffs], Sat May 17 00:06:36 1997 UTC (27 years, 5 months ago) by millert
Branch: MAIN
Changes since 1.33: +3 -3 lines
Diff to previous 1.33 (colored)

Make an echo line up neatly.

Revision 1.33 / (download) - annotate - [select for diffs], Fri May 16 16:36:53 1997 UTC (27 years, 5 months ago) by millert
Branch: MAIN
Changes since 1.32: +3 -3 lines
Diff to previous 1.32 (colored)

unset $_ftp_passive if user says no to passive mode and fix a typo.

Revision 1.32 / (download) - annotate - [select for diffs], Fri May 16 04:55:05 1997 UTC (27 years, 5 months ago) by millert
Branch: MAIN
Changes since 1.31: +14 -7 lines
Diff to previous 1.31 (colored)

Use a single proxy variable since we need to set both ftp/http proxies
and they are virtually guaranteed to be the same.
Proxy http install now works.

Revision 1.31 / (download) - annotate - [select for diffs], Fri May 16 04:12:44 1997 UTC (27 years, 5 months ago) by millert
Branch: MAIN
Changes since 1.30: +2 -2 lines
Diff to previous 1.30 (colored)

Strip possible <cr> from index.txt

Revision 1.30 / (download) - annotate - [select for diffs], Fri May 16 03:21:10 1997 UTC (27 years, 5 months ago) by millert
Branch: MAIN
Changes since 1.29: +3 -3 lines
Diff to previous 1.29 (colored)

Fix instance of ftp_server_dir -> _ftp_server_dir.

Revision 1.29 / (download) - annotate - [select for diffs], Fri May 16 03:07:39 1997 UTC (27 years, 5 months ago) by millert
Branch: MAIN
Changes since 1.28: +3 -3 lines
Diff to previous 1.28 (colored)

proxy-ftp install needs to use index.txt too

Revision 1.28 / (download) - annotate - [select for diffs], Fri May 16 02:00:22 1997 UTC (27 years, 5 months ago) by millert
Branch: MAIN
Changes since 1.27: +3 -3 lines
Diff to previous 1.27 (colored)

- Proxy setting takes a URL, not an IP.
- Use ${VERSION_MAJOR} and ${VERSION_MINOR}, not sed.
- Server list file is always called ftplist.  Grep out applicable
  servers based on URL-type.

Revision 1.27 / (download) - annotate - [select for diffs], Fri May 16 00:51:09 1997 UTC (27 years, 5 months ago) by millert
Branch: MAIN
Changes since 1.26: +18 -19 lines
Diff to previous 1.26 (colored)

When getting a file list, make things relative to the install dir, not
absolute.  Necesary for http listing via index.txt.  list_has_sets() no
longer takes a dir argument as file lists contain relative paths.
Remove a few eval's now that we use relative paths in file lists.

Revision 1.26 / (download) - annotate - [select for diffs], Thu May 15 06:29:01 1997 UTC (27 years, 5 months ago) by millert
Branch: MAIN
Changes since 1.25: +2 -2 lines
Diff to previous 1.25 (colored)

Get ``ftplist'' from ftp.usa.openbsd.org.

Revision 1.25 / (download) - annotate - [select for diffs], Thu May 15 06:26:08 1997 UTC (27 years, 5 months ago) by millert
Branch: MAIN
Changes since 1.24: +111 -86 lines
Diff to previous 1.24 (colored)

install_ftp -> install.url (http support is untested)
Fix a problem with ftp proxy and getting a file list

Revision 1.24 / (download) - annotate - [select for diffs], Wed May 14 21:12:14 1997 UTC (27 years, 5 months ago) by millert
Branch: MAIN
Changes since 1.23: +4 -2 lines
Diff to previous 1.23 (colored)

Add VERSION_MAJOR and VERSION_MINOR.  Currently assumes release
is ${major}${minor} not ${major}${minor}${teeny}.

Revision 1.23 / (download) - annotate - [select for diffs], Wed May 14 17:08:11 1997 UTC (27 years, 5 months ago) by millert
Branch: MAIN
Changes since 1.22: +3 -1 lines
Diff to previous 1.22 (colored)

Fix phantom "bsd" that showed up when there were no recognized sets
(variable needed to be re-init'd).

Revision 1.22 / (download) - annotate - [select for diffs], Wed May 14 16:26:15 1997 UTC (27 years, 5 months ago) by millert
Branch: MAIN
Changes since 1.21: +292 -93 lines
Diff to previous 1.21 (colored)

New ftp install.  Disk install should be made to be more this.

Revision 1.21 / (download) - annotate - [select for diffs], Tue May 13 12:02:33 1997 UTC (27 years, 5 months ago) by niklas
Branch: MAIN
Changes since 1.20: +2 -2 lines
Diff to previous 1.20 (colored)

Protect against an possibly empty shell variable

Revision 1.20 / (download) - annotate - [select for diffs], Tue May 13 03:51:27 1997 UTC (27 years, 5 months ago) by millert
Branch: MAIN
Changes since 1.19: +7 -5 lines
Diff to previous 1.19 (colored)

Need to add ${VERSION} when checking for the existence of sets.
We use "route show" not "netstat -r"

Revision 1.19 / (download) - annotate - [select for diffs], Sat May 10 22:19:36 1997 UTC (27 years, 5 months ago) by millert
Branch: MAIN
Changes since 1.18: +4 -1 lines
Diff to previous 1.18 (colored)

Add SNAPSETS -- can be included in MDSETS if so desired.

Revision 1.18 / (download) - annotate - [select for diffs], Mon May 5 05:27:30 1997 UTC (27 years, 6 months ago) by deraadt
Branch: MAIN
Changes since 1.17: +2 -2 lines
Diff to previous 1.17 (colored)

get ftplist from proper host

Revision 1.17 / (download) - annotate - [select for diffs], Mon May 5 05:18:19 1997 UTC (27 years, 6 months ago) by grr
Branch: MAIN
Changes since 1.16: +2 -1 lines
Diff to previous 1.16 (colored)

turns out changes to getresp weren't really the ticket, I'd revert it, but don't want to mess up anybody at this point.  If everybody's going to be using this stuff, it needs a post-release overhaul...

Revision 1.16 / (download) - annotate - [select for diffs], Mon May 5 00:35:36 1997 UTC (27 years, 6 months ago) by tholo
Branch: MAIN
Changes since 1.15: +3 -1 lines
Diff to previous 1.15 (colored)

Default FTP login anonymous with root@this.machine as password for FTP install

Revision 1.15 / (download) - annotate - [select for diffs], Mon May 5 00:28:45 1997 UTC (27 years, 6 months ago) by tholo
Branch: MAIN
Changes since 1.14: +12 -1 lines
Diff to previous 1.14 (colored)

When doing FTP installs, allow the user to get a list of FTP servers

Revision 1.14 / (download) - annotate - [select for diffs], Sun May 4 05:08:00 1997 UTC (27 years, 6 months ago) by tholo
Branch: MAIN
Changes since 1.13: +2 -2 lines
Diff to previous 1.13 (colored)

Install `base' set before `etc' (configuration files)

Revision 1.13 / (download) - annotate - [select for diffs], Sun May 4 04:50:22 1997 UTC (27 years, 6 months ago) by tholo
Branch: MAIN
Changes since 1.12: +8 -6 lines
Diff to previous 1.12 (colored)

Distribution sets has version as part of the file name; be consistent

Revision 1.12 / (download) - annotate - [select for diffs], Sun May 4 03:25:03 1997 UTC (27 years, 6 months ago) by tholo
Branch: MAIN
Changes since 1.11: +3 -3 lines
Diff to previous 1.11 (colored)

Need to quote interface flags to addifconfig as there might be more than one
flag specified

Revision 1.11 / (download) - annotate - [select for diffs], Sun May 4 03:03:14 1997 UTC (27 years, 6 months ago) by tholo
Branch: MAIN
Changes since 1.10: +3 -3 lines
Diff to previous 1.10 (colored)

Fix thinko in kernel install handling

Revision 1.10 / (download) - annotate - [select for diffs], Sat May 3 23:06:02 1997 UTC (27 years, 6 months ago) by tholo
Branch: MAIN
Changes since 1.9: +29 -13 lines
Diff to previous 1.9 (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.9 / (download) - annotate - [select for diffs], Sat May 3 07:45:10 1997 UTC (27 years, 6 months ago) by tholo
Branch: MAIN
Changes since 1.8: +8 -2 lines
Diff to previous 1.8 (colored)

Make $EDITOR available after setting it
break cannot break out of a case; just return
Work around apparent pdksh bug where it will look at a modified $resp after
executing code in a case statement.

Revision 1.8 / (download) - annotate - [select for diffs], Fri May 2 20:56:18 1997 UTC (27 years, 6 months ago) by grr
Branch: MAIN
Changes since 1.7: +49 -16 lines
Diff to previous 1.7 (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.7 / (download) - annotate - [select for diffs], Wed Apr 30 23:56:06 1997 UTC (27 years, 6 months ago) by grr
Branch: MAIN
Changes since 1.6: +42 -7 lines
Diff to previous 1.6 (colored)

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

Revision 1.6 / (download) - annotate - [select for diffs], Wed Apr 30 20:25:36 1997 UTC (27 years, 6 months ago) by deraadt
Branch: MAIN
Changes since 1.5: +5 -5 lines
Diff to previous 1.5 (colored)

no --unlink

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

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

Revision 1.4 / (download) - annotate - [select for diffs], Thu Sep 5 21:26:40 1996 UTC (28 years, 1 month ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_2_0_BASE, OPENBSD_2_0
Changes since 1.3: +508 -182 lines
Diff to previous 1.3 (colored)

sync to netbsd

Revision 1.3 / (download) - annotate - [select for diffs], Sat Jun 29 05:54:16 1996 UTC (28 years, 4 months ago) by tholo
Branch: MAIN
Changes since 1.2: +5 -5 lines
Diff to previous 1.2 (colored)

Update for removal of GNU tar(1)

Revision 1.2 / (download) - annotate - [select for diffs], Thu Mar 28 21:48:19 1996 UTC (28 years, 7 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:51 1996 UTC (28 years, 9 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.