Up to [cvs.NetBSD.org] / src / etc / rc.d
Request diff between arbitrary revisions
Default branch: MAIN
Revision 1.21 / (download) - annotate - [select for diffs], Tue Sep 8 12:52:18 2020 UTC (3 years, 7 months ago) by martin
Branch: MAIN
CVS Tags: netbsd-10-base,
netbsd-10-0-RELEASE,
netbsd-10-0-RC6,
netbsd-10-0-RC5,
netbsd-10-0-RC4,
netbsd-10-0-RC3,
netbsd-10-0-RC2,
netbsd-10-0-RC1,
netbsd-10,
cjep_sun2x-base1,
cjep_sun2x-base,
cjep_sun2x,
cjep_staticlib_x-base1,
cjep_staticlib_x-base,
cjep_staticlib_x,
HEAD
Changes since 1.20: +2 -2
lines
Diff to previous 1.20 (unified) to selected 1.18 (unified)
Rename MOUNTCRITLOCAL to CRITLOCALMOUNTED to avoid a name collision on case insensitive file systems
Revision 1.20 / (download) - annotate - [select for diffs], Wed Jul 22 16:50:41 2020 UTC (3 years, 8 months ago) by martin
Branch: MAIN
Changes since 1.19: +2 -2
lines
Diff to previous 1.19 (unified) to selected 1.18 (unified)
Split the local disk availability step into two phases to allow scripts that pre-populate parts of the system (e.g. a tmpfs based /var) an easy place to plug in like: # REQUIRE: mountcritlocal # BEFORE: MOUNTCRITLOCAL This also cleans up the existing special handling a bit by separating it into new scripts. All later scripts now depend on MOUNTCRITLOCAL. Discussed on tech-userlevel some time ago.
Revision 1.19 / (download) - annotate - [select for diffs], Sat Jul 4 06:24:53 2020 UTC (3 years, 9 months ago) by skrll
Branch: MAIN
Changes since 1.18: +2 -2
lines
Diff to previous 1.18 (unified)
Trailing whitespace
Revision 1.17.2.1 / (download) - annotate - [select for diffs], Wed May 13 19:18:03 2009 UTC (14 years, 11 months ago) by jym
Branch: jym-xensuspend
Changes since 1.17: +2 -2
lines
Diff to previous 1.17 (unified) next main 1.18 (unified)
Sync with HEAD. Third (and last) commit. See http://mail-index.netbsd.org/source-changes/2009/05/13/msg221222.html
Revision 1.15.20.1 / (download) - annotate - [select for diffs], Thu Mar 26 17:45:38 2009 UTC (15 years ago) by snj
Branch: netbsd-5
CVS Tags: netbsd-5-2-RELEASE,
netbsd-5-2-RC1,
netbsd-5-2-3-RELEASE,
netbsd-5-2-2-RELEASE,
netbsd-5-2-1-RELEASE,
netbsd-5-2,
netbsd-5-1-RELEASE,
netbsd-5-1-RC4,
netbsd-5-1-RC3,
netbsd-5-1-RC2,
netbsd-5-1-RC1,
netbsd-5-1-5-RELEASE,
netbsd-5-1-4-RELEASE,
netbsd-5-1-3-RELEASE,
netbsd-5-1-2-RELEASE,
netbsd-5-1-1-RELEASE,
netbsd-5-1,
netbsd-5-0-RELEASE,
netbsd-5-0-RC4,
netbsd-5-0-2-RELEASE,
netbsd-5-0-1-RELEASE,
netbsd-5-0,
matt-nb5-pq3-base,
matt-nb5-pq3,
matt-nb5-mips64-u2-k2-k4-k7-k8-k9,
matt-nb5-mips64-u1-k1-k5,
matt-nb5-mips64-premerge-20101231,
matt-nb5-mips64-premerge-20091211,
matt-nb5-mips64-k15,
matt-nb5-mips64,
matt-nb4-mips64-k7-u2a-k9b
Changes since 1.15: +2 -2
lines
Diff to previous 1.15 (unified) next main 1.16 (unified) to selected 1.18 (unified)
Pull up following revision(s) (requested by hannken in ticket #606): etc/defaults/rc.conf: revision 1.101 etc/rc.d/ipfilter: revision 1.18 Add flags to rc.d/ipfilter. Use it from rc.conf like ipfilter=YES ipfilter_flags="-T fr_statemax=18963,fr_statesize=27091" Ok: Christos Zoulas <christos@netbsd.org>
Revision 1.18 / (download) - annotate - [selected], Mon Mar 23 18:52:02 2009 UTC (15 years ago) by hannken
Branch: MAIN
CVS Tags: yamt-pagecache-tag8,
yamt-pagecache-base9,
yamt-pagecache-base8,
yamt-pagecache-base7,
yamt-pagecache-base6,
yamt-pagecache-base5,
yamt-pagecache-base4,
yamt-pagecache-base3,
yamt-pagecache-base2,
yamt-pagecache-base,
yamt-pagecache,
tls-maxphys-base,
tls-maxphys,
tls-earlyentropy-base,
tls-earlyentropy,
riastradh-xf86-video-intel-2-7-1-pre-2-21-15,
riastradh-drm2-base3,
riastradh-drm2-base2,
riastradh-drm2-base1,
riastradh-drm2-base,
riastradh-drm2,
prg-localcount2-base3,
prg-localcount2-base2,
prg-localcount2-base1,
prg-localcount2-base,
prg-localcount2,
phil-wifi-base,
phil-wifi-20200421,
phil-wifi-20200411,
phil-wifi-20200406,
phil-wifi-20191119,
phil-wifi-20190609,
phil-wifi,
pgoyette-localcount-base,
pgoyette-localcount-20170426,
pgoyette-localcount-20170320,
pgoyette-localcount-20170107,
pgoyette-localcount-20161104,
pgoyette-localcount-20160806,
pgoyette-localcount-20160726,
pgoyette-localcount,
pgoyette-compat-merge-20190127,
pgoyette-compat-base,
pgoyette-compat-20190127,
pgoyette-compat-20190118,
pgoyette-compat-1226,
pgoyette-compat-1126,
pgoyette-compat-1020,
pgoyette-compat-0930,
pgoyette-compat-0906,
pgoyette-compat-0728,
pgoyette-compat-0625,
pgoyette-compat-0521,
pgoyette-compat-0502,
pgoyette-compat-0422,
pgoyette-compat-0415,
pgoyette-compat-0407,
pgoyette-compat-0330,
pgoyette-compat-0322,
pgoyette-compat-0315,
pgoyette-compat,
perseant-stdc-iso10646-base,
perseant-stdc-iso10646,
netbsd-9-base,
netbsd-9-3-RELEASE,
netbsd-9-2-RELEASE,
netbsd-9-1-RELEASE,
netbsd-9-0-RELEASE,
netbsd-9-0-RC2,
netbsd-9-0-RC1,
netbsd-9,
netbsd-8-base,
netbsd-8-2-RELEASE,
netbsd-8-1-RELEASE,
netbsd-8-1-RC1,
netbsd-8-0-RELEASE,
netbsd-8-0-RC2,
netbsd-8-0-RC1,
netbsd-8,
netbsd-7-nhusb-base-20170116,
netbsd-7-nhusb-base,
netbsd-7-nhusb,
netbsd-7-base,
netbsd-7-2-RELEASE,
netbsd-7-1-RELEASE,
netbsd-7-1-RC2,
netbsd-7-1-RC1,
netbsd-7-1-2-RELEASE,
netbsd-7-1-1-RELEASE,
netbsd-7-1,
netbsd-7-0-RELEASE,
netbsd-7-0-RC3,
netbsd-7-0-RC2,
netbsd-7-0-RC1,
netbsd-7-0-2-RELEASE,
netbsd-7-0-1-RELEASE,
netbsd-7-0,
netbsd-7,
netbsd-6-base,
netbsd-6-1-RELEASE,
netbsd-6-1-RC4,
netbsd-6-1-RC3,
netbsd-6-1-RC2,
netbsd-6-1-RC1,
netbsd-6-1-5-RELEASE,
netbsd-6-1-4-RELEASE,
netbsd-6-1-3-RELEASE,
netbsd-6-1-2-RELEASE,
netbsd-6-1-1-RELEASE,
netbsd-6-1,
netbsd-6-0-RELEASE,
netbsd-6-0-RC2,
netbsd-6-0-RC1,
netbsd-6-0-6-RELEASE,
netbsd-6-0-5-RELEASE,
netbsd-6-0-4-RELEASE,
netbsd-6-0-3-RELEASE,
netbsd-6-0-2-RELEASE,
netbsd-6-0-1-RELEASE,
netbsd-6-0,
netbsd-6,
matt-premerge-20091211,
matt-nb8-mediatek-base,
matt-nb8-mediatek,
matt-nb6-plus-nbase,
matt-nb6-plus-base,
matt-nb6-plus,
matt-mips64-premerge-20101231,
localcount-20160914,
khorben-n900,
jym-xensuspend-nbase,
jym-xensuspend-base,
is-mlppp-base,
is-mlppp,
cherry-xenmp-base,
cherry-xenmp,
bouyer-socketcan-base1,
bouyer-socketcan-base,
bouyer-socketcan,
bouyer-quota2-nbase,
bouyer-quota2-base,
bouyer-quota2,
agc-symver-base,
agc-symver
Changes since 1.17: +2 -2
lines
Diff to previous 1.17 (unified)
Add flags to rc.d/ipfilter. Use it from rc.conf like ipfilter=YES ipfilter_flags="-T fr_statemax=18963,fr_statesize=27091" Ok: Christos Zoulas <christos@netbsd.org>
Revision 1.15.12.1 / (download) - annotate - [select for diffs], Sat Jan 17 20:43:44 2009 UTC (15 years, 3 months ago) by mjf
Branch: mjf-devfs2
Changes since 1.15: +2 -2
lines
Diff to previous 1.15 (unified) next main 1.16 (unified) to selected 1.18 (unified)
Sync with HEAD.
Revision 1.17 / (download) - annotate - [select for diffs], Sat Nov 22 20:23:33 2008 UTC (15 years, 4 months ago) by tsutsui
Branch: MAIN
CVS Tags: mjf-devfs2-base2
Branch point for: jym-xensuspend
Changes since 1.16: +2 -2
lines
Diff to previous 1.16 (unified) to selected 1.18 (unified)
Add "bootconf" to REQUIRE: lines which had beforenetlkm since removed beforenetlkm required bootconf.
Revision 1.16 / (download) - annotate - [select for diffs], Wed Nov 12 12:35:52 2008 UTC (15 years, 5 months ago) by ad
Branch: MAIN
Changes since 1.15: +2 -2
lines
Diff to previous 1.15 (unified) to selected 1.18 (unified)
Remove LKMs and switch to the module framework, pass 1. Proposed on tech-kern@.
Revision 1.15 / (download) - annotate - [select for diffs], Fri Apr 6 14:20:17 2007 UTC (17 years ago) by apb
Branch: MAIN
CVS Tags: yamt-pf42-baseX,
yamt-pf42-base4,
yamt-pf42-base3,
yamt-pf42-base2,
yamt-pf42-base,
yamt-pf42,
wrstuden-revivesa-base-3,
wrstuden-revivesa-base-2,
wrstuden-revivesa-base-1,
wrstuden-revivesa-base,
wrstuden-revivesa,
netbsd-5-base,
netbsd-5-0-RC3,
netbsd-5-0-RC2,
netbsd-5-0-RC1,
mjf-devfs2-base,
mjf-devfs-base,
mjf-devfs,
matt-mips64-base2,
matt-mips64-base,
matt-mips64,
matt-armv6-prevmlocking,
matt-armv6-nbase,
matt-armv6-base,
matt-armv6,
keiichi-mipv6-base,
keiichi-mipv6,
hpcarm-cleanup-nbase,
hpcarm-cleanup-base,
hpcarm-cleanup,
cube-autoconf-base,
cube-autoconf
Branch point for: netbsd-5,
mjf-devfs2
Changes since 1.14: +2 -9
lines
Diff to previous 1.14 (unified) to selected 1.18 (unified)
* Add a stop_boot() function in rc.subr, to terminate a multi-user boot by killing the parent process. The parent's PID is saved in $RC_PID. * In all rc.d/* scripts that previously tried to stop the boot, replace in-line code with "stop_boot". * Document this. This should fix PR 29822.
Revision 1.14 / (download) - annotate - [select for diffs], Thu Dec 23 03:31:54 2004 UTC (19 years, 4 months ago) by lukem
Branch: MAIN
CVS Tags: wrstuden-fixsa-newbase,
wrstuden-fixsa-base-1,
wrstuden-fixsa-base,
wrstuden-fixsa,
netbsd-4-base,
netbsd-4-0-RELEASE,
netbsd-4-0-RC5,
netbsd-4-0-RC4,
netbsd-4-0-RC3,
netbsd-4-0-RC2,
netbsd-4-0-RC1,
netbsd-4-0-1-RELEASE,
netbsd-4-0,
netbsd-4,
netbsd-3-base,
netbsd-3-1-RELEASE,
netbsd-3-1-RC4,
netbsd-3-1-RC3,
netbsd-3-1-RC2,
netbsd-3-1-RC1,
netbsd-3-1-1-RELEASE,
netbsd-3-1,
netbsd-3-0-RELEASE,
netbsd-3-0-RC6,
netbsd-3-0-RC5,
netbsd-3-0-RC4,
netbsd-3-0-RC3,
netbsd-3-0-RC2,
netbsd-3-0-RC1,
netbsd-3-0-3-RELEASE,
netbsd-3-0-2-RELEASE,
netbsd-3-0-1-RELEASE,
netbsd-3-0,
netbsd-3,
abandoned-netbsd-4-base,
abandoned-netbsd-4
Changes since 1.13: +28 -6
lines
Diff to previous 1.13 (unified) to selected 1.18 (unified)
* Conditionalize flushing of IPv4 vs IPv6 rules based on the existance of the appropriate configuration file. Based on PR 28757 from Jason White. * Add comments explaining why we flush separately from the reload (backwards compat with older ipf(8) binaries).
Revision 1.10.4.2 / (download) - annotate - [select for diffs], Fri Nov 12 06:44:17 2004 UTC (19 years, 5 months ago) by jmc
Branch: netbsd-2-0
CVS Tags: netbsd-2-base,
netbsd-2-1-RELEASE,
netbsd-2-1-RC6,
netbsd-2-1-RC5,
netbsd-2-1-RC4,
netbsd-2-1-RC3,
netbsd-2-1-RC2,
netbsd-2-1-RC1,
netbsd-2-1,
netbsd-2-0-RELEASE,
netbsd-2-0-RC5,
netbsd-2-0-3-RELEASE,
netbsd-2-0-2-RELEASE,
netbsd-2-0-1-RELEASE,
netbsd-2
Changes since 1.10.4.1: +10 -6
lines
Diff to previous 1.10.4.1 (unified) to branchpoint 1.10 (unified) next main 1.11 (unified) to selected 1.18 (unified)
Pullup rev 1.13 (requested by lukem in ticket #963) Redo previous (rev 1.12) in a manner that allows this rc.d script to operate correctly on ipf(8) from prior to 4.1.3 (where -Fa flushes both protocols) and 4.1.3 (where -Fa only flushes the current protocol).
Revision 1.13 / (download) - annotate - [select for diffs], Mon Nov 8 02:09:01 2004 UTC (19 years, 5 months ago) by lukem
Branch: MAIN
Changes since 1.12: +9 -5
lines
Diff to previous 1.12 (unified) to selected 1.18 (unified)
Redo previous (rev 1.12) in a manner that allows this rc.d script to operate correctly on ipf(8) from prior to 4.1.3 (where -Fa flushes both protocols) and 4.1.3 (where -Fa only flushes the current protocol). Fix from Kimmo Suominen, per private discussion.
Revision 1.10.4.1 / (download) - annotate - [select for diffs], Tue Sep 21 15:14:20 2004 UTC (19 years, 7 months ago) by tron
Branch: netbsd-2-0
CVS Tags: netbsd-2-0-RC4,
netbsd-2-0-RC3,
netbsd-2-0-RC2,
netbsd-2-0-RC1
Changes since 1.10: +5 -6
lines
Diff to previous 1.10 (unified) to selected 1.18 (unified)
Pull up revision 1.12 (requested by martti in ticket #866): Explicitly flush (-Fa) rules when loading or reloading IPv4 and IPv6 rules, rather than relying upon running "ipf -Fa" beforehand (which only flushes IPv4) Should fix PR 26885 and PR 26857.
Revision 1.12 / (download) - annotate - [select for diffs], Thu Sep 9 00:33:03 2004 UTC (19 years, 7 months ago) by lukem
Branch: MAIN
Changes since 1.11: +5 -6
lines
Diff to previous 1.11 (unified) to selected 1.18 (unified)
Explicitly flush (-Fa) rules when loading or reloading IPv4 and IPv6 rules, rather than relying upon running "ipf -Fa" beforehand (which only flushes IPv4) Should fix PR 26885 and PR 26857.
Revision 1.11 / (download) - annotate - [select for diffs], Fri Aug 13 18:08:03 2004 UTC (19 years, 8 months ago) by mycroft
Branch: MAIN
Changes since 1.10: +2 -2
lines
Diff to previous 1.10 (unified) to selected 1.18 (unified)
Add an _rc_subr_loaded variable, set to ":" by rc.subr. Scripts can use this for a speedup by doing: $_rc_subr_loaded . /etc/rc.subr
Revision 1.4.4.3 / (download) - annotate - [select for diffs], Thu Dec 27 12:17:20 2001 UTC (22 years, 3 months ago) by he
Branch: netbsd-1-5
CVS Tags: netbsd-1-5-PATCH003
Changes since 1.4.4.2: +10 -3
lines
Diff to previous 1.4.4.2 (unified) to branchpoint 1.4 (unified) next main 1.5 (unified) to selected 1.18 (unified)
Pull up revisions 1.9-1.10 (requested by jlam): Use && and || for logical concatenations instead of -a/-o operators, and support ``resync'' (ipf -y).
Revision 1.10 / (download) - annotate - [select for diffs], Wed Feb 28 17:03:50 2001 UTC (23 years, 1 month ago) by lukem
Branch: MAIN
CVS Tags: netbsd-2-0-base,
netbsd-1-6-base,
netbsd-1-6-RELEASE,
netbsd-1-6-RC3,
netbsd-1-6-RC2,
netbsd-1-6-RC1,
netbsd-1-6-PATCH002-RELEASE,
netbsd-1-6-PATCH002-RC4,
netbsd-1-6-PATCH002-RC3,
netbsd-1-6-PATCH002-RC2,
netbsd-1-6-PATCH002-RC1,
netbsd-1-6-PATCH002,
netbsd-1-6-PATCH001-RELEASE,
netbsd-1-6-PATCH001-RC3,
netbsd-1-6-PATCH001-RC2,
netbsd-1-6-PATCH001-RC1,
netbsd-1-6-PATCH001,
netbsd-1-6,
fvdl_fs64_base
Branch point for: netbsd-2-0
Changes since 1.9: +9 -2
lines
Diff to previous 1.9 (unified) to selected 1.18 (unified)
support `resync' (ipf -y). suggested by Johnny C. Lam in [misc/12300]
Revision 1.9 / (download) - annotate - [select for diffs], Mon Oct 9 06:11:38 2000 UTC (23 years, 6 months ago) by nisimura
Branch: MAIN
Changes since 1.8: +2 -2
lines
Diff to previous 1.8 (unified) to selected 1.18 (unified)
Use && and || for logical concatenations instead of -a/-o test operators.
Revision 1.4.4.2 / (download) - annotate - [select for diffs], Mon Oct 2 00:37:08 2000 UTC (23 years, 6 months ago) by lukem
Branch: netbsd-1-5
CVS Tags: netbsd-1-5-RELEASE,
netbsd-1-5-PATCH002,
netbsd-1-5-PATCH001,
netbsd-1-5-BETA2,
netbsd-1-5-BETA
Changes since 1.4.4.1: +20 -13
lines
Diff to previous 1.4.4.1 (unified) to branchpoint 1.4 (unified) to selected 1.18 (unified)
pull up rev 1.7-1.8 (approved by thorpej): - support loading ipf6.conf as well as ipf.conf - always use $rcvar to determine the name of the var to checkyesno - fix force*
Revision 1.8 / (download) - annotate - [select for diffs], Sun Oct 1 05:58:06 2000 UTC (23 years, 6 months ago) by lukem
Branch: MAIN
Changes since 1.7: +19 -10
lines
Diff to previous 1.7 (unified) to selected 1.18 (unified)
support loading ipf6.conf as well as ipf.conf. inspired by [misc/11033] by Gregory McGarry <g.mcgarry@ieee.org>
Revision 1.7 / (download) - annotate - [select for diffs], Tue Sep 19 13:04:38 2000 UTC (23 years, 7 months ago) by lukem
Branch: MAIN
Changes since 1.6: +3 -5
lines
Diff to previous 1.6 (unified) to selected 1.18 (unified)
- only perform the checkyesno on the variable named in $rcvar (rather than implicitly using $name if $rcvar isn't set), and always perform this check, even when using start_cmd (et al). this check is performed before the pidcmd is run, speeding up scripts that weren't going to be run anyway. this should speed up booting slow systems. - take advantage of the above and remove start_precmd="checkyesno foo" in scripts that use start_cmd. - explicitly set rcvar=foo in the rc.d/foo scripts which have an equivalent rc.conf entry - fix `rcvar' and `restart' when $rcvar isn't set. these above changes fix PR [bin/11027]. - when doing `force*', ignore the return value of *_precmd. this fixes PR [bin/10781]. - rename what sysdb provides from `databases' to `sysdb', to reflect the name of the script. - improve the comments in rc.subr
Revision 1.4.4.1 / (download) - annotate - [select for diffs], Wed Aug 9 18:45:22 2000 UTC (23 years, 8 months ago) by lukem
Branch: netbsd-1-5
CVS Tags: netbsd-1-5-ALPHA2
Changes since 1.4: +28 -9
lines
Diff to previous 1.4 (unified) to selected 1.18 (unified)
pull up revs 1.5-1.6 approved by: thorpej * add support for `status' * if ipf.conf isn't readable and the system is booting directly to multiuser, send SIGTERM to the parent (/etc/rc) so that init(8) aborts the boot.
Revision 1.6 / (download) - annotate - [select for diffs], Fri Jul 21 01:14:23 2000 UTC (23 years, 9 months ago) by lukem
Branch: MAIN
Changes since 1.5: +10 -1
lines
Diff to previous 1.5 (unified) to selected 1.18 (unified)
if ipf.conf isn't readable and the system is booting directly to multiuser, send SIGTERM to the parent (/etc/rc) so that init(8) aborts the boot.
Revision 1.5 / (download) - annotate - [select for diffs], Mon Jul 17 12:58:14 2000 UTC (23 years, 9 months ago) by lukem
Branch: MAIN
Changes since 1.4: +19 -9
lines
Diff to previous 1.4 (unified) to selected 1.18 (unified)
* add support for `status' * remove bogus comment about aborting the boot if ipf fails; this hasn't been supported since the rc.d migration and is too messy to resolve...
Revision 1.4 / (download) - annotate - [select for diffs], Sat May 13 08:45:07 2000 UTC (23 years, 11 months ago) by lukem
Branch: MAIN
CVS Tags: netbsd-1-5-base,
minoura-xpg4dl-base,
minoura-xpg4dl
Branch point for: netbsd-1-5
Changes since 1.3: +2 -2
lines
Diff to previous 1.3 (unified) to selected 1.18 (unified)
Use load_rc_config() (from rc.subr) instead of sourcing /etc/rc.conf. This allows us or a user to change the configuration file method in one place - rc.subr - without having to edit all of the rc.d/* files.
Revision 1.3 / (download) - annotate - [select for diffs], Sun Apr 30 13:23:33 2000 UTC (23 years, 11 months ago) by lukem
Branch: MAIN
Changes since 1.2: +3 -2
lines
Diff to previous 1.2 (unified) to selected 1.18 (unified)
use extra_commands= instead of using 2nd argument to run_rc_command
Revision 1.2 / (download) - annotate - [select for diffs], Sat Mar 11 20:10:21 2000 UTC (24 years, 1 month ago) by veego
Branch: MAIN
Changes since 1.1: +2 -2
lines
Diff to previous 1.1 (unified) to selected 1.18 (unified)
Add missing checkyesno's.
Revision 1.1.1.1 / (download) - annotate - [select for diffs] (vendor branch), Fri Mar 10 11:53:25 2000 UTC (24 years, 1 month ago) by lukem
Branch: TNF
CVS Tags: rc-d-2000-03-10
Changes since 1.1: +0 -0
lines
Diff to previous 1.1 (unified) to selected 1.18 (unified)
rc.d scripts derived from /etc/rc
Revision 1.1 / (download) - annotate - [select for diffs], Fri Mar 10 11:53:25 2000 UTC (24 years, 1 month ago) by lukem
Branch: MAIN
Diff to selected 1.18 (unified)
Initial revision