release openrc-0.9.2

X-Gentoo-Bug: 380317
X-Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=380317

.gitignore

@@ -1 +1,16 @@
-openrc-0.1.tar.bz2
+*.bz2
+
+*.diff
+*.patch
+*.orig
+*.rej
+
+core
+.gdb_history
+.gdbinit
+
+.depend
+*.a
+*.o
+*.So
+lib*.so

FEATURE-REMOVAL-SCHEDULE

@@ -0,0 +1,49 @@
+The following is a list of files and features that are going to be removed in
+the source tree.  Every entry should contain what exactly is going away, why it
+is happening, and who is going to be doing the work.  When the feature is
+removed, it should also be removed from this file.
+
+---------------------------
+
+What: oldnet ADSL rp-pppoe mode
+
+When: undecided
+
+Why: Replaced by the oldnet PPP module
+
+Who:  Robin H. Johnson <robbat2@gentoo.org>
+
+---------------------------
+
+What: oldnet /etc/conf.d/wireless
+
+When: undecided
+
+Why: All configuration moved to /etc/conf.d/net
+
+Who:  Robin H. Johnson <robbat2@gentoo.org>
+
+---------------------------
+
+What: Service pause action
+
+When: Removed already, compatbility warning in place.
+
+Why: ...
+
+Who:
+
+---------------------------
+
+What: Service --startas, --chuid , --oknodo
+
+When: undecided
+
+Why: Obsolete or replaced by other options.
+	 --startas => use --name or --exec
+	 --chuid => use --user
+	 --oknodo => ignore return code instead
+
+Who:
+
+---------------------------

Makefile

@@ -1,12 +1,22 @@
 # OpenRC Makefile
-# Copyright 2007-2008 Roy Marples 
-# Distributed under the terms of the GNU General Public License v2
+# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
+# Released under the 2-clause BSD license.
 
-NAME=		openrc
-VERSION=	0.1
-PKG=		${NAME}-${VERSION}
+include Makefile.inc
+
+SUBDIR=		conf.d etc init.d local.d man scripts sh src
+
+# Build our old net foo or not
+ifeq (${MKOLDNET},yes)
+SUBDIR+=	net doc
+endif
+
+# Build pkgconfig or not
+MKPKGCONFIG?=	yes
+ifeq (${MKPKGCONFIG},yes)
+SUBDIR+=	pkgconfig
+endif
 
-SUBDIR=		conf.d doc etc init.d man net sh src
 # We need to ensure that runlevels is done last
 SUBDIR+=	runlevels
 
@@ -17,8 +27,9 @@ include ${MK}/sys.mk
 include ${MK}/os.mk
 include ${MK}/subdir.mk
 include ${MK}/dist.mk
-include ${MK}/gitignore.mk
+include ${MK}/git.mk
 
 _installafter:
-	${INSTALL} -d ${DESTDIR}/${PREFIX}/${RC_LIB}/init.d
-	${INSTALL} -d ${DESTDIR}/${PREFIX}/${RC_LIB}/tmp
+	${INSTALL} -d ${DESTDIR}/${LIBEXECDIR}/init.d
+	${INSTALL} -d ${DESTDIR}/${LIBEXECDIR}/tmp
+	${ECHO} "${VERSION}${GITVER}" > ${DESTDIR}/${LIBEXECDIR}/version

Makefile.inc

@@ -0,0 +1,3 @@
+NAME=		openrc
+VERSION=	0.9.2
+PKG=		${NAME}-${VERSION}

README

@@ -4,21 +4,27 @@ OpenRC README
 Installation
 ------------
 make install
-Yup, that simple. Works with GNU make and BSD make.
+Yup, that simple. Works with GNU make.
 
 You may wish to tweak the installation with the below arguments
 PROGLDFLAGS=-static
 LIBNAME=lib64
 DESTDIR=/tmp/openrc-image
 MKPAM=pam
+MKPKGCONFIG=no
+MKRCSYS=prefix
+MKSELINUX=yes
 MKTERMCAP=ncurses
 MKTERMCAP=termcap
+MKOLDNET=yes
 PKG_PREFIX=/usr/pkg
 LOCAL_PREFIX=/usr/local
 PREFIX=/usr/local
 
 We don't support building a static OpenRC with PAM.
 You may need to use PROGLDFLAGS=-Wl,-Bstatic on glibc instead of just -static.
+If you debug memory under valgrind, add -DDEBUG_MEMORY to your CPPFLAGS
+so that all malloc memory should be freed at exit.
 
 You can also brand OpenRC if you so wish like so
 BRANDING=\"Gentoo/$(uname -s)\"
@@ -28,6 +34,20 @@ LOCAL_PREFIX should be set when to where user maintained packages are.
 Only set LOCAL_PREFIX if different from PKG_PREFIX.
 PREFIX should be set when OpenRC is not installed to /.
 
+MKRCSYS should be set only if you need to specify a default system
+subtype. The subtype should be set to match the type of environment the
+file is installed into, not the virtualization the environment is
+capable of handling. Here is a list of subtypes and their meanings.
+
+jail	FreeBSD jail
+lxc	Linux container
+openvz	Linux OpenVZ
+prefix	Linux and *BSD prefix system
+uml	UsermodeLinux
+vserver	Linux vserver
+xen0 Linux and NetBSD xen0 Domain
+xenU Linux and NetBSD xenU Domain
+
 If any of the following files exist then we do not overwrite them
 /etc/devd.conf
 /etc/rc
@@ -37,7 +57,7 @@ If any of the following files exist then we do not overwrite them
 rc and rc.shutdown are the hooks from the BSD init into OpenRC.
 devd.conf is modified from FreeBSD to call /etc/rc.devd which is a generic
 hook into OpenRC.
-inittab is the same, but for SysVInit as used by most Linux distrubtions.
+inittab is the same, but for SysVInit as used by most Linux distributions.
 This can be found in the support folder.
 Obviously, if you're installing this onto a system that does not use OpenRC
 by default then you may wish to backup the above listed files, remove them
@@ -49,19 +69,19 @@ of the system.
 
 
 Reporting Bugs
--------------
-If you installed OpenRC from your chosen distribution, you should report
-bugs directly to them. For example, if you use Gentoo and emerged OpenRC
-then you should reports bugs to http://bugs.gentoo.org.
-
-Otherwise, you can report them directly to me at http://bugs.marples.name
+--------------
+Since Gentoo Linux is hosting OpenRC development, Bugs should go to
+the Gentoo Bugzilla:
+	http://bugs.gentoo.org/
+They should be filed under the "Gentoo Hosted Projects" product and
+the "openrc" component.
 
 
 History - by Roy Marples
 ------------------------
 I became a Gentoo/Linux developer in 2004 and wrote the modular network
 scripts for the Gentoo baselayout package. baselayout is a collection of
-bash scripts to bring up your computer and it's services.
+bash scripts to bring up your computer and its services.
 Then towards the end of 2005 I found myself as the primary maintainer
 for baselayout.
 

README.newnet

@@ -0,0 +1,40 @@
+The following applies only to the newnet stack, which is not presently
+maintained in OpenRC. The oldnet stack is maintained instead.
+- Robin H. Johnson <robbat2@gentoo.org>, 2011/02/21
+
+OpenRC Network Ideals
+---------------------
+
+The new style networking for OpenRC is very simplistic - provide a basic means
+of configuring static interface address and routes whilst allowing the
+possibility to run any command at any point.
+
+In a nutshell, init.d/network is a wrapper around ifconfig(8) and
+init.d/staticroute is wrapper around route(8).
+
+In the Perfect World (TM) ifconfig should be able to configure everything
+about the interface easily * . The BSD family almost get this right and Linux
+epically fails.
+
+* Only static configuration, including link setup.
+For dynamic, static, IPv4LL, arping and per ssid IPv4 setup dhcpcd-5.x
+provides your needs.
+
+It fails because there are many tools to do the same job and often have
+vastly different syntax where they could be similar. In other words, there
+is no coherence.
+
+OpenRC-0.4.x and older (inc Gentoo baselayout-1) had a collection of scripts
+for each tool and allowed a script per interface. Over the years, this design
+has proven very hard to maintain as each user has their own idea of how
+things should work. Also, there were (and still are) race conditions.
+
+So where do we go from here?
+Well, it's possible to use the new network scripts using the tools
+currently available. It's just harder as you have to know them and their
+documentation can be lacking at times.
+The correct end goal is a BSD style ifconfig tool.
+I've started work on it, but the project has stalled somewhat.
+It's display only right now and the source is not yet publicly available.
+If you have the skills and share the vision then contact me privately and
+we'll take it from there.

STYLE

@@ -0,0 +1,85 @@
+This is the openrc style manual.  It governs the coding style of all code
+in this repository.  Follow it.  Contact openrc@gentoo.org for any questions
+or fixes you might notice.
+
+##########
+# C CODE #
+##########
+
+The BSD Kernel Normal Form (KNF) style is used:
+	http://en.wikipedia.org/wiki/Indent_style#BSD_KNF_style
+Basically, it's like K&R/LKML, but wrapped lines that are indented use 4 spaces.
+
+Highlights:
+	- no trailing whitespace
+	- indented code use tabs (not line wrapped)
+	- cuddle the braces (except for functions)
+	- space after native statements and before paren (for/if/while/...)
+	- no space between function and paren
+	- pointer asterisk cuddles the variable, not the type
+
+void foo(int c)
+{
+	int ret = 0;
+
+	if (c > 1000)
+		return;
+
+	while (c--) {
+		bar(c);
+		ret++;
+	}
+
+	return ret;
+}
+
+##################
+# COMMIT MESSAGES #
+##################
+
+The following is an example of a correctly formatted git commit message
+for this repository. Most of this information came from this blog post
+[1], so I would like to thank the author.
+
+### cut here ###
+Capitalized, short (50 chars or less) summary
+
+More detailed explanatory text, if necessary.  Wrap it to about 72
+characters or so.  In some contexts, the first line is treated as the
+subject of an email and the rest of the text as the body.  The blank
+line separating the summary from the body is critical (unless you omit
+the body entirely); tools like rebase can get confused if you run the
+two together.
+
+Write your commit message in the present tense: "Fix bug" and not "Fixed
+bug."  This convention matches up with commit messages generated by
+commands like git merge and git revert.
+
+Further paragraphs come after blank lines.
+
+- Bullet points are okay, too
+
+- Typically a hyphen or asterisk is used for the bullet, preceded by a
+  single space, with blank lines in between, but conventions vary here
+
+- Use a hanging indent
+
+Reported-by: User Name <email>
+X-[Distro]-Bug: BugID
+X-[Distro]-Bug-URL: URL for the bug (on the distribution's web site typically)
+### cut here ###
+
+If you did not write the code and the patch does not include authorship
+information in a format git can use, please use the --author option of the
+git commit command to make the authorship correct.
+
+The Reported-by tag is required if the person who reported the bug is
+different from the author and committer.
+
+  The X-[Distro]-Bug/Bug-URL tags are required if this commit is related
+  to a bug reported to us by a specific distribution   of linux or a
+  *BSD. Also, [Distro] should be replaced with the name of the
+  distribution, e.g. X-Gentoo-Bug.
+
+[1] http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html
+

TODO

@@ -1,3 +1,7 @@
 - ensure all forks block, restore and unblock signals. needs review 
 
 - add support somehow for optional translations
+
+- oldnet[bridging]: Review setting of bridge configuration on dynamic interface add
+
+- Document rc-depend binary.

conf.d.BSD/Makefile

@@ -1,5 +0,0 @@
-DIR=	${CONFDIR}
-CONF=	localmount moused powerd rarpd
-
-MK=	../mk
-include ${MK}/scripts.mk

conf.d.FreeBSD/Makefile

@@ -1,5 +0,0 @@
-DIR=	${CONFDIR}
-CONF=	syscons
-
-MK=	../mk
-include ${MK}/scripts.mk

conf.d.Linux/Makefile

@@ -1,6 +0,0 @@
-DIR=		${CONFDIR}
-CONF=		consolefont keymaps modules
-CONF_APPEND=	clock
-
-MK=		../mk
-include ${MK}/scripts.mk

conf.d.Linux/clock

@@ -1,9 +0,0 @@
-
-# Set clock_adjtime if you wish hwclock to try and handle clock drift.
-# Don't set this if you run a ntp service or anything else that handles
-# clock drift.
-clock_adjtime="NO"
-
-# If you wish to pass any other arguments to hwclock during bootup,
-# you may do so here. Alpha users may wish to use --arc or --srm here.
-clock_args=""

conf.d.Linux/modules

@@ -1,12 +0,0 @@
-# You can define a list modules for a specific kernel version,
-# a released kernel version, a main kernel version or just a list.
-#modules_2_6_23_gentoo_r5="ieee1394 ohci1394"
-#modules_2_6_23="tun ieee1394"
-#modules_2_6="tun"
-#modules="ohci1394"
-
-# Give the modules some arguments if needed.
-# module_ieee1394_args="debug"
-
-# You should consult your kernel documentation and configuration
-# for a list of modules and their options.

conf.d/.gitignore

@@ -0,0 +1,2 @@
+network
+staticroute

conf.d/Makefile

@@ -1,5 +1,19 @@
 DIR=	${CONFDIR}
-CONF=	bootmisc clock fsck hostname local net urandom
+CONF=	bootmisc fsck hostname localmount network staticroute urandom
+
+TARGETS+=	network staticroute
+CLEANFILES+=	network staticroute
 
 MK=	../mk
+include ${MK}/os.mk
+include Makefile.${OS}
 include ${MK}/scripts.mk
+
+SOS?=	BSD
+
+network: network.in network.${SOS}
+	cp $@.in $@
+	[ -e $@.${SOS} ] && cat $@.${SOS} >> $@ || true
+
+staticroute: staticroute.${SOS}
+	cp $@.${SOS} $@

conf.d/Makefile.FreeBSD

@@ -0,0 +1 @@
+CONF+=	ipfw moused powerd rarpd savecore syscons

conf.d/Makefile.Linux

@@ -0,0 +1,2 @@
+CONF+=	consolefont dmesg hwclock keymaps killprocs modules
+SOS=	Linux

conf.d/Makefile.NetBSD

@@ -0,0 +1 @@
+CONF+=	moused rarpd savecore

conf.d/bootmisc

@@ -1,5 +1,5 @@
 # List of /tmp directories we should clean up
-wipe_tmp_dirs="/tmp"
+clean_tmp_dirs="/tmp"
 
 # Should we wipe the tmp paths completely or just selectively remove known
 # locks / files / etc... ?

conf.d/consolefont

@@ -3,7 +3,7 @@
 # you shouldn't specify the trailing ".psf.gz", just the font name below.
 # To use the default console font, comment out the CONSOLEFONT setting below.
 # This setting is used by the /etc/init.d/consolefont script (NOTE: if you do
-# not want to use it, run "rc-update del consolefont" as root).
+# not want to use it, run "rc-update del consolefont boot" as root).
 consolefont="default8x16"
 
 # consoletranslation is the charset map file to use.  Leave commented to use

conf.d/dmesg

@@ -0,0 +1,3 @@
+# Sets the level at which logging of messages is done to the
+# console.  See dmesg(8) for more info.
+dmesg_level="1"

conf.d/fsck

@@ -13,6 +13,11 @@
 #fsck_passno=">1"
 #fsck_passno="<2"
 
+# Most modern fs's don't require a full fsck on boot, but for those that do
+# it may be advisable to skip this when running on battery.
+# WARNING: Do not turn this off if you have any JFS partitions.
+fsck_on_battery="YES"
+
 # fsck_shutdown causes fsck to trigger during shutdown as well as startup.
 # The end result of this is that if any periodic non-root filesystem checks are
 # scheduled, under normal circumstances the actual check will happen during

conf.d/hwclock

@@ -0,0 +1,22 @@
+# Set CLOCK to "UTC" if your Hardware Clock is set to UTC (also known as
+# Greenwich Mean Time).  If that clock is set to the local time, then 
+# set CLOCK to "local".  Note that if you dual boot with Windows, then 
+# you should set it to "local".
+clock="UTC"
+
+# If you want to set the Hardware Clock to the current System Time 
+# (software clock) during shutdown, then say "YES" here.
+# You normally don't need to do this if you run a ntp daemon.
+clock_systohc="NO"
+
+# If you want to set the system time to the current hardware clock
+# during bootup, then say "YES" here. You do not need this if you are
+# running a modern kernel with CONFIG_RTC_HCTOSYS set to y.
+# Also, be aware that if you set this to "NO", the system time will
+# never be saved to the hardware clock unless you set
+# clock_systohc="YES" above.
+clock_hctosys="YES"
+ 
+# If you wish to pass any other arguments to hwclock during bootup,
+# you may do so here. Alpha users may wish to use --arc or --srm here.
+clock_args=""

conf.d/ipfw

@@ -0,0 +1,14 @@
+# ipfw provides a stateful firewall.
+# This means we allow everything out, and if we have a connection we allow it
+# back in. This is very flexable and quite secure.
+
+# For ease of use, we allow auth and ssh ports through as well.
+# To override the list of allowed ports
+#ipfw_ports_in="auth ssh"
+
+# You may want to enable logging of denied connections
+#ipfw_log_deny="YES"
+
+# This ports not logged
+#ipfw_ports_nolog="135-139,445 1026,1027 1433,1434"
+

conf.d/keymaps

@@ -1,9 +1,11 @@
-# Use KEYMAP to specify the default console keymap.  There is a complete tree
+# Use keymap to specify the default console keymap.  There is a complete tree
 # of keymaps in /usr/share/keymaps to choose from.
 keymap="us"
 
 # Should we first load the 'windowkeys' console keymap?  Most x86 users will
 # say "yes" here.  Note that non-x86 users should leave it as "no".
+# Loading this keymap will enable VT switching (like ALT+Left/Right)
+# using the special windows keys on the linux console.
 windowkeys="NO"
 
 # The maps to load for extended keyboards.  Most users will leave this as is.

conf.d/killprocs

@@ -0,0 +1,3 @@
+# If you wish to pass any options to killall5 during shutdown,
+# you should do so here.
+killall5_opts=""

conf.d/local

@@ -1,18 +0,0 @@
-# Here is where you can put anything you need to start
-# that there is not an init script for.
-
-local_start() {
-	# This is a good place to load any misc programs
-	# on startup (use &>/dev/null to hide output)
-
-	# We should always return 0
-	return 0
-}
-
-local_stop() {
-	# This is a good place to unload any misc.
-	# programs you started above.
-	
-	# We should always return 0
-	return 0
-}

conf.d/localmount

@@ -0,0 +1,3 @@
+# Stop the unmounting of certain points.
+# This could be useful for some NFS related work.
+#no_umounts="/dir1:/var/dir2"

conf.d/modules

@@ -0,0 +1,23 @@
+# You can define a list modules for a specific kernel version,
+# a released kernel version, a main kernel version or just a list.
+# The most specific versioned variable will take precedence.
+#modules_2_6_23_gentoo_r5="ieee1394 ohci1394"
+#modules_2_6_23="tun ieee1394"
+#modules_2_6="tun"
+#modules_2="ipv6"
+#modules="ohci1394"
+
+# You can give modules a different name when they load - the new name
+# will also be used to pick arguments below.
+#modules="dummy:dummy1"
+
+# Give the modules some arguments if needed, per version if necessary.
+# Again, the most specific versioned variable will take precedence.
+#module_ieee1394_args="debug"
+#module_ieee1394_args_2_6_23_gentoo_r5="debug2"
+#module_ieee1394_args_2_6_23="debug3"
+#module_ieee1394_args_2_6="debug4"
+#module_ieee1394_args_2="debug5"
+
+# You should consult your kernel documentation and configuration
+# for a list of modules and their options.

conf.d/network.BSD

@@ -0,0 +1,4 @@
+
+# You can assign a default route
+#defaultroute="192.168.0.1"
+#defaultroute6="2001:a:b:c"

conf.d/network.Linux

@@ -0,0 +1,43 @@
+
+# You can assign a default route
+#defaultroute="gw 192.168.0.1"
+#defaultroute6="gw 2001:a:b:c"
+
+# ifconfig under Linux is not that powerful and doesn't easily handle
+# multiple addresses
+# On the other hand, ip (iproute2) is quite powerful and is also supported
+#ip_eth0="192.168.0.10/24; 192.168.10.10/24"
+
+# You can also use ip to add the default route.
+#defaultiproute="via 192.168.0.1"
+#defaultiproute6="via 2001:a:b:c"
+
+# ip doesn't handle MTU like ifconfig, but we can do it like so
+#ifup_eth0="ip link set \$int mtu 1500"
+
+# Create a bonded interface
+#interfaces="bond0"
+#ifup_bond0="modprobe bonding; ifconfig \$int up; ifenslave \$int bge0"
+#ifconfig_bond0="192.168.0.10 netmask 255.255.255.0"
+#ifdown_bond0="rmmod bonding"
+
+# Create tap interface and a bridge interface.
+# We add the tap to the bridge.
+# An external program, like dhcpcd, will configure the IP on the bridge
+#interfaces="tun0 br0"
+#ifup_tun0="tunctl -t \$int"
+#ifdown_tun0="tunctl -d \$int"
+#ifup_br0="brctl addbr \$int; brctl add \$int eth1; brtctl add \$int eth2"
+#ifdown_br0="ifconfig \$int down; btctl delbr \$int"
+
+# Create VLAN
+#interfaces="eth0_2 eth0_3 eth0_4"
+#ifup_eth0="vconfig add \$int 2; vconfig add \$int 3; vconfig add \$int 4"
+#ifconfig_eth0_2="192.168.2.10 netmask 255.255.255.0"
+#ifconfig_eth0_3="192.168.3.10 netmask 255.255.255.0"
+#ifconfig_eth0_4="192.168.4.10 netmask 255.255.255.0"
+#ifdown_eth0="vconfig rem \$int.2; vconfig rem \$int.3; vconfig rem \$int.4"
+
+# Normally you would use wpa_supplicant to configure wireless, but you can
+# use iwconfig also
+#ifup_wlan0="iwconfig \$int key s:secretkey enc open essid foobar"

conf.d/network.in

@@ -0,0 +1,28 @@
+# Assign static IP addresses and run custom scripts per interface.
+# Seperate commands with ;
+# Prefix with ! to run a shell script.
+# Use \$int to represent the interface
+#ifconfig_eth0="192.168.0.10 netmask 255.255.255.0"
+
+# You also have ifup_eth0 and ifdown_eth0 to run other commands when
+# eth0 is started and stopped.
+# You should note that we don't stop the network at system shutdown by default.
+# If you really need this, then set shutdown_network=YES
+
+# Lastly, the interfaces variable pulls in virtual interfaces that cannot
+# be automatically detected.
+#interfaces="br0 bond0 vlan0"
+
+# You can also use files instead of variables here if you like:
+# /etc/ifconfig.eth0 is equivalent to ifconfig_eth0
+# /etc/ip.eth0 is equivalent to ifconfig_eth0
+# /etc/ifup.eth0 is equivalent to ifup_eth0
+# /etc/ifdown.eth0 is equivalent to ifdown_eth0
+# Any files found will automatically be put into the interfaces variable.
+# You don't need to escape variables in files, so use $int instead of \$int.
+
+# If you require DHCP, you should install dhcpcd and it to the boot or
+# default runlevel.
+
+# NIS users can set the domain name here
+#domainname="foobar"

conf.d/savecore

@@ -1,29 +1,25 @@
-# Kernel core dump options for FreeBSD kernel.
-# Unless you're a FreeBSD kernel developer or driver writer then this won't
+# Unless you're a kernel developer or driver writer then this won't
 # be of any interest to you at all.
-
 # The following options allow to configure the kernel's core dump
-# facilities. Please read
-# http://www.freebsd.org/doc/en_US.ISO8859-1/books/developers-handbook/kerneldebug.html
-# for more information about Kernel core dumps and kernel debugging.
+# facilities.
 
-# KERNEL_DUMP_DEVICE variable is used to specify which device will be
+# The dump_device variable is used to specify which device will be
 # used by the kernel to write the dump down. This has to be a swap
 # partition, and has to be at least big enough to contain the whole
 # physical memory (see hw.physmem sysctl(8) variable).
 # When the variable is commented out, no core dump will be enabled for
 # the kernel.
-#KERNEL_DUMP_DEVICE="/dev/ad0s1b"
+#dump_device=/dev/ad0s1b
 
-# KERNEL_DUMP_DIR variable is used to tell savecore(8) utility where
+# The dump_dir variable is used to tell savecore(8) utility where
 # to save the kernel core dump once it's restored from the dump
 # device. If unset, /var/crash will be used, as the default of
 # FreeBSD.
-#KERNEL_DUMP_DIR="/var/crash"
+#dump_dir=/var/crash
 
-# KERNEL_DUMP_COMPRESS variable decide whether to compress with
+# The dump_compress variable decide whether to compress with
 # gzip(1) the dump or leave it of its original size (the size of the
 # physical memory present on the system). If set to yes, the -z option
 # will be passed to savecore(8) that will proceed on compressing the
 # dump.
-#KERNEL_DUMP_COMPRESS="NO"
+#dump_compress=NO

conf.d/staticroute.BSD

@@ -0,0 +1,6 @@
+# Separate multiple routes using ; or new lines.
+# /etc/route.conf(5) takes precedence over this configuration.
+
+# Example static routes. See route(8) for syntax.
+#staticroute="net 192.168.0.0 -netmask 255.255.255.0 10.73.1.1
+#net 192.168.1.0 -netmask 255.255.255.0 10.73.1.1"

conf.d/staticroute.Linux

@@ -0,0 +1,8 @@
+# Separate multiple routes using ; or new lines.
+
+# Example static routes. See route(8) for syntax.
+#staticroute="net 192.168.0.0 netmask 255.255.255.0 gw 10.73.1.1
+#net 192.168.1.0 netmask 255.255.255.0 gw 10.73.1.1"
+
+# Example static routes using iproute2. See ip(8) for syntax.
+#staticiproute="192.168.0.0/24 via 10.73.1.1; 192.168.1.0/24 via 10.73.1.1"

doc.Linux/Makefile

@@ -1,5 +0,0 @@
-DIR=	${DOCDIR}/openrc
-INC=	net.example
-
-MK=	../mk
-include ${MK}/scripts.mk

doc/.gitignore

@@ -0,0 +1 @@
+net.example

doc/Makefile

@@ -2,4 +2,6 @@ DIR=	${DOCDIR}/openrc
 INC=	net.example
 
 MK=	../mk
+include ${MK}/os.mk
+include Makefile.${OS}
 include ${MK}/scripts.mk

doc/Makefile.FreeBSD

@@ -0,0 +1,5 @@
+SRCS+=		net.example.in
+
+.SUFFIXES:	.BSD.in
+.BSD.in:
+	${CP} $< $@

doc/Makefile.Linux

@@ -0,0 +1,5 @@
+SRCS+=		net.example.in
+
+.SUFFIXES:	.Linux.in
+.Linux.in:
+	${CP} $< $@

doc/Makefile.NetBSD

@@ -0,0 +1,5 @@
+SRCS+=		net.example.in
+
+.SUFFIXES:	.BSD.in
+.BSD.in:
+	${CP} $< $@

doc/net.example.BSD.in

@@ -12,7 +12,7 @@
 # kernel then remove the IPv6 address from your config.
 
 # If you want to use a static address or use DHCP explicitly, jump
-# down to the section labelled INTERFACE HANDLERS.
+# down to the section labeled INTERFACE HANDLERS.
 #
 # If you want to do anything more fancy, you should take the time to
 # read through the rest of this file.
@@ -22,10 +22,10 @@
 #
 # We now support modular networking scripts which means we can easily
 # add support for new interface types and modules while keeping
-# compatability with existing ones.
-# 
+# compatibility with existing ones.
+#
 # Modules load by default if the package they need is installed.  If
-# you specify a module here that doesn't have it's package installed
+# you specify a module here that doesn't have its package installed
 # then you get an error stating which package you need to install.
 # Ideally, you only use the modules setting when you have two or more
 # packages installed that supply the same service.
@@ -43,11 +43,6 @@
 #       (eth0:1, eth0:2, etc)
 #       iproute2 does not do this as there is no need to
 #config_eth0="192.168.0.2/24 192.168.0.3/24 192.168.0.4/24"
-# Or you can use sequence expressions
-#config_eth0="192.168.0.{2..4}/24"  FIXME - may not work with baselayout2
-# which does the same as above. Be careful though as if you use this and
-# fallbacks, you have to ensure that both end up with the same number of
-# values otherwise your fallback won't work correctly.
 
 # You can also use IPv6 addresses
 # (you should always specify a prefix length with IPv6 here)
@@ -72,10 +67,12 @@
 # If a specified module fails (like dhcp - see below), you can specify a
 # fallback like so
 #fallback_eth0="192.168.0.2 netmask 255.255.255.0"
-#fallback_route_eth0="default via 192.168.0.1"
+#fallback_routes_eth0="default via 192.168.0.1"
 
 # NOTE: fallback entry must match the entry location in config_eth0
 # As such you can only have one fallback route.
+# Also, if you do not set a fallback_routes entry for an interface, the
+# routes entry will be used if that is set.
 
 # Some users may need to alter the MTU - here's how
 #mtu_eth0="1500"
@@ -87,6 +84,10 @@
 # is how long we wait for carrier. The current default is 3 seconds
 #carrier_timeout_eth0=-1
 
+# You may wish to disable the interface being brought down when stopping.
+# This is only of use for WakeOnLan.
+#ifdown_eth0="NO"
+
 ##############################################################################
 # OPTIONAL MODULES
 
@@ -97,8 +98,8 @@
 #modules="iwconfig"
 
 # ifconfig (iwconig) support is a one shot script - wpa_supplicant is daemon
-# that scans, assoicates and re-configures if assocation is lost.
-# We call it iwconfig to seperate the wireless setup from ifconfig.
+# that scans, associates and re-configures if association is lost.
+# We call it iwconfig to separate the wireless setup from ifconfig.
 ####################################
 # HINTS
 #
@@ -183,7 +184,7 @@
 #dns_servers_001122334455="192.168.0.1 192.168.0.2"
 
 # Map a MAC address to an SSID
-# This is used when the Access Point is not broadcasting it's SSID
+# This is used when the Access Point is not broadcasting its SSID
 # WARNING: This will override the SSID being broadcast due to some
 # Access Points sending an SSID even when they have been configured
 # not to!
@@ -194,7 +195,7 @@
 # This lists the preferred SSIDs to connect to in order
 # SSID's can contain any characters here as they must match the broadcast
 # SSID exactly.
-# Surround each SSID with the " character and seperate them with a space
+# Surround each SSID with the " character and separate them with a space
 # If the first SSID isn't found then it moves onto the next
 # If this isn't defined then it connects to the first one found
 #preferred_aps="SSID1 SSID2"
@@ -209,11 +210,11 @@
 # any other available AP
 # "preferredonly" means it will only connect to visible APs in the preferred
 # list
-# "forcepreferred" means it will forceably connect to APs in order if it does
+# "forcepreferred" means it will forcibly connect to APs in order if it does
 # not find them in a scan
-# "forcepreferredonly" means it forceably connects to the APs in order and
+# "forcepreferredonly" means it forcibly connects to the APs in order and
 # does not bother to scan
-# "forceany" does the same as forcepreferred + connects to any other 
+# "forceany" does the same as forcepreferred + connects to any other
 # available AP
 # Default is "any"
 #associate_order="any"
@@ -238,12 +239,12 @@
 
 ##################################################
 # wpa_supplicant
-# emerge net-wireless/wpa-supplicant
+# emerge net-wireless/wpa_supplicant
 # Wireless options are held in /etc/wpa_supplicant/wpa_supplicant.conf
-# Console the wpa_supplicant.conf.example that is installed in
+# Consult the wpa_supplicant.conf.example that is installed in
 # /usr/share/doc/wpa_supplicant
 
-# By default we don't wait for wpa_suppliant to associate and authenticate.
+# By default we don't wait for wpa_supplicant to associate and authenticate.
 # If you would like to, so can specify how long in seconds
 #associate_timeout_eth0=60
 # A value of 0 means wait forever.
@@ -267,13 +268,13 @@
 # won't have associated then)
 
 # If you're using anything else to configure wireless on your interface AND
-# you have installed wpa_supplicant, you need to disable wpa_supplicant 
+# you have installed wpa_supplicant, you need to disable wpa_supplicant
 #modules="!iwconfig !wpa_supplicant"
 #or
 #modules="!wireless"
 
 ##############################################################################
-# WIRELESS SSID IN VARIABLES 
+# WIRELESS SSID IN VARIABLES
 ##############################################################################
 # Remember to change SSID to your SSID.
 # Say that your SSID is My NET - the line
@@ -321,7 +322,7 @@
 # Set generic DHCP options like so
 #dhcp_eth0="release nodns nontp nonis nogateway nosendhost"
 
-# This tells the dhcp client to release it's lease when it stops, not to
+# This tells the dhcp client to release its lease when it stops, not to
 # overwrite dns, ntp and nis settings, not to set a default route and not to
 # send the current hostname to the dhcp server and when it starts.
 # You can use any combination of the above options - the default is not to
@@ -369,7 +370,7 @@
 
 ##############################################################################
 # ADVANCED CONFIGURATION
-# 
+#
 # Four functions can be defined which will be called surrounding the
 # start/stop operations.  The functions are called with the interface
 # name first so that one function can control multiple adapters. An extra two

doc/net.example.Linux.in

@@ -12,7 +12,7 @@
 # kernel then remove the IPv6 address from your config.
 
 # If you want to use a static address or use DHCP explicitly, jump
-# down to the section labelled INTERFACE HANDLERS.
+# down to the section labeled INTERFACE HANDLERS.
 #
 # If you want to do anything more fancy, you should take the time to
 # read through the rest of this file.
@@ -23,10 +23,10 @@
 #
 # We now support modular networking scripts which means we can easily
 # add support for new interface types and modules while keeping
-# compatability with existing ones.
-# 
+# compatibility with existing ones.
+#
 # Modules load by default if the package they need is installed.  If
-# you specify a module here that doesn't have it's package installed
+# you specify a module here that doesn't have its package installed
 # then you get an error stating which package you need to install.
 # Ideally, you only use the modules setting when you have two or more
 # packages installed that supply the same service.
@@ -49,7 +49,7 @@
 
 ##############################################################################
 # INTERFACE HANDLERS
-# 
+#
 # We provide two interface handlers presently: ifconfig and iproute2.
 # You need one of these to do any kind of network configuration.
 # For ifconfig support, emerge sys-apps/net-tools
@@ -70,11 +70,6 @@
 #       iproute2 does not do this as there is no need to
 #config_eth0="192.168.0.2/24 192.168.0.3/24 192.168.0.4/24"
 # However, that only works with CIDR addresses, so you can't use netmask.
-# Or you can use sequence expressions
-#config_eth0="192.168.0.{2..4}/24"
-# which does the same as above. Be careful though as if you use this and
-# fallbacks, you have to ensure that both end up with the same number of
-# values otherwise your fallback won't work correctly.
 
 # You can also use IPv6 addresses
 # (you should always specify a prefix length with IPv6 here)
@@ -99,10 +94,12 @@
 # If a specified module fails (like dhcp - see below), you can specify a
 # fallback like so
 #fallback_eth0="192.168.0.2/24"
-#fallback_route_eth0="default via 192.168.0.1"
+#fallback_routes_eth0="default via 192.168.0.1"
 
 # NOTE: fallback entry must match the entry location in config_eth0
 # As such you can only have one fallback route.
+# Also, if you do not set a fallback_routes entry for an interface, the
+# routes entry will be used if that is set.
 
 # Some users may need to alter the MTU - here's how
 #mtu_eth0="1500"
@@ -111,7 +108,7 @@
 
 # Each module described below can set a default base metric, lower is
 # preferred over higher. This is so we can prefer a wired route over a
-# wireless route automaticaly. You can override this by setting
+# wireless route automatically. You can override this by setting
 #metric_eth0="100"
 # or on a global basis
 #metric="100"
@@ -120,6 +117,10 @@
 # tables you may have to set a global metric as the due to a simple read of
 # the routing table taking over a minute at a time.
 
+# You may wish to disable the interface being brought down when stopping.
+# This is only of use for WakeOnLan.
+#ifdown_eth0="NO"
+
 ##############################################################################
 # OPTIONAL MODULES
 
@@ -254,7 +255,7 @@
 #key_SSID="s:foobar enc open"
 #key_SSID="1234-5678-9012 enc open"
 
-# You may want to set muliple keys - here's an example
+# You may want to set multiple keys - here's an example
 # It sets 4 keys on the card and instructs to use key 2 by default
 #key_SSID="[1] s:passkey1 key [2] s:passkey2 key [3] s:passkey3 key [4] s:passkey4 key [2]"
 
@@ -284,7 +285,7 @@
 #dns_servers_001122334455="192.168.0.1 192.168.0.2"
 
 # Map a MAC address to an SSID
-# This is used when the Access Point is not broadcasting it's SSID
+# This is used when the Access Point is not broadcasting its SSID
 # WARNING: This will override the SSID being broadcast due to some
 # Access Points sending an SSID even when they have been configured
 # not to!
@@ -295,10 +296,10 @@
 # This lists the preferred SSIDs to connect to in order
 # SSID's can contain any characters here as they must match the broadcast
 # SSID exactly.
-# Surround each SSID with the " character and seperate them with a space
+# Surround each SSID with the " character and separate them with a space
 # If the first SSID isn't found then it moves onto the next
 # If this isn't defined then it connects to the first one found
-#preferred_aps="SSID1 SSID2" 
+#preferred_aps="SSID1 SSID2"
 
 # You can also define a preferred_aps list per interface
 #preferred_aps_eth0="SSID3 SSID4"
@@ -308,9 +309,9 @@
 # "any" means it will connect to visible APs in the preferred list and then any
 # other available AP
 # "preferredonly" means it will only connect to visible APs in the preferred list
-# "forcepreferred" means it will forceably connect to APs in order if it does not find
+# "forcepreferred" means it will forcibly connect to APs in order if it does not find
 # them in a scan
-# "forcepreferredonly" means it forceably connects to the APs in order and does not bother
+# "forcepreferredonly" means it forcibly connects to the APs in order and does not bother
 # to scan
 # "forceany" does the same as forcepreferred + connects to any other available AP
 # Default is "any"
@@ -337,16 +338,16 @@
 
 ############################################################
 # wpa_supplicant
-# emerge net-wireless/wpa-supplicant
+# emerge net-wireless/wpa_supplicant
 # Wireless options are held in /etc/wpa_supplicant/wpa_supplicant.conf
-# Console the wpa_supplicant.conf.example that is installed in
+# Consult the wpa_supplicant.conf.example that is installed in
 # /usr/share/doc/wpa_supplicant
 # To configure wpa_supplicant
 #wpa_supplicant_ath0="-Dmadwifi" # For Atheros based cards
 # Consult wpa_supplicant for more drivers - the default is -Dwext which should
 # work for most cards.
 
-# By default we don't wait for wpa_suppliant to associate and authenticate.
+# By default we don't wait for wpa_supplicant to associate and authenticate.
 # If you need to change this behaviour then you don't know how our scripts work
 # and setting this value could cause strange things to happen.
 # If you would like to, so can specify how long in seconds.
@@ -372,13 +373,13 @@
 # won't have associated then)
 
 # If you're using anything else to configure wireless on your interface AND
-# you have installed wpa_supplicant, you need to disable wpa_supplicant 
+# you have installed wpa_supplicant, you need to disable wpa_supplicant
 #modules="!iwconfig !wpa_supplicant"
 #or
 #modules="!wireless"
 
 ##############################################################################
-# WIRELESS SSID IN VARIABLES 
+# WIRELESS SSID IN VARIABLES
 ##############################################################################
 # Remember to change SSID to your SSID.
 # Say that your SSID is My NET - the line
@@ -413,7 +414,7 @@
 # dhclient: emerge net-misc/dhcp
 # dhcpcd:   emerge net-misc/dhcpcd
 # pump:     emerge net-misc/pump
-# udhcpc:   emerge net-misc/udhcp
+# udhcpc:   emerge sys-apps/busybox
 
 # If you have more than one DHCP client installed, you need to specify which
 # one to use - otherwise we default to dhcpcd if available.
@@ -422,7 +423,7 @@
 # Notes:
 # - All clients send the current hostname to the DHCP server by default
 # - dhcpcd does not daemonize when the lease time is infinite
-# - udhcp-0.9.3-r3 and earlier do not support getting NTP servers 
+# - udhcp-0.9.3-r3 and earlier do not support getting NTP servers
 # - pump does not support getting NIS servers
 # - DHCP tends to erase any existing device information - so add
 #   static addresses after dhcp if you need them
@@ -449,7 +450,7 @@
 # Set generic DHCP options like so
 #dhcp_eth0="release nodns nontp nonis nogateway nosendhost"
 
-# This tells the dhcp client to release it's lease when it stops, not to
+# This tells the dhcp client to release its lease when it stops, not to
 # overwrite dns, ntp and nis settings, not to set a default route and not to
 # send the current hostname to the dhcp server and when it starts.
 # You can use any combination of the above options - the default is not to
@@ -468,7 +469,7 @@
 #fallback_eth0="apipa"
 
 #-----------------------------------------------------------------------------
-# ARPING Gateway configuration 
+# ARPING Gateway configuration
 # and
 # Automatic Private IP Addressing (APIPA)
 # For arpingnet / apipa support, emerge net-misc/iputils or net-analyzer/arping
@@ -528,7 +529,8 @@
 
 #-----------------------------------------------------------------------------
 # VLAN (802.1q support)
-# For VLAN support, emerge net-misc/vconfig
+# For VLAN support, emerge sys-apps/iproute2
+# The old vconfig based VLAN support is no longer available.
 
 # Specify the VLAN numbers for the interface like so
 # Please ensure your VLAN IDs are NOT zero-padded
@@ -538,10 +540,27 @@
 # need it up.
 #config_eth0="null"
 
-# You can also configure the VLAN - see for vconfig man page for more details
-#vconfig_eth0="set_name_type VLAN_PLUS_VID_NO_PAD"
-#vconfig_vlan1="set_flag 1
-#set_egress_map 2 6"
+# You can also configure the VLAN - see for ip man page for more details
+# To change the vlan interface name. If not set, the standard "iface.vlanid"
+# will be used. This is the replacement for the old 'vconfig set_name_type'
+# functionality.
+#vlan1_name="vlan1"
+#vlan2_name="eth0.2"
+
+# The following shows the old set_name_type setting and what new option to set:
+# Using eth9 & VLAN VID 26 as an example.
+# VLAN_PLUS_VID         vlan26_name="vlan0026"
+# VLAN_PLUS_VID_NO_PAD  vlan26_name="vlan26"
+# DEV_PLUS_VID          vlan26_name="eth9.0026"
+# DEV_PLUS_VID_NO_PAD   vlan26_name="eth9.26"
+
+# Set the vlan flags
+#vlan1_flags="reorder_hdr off gvrp on loose_binding on"
+
+# Configure in/egress maps
+#vlan1_ingress="2:6 3:5"
+#vlan1_egress="1:2"
+
 #config_vlan1="172.16.3.1/23"
 #config_vlan2="172.16.2.1/23"
 
@@ -554,8 +573,7 @@
 # This means you do not need to create init scripts in /etc/init.d for each
 # vlan, you must need to create one for the physical interface.
 # If you wish to control the configuration of each vlan through a separate
-# script, or wish to rename the vlan interface to something that vconfig
-# cannot then you need to do this.
+# script then you need to do this.
 #vlan_start_eth0="no"
 
 # If you do the above then you may want to depend on eth0 like so
@@ -565,19 +583,25 @@
 
 #-----------------------------------------------------------------------------
 # Bonding
-# For link bonding/trunking emerge net-misc/ifenslave
+# For link bonding/trunking on 2.4 kernels, or kernels without sysfs
+# emerge net-misc/ifenslave
 
 # To bond interfaces together
 #slaves_bond0="eth0 eth1 eth2"
 #config_bond0="null" # You may not want to assign an IP the the bond
 
+# You can also configure the bond here, which must be done via sysfs on 2.6
+# kernels or newer. See the kernel bonding documentation for a description of
+# these options.
+#arp_ip_target_bond0="+26.0.0.0"
+
 # If any of the slaves require extra configuration - for example wireless or
 # ppp devices - we need to depend function on the bonded interfaces
 #rc_need_bond0="net.eth0 net.eth1"
 
 
 #-----------------------------------------------------------------------------
-# Classical IP over ATM 
+# Classical IP over ATM
 # For CLIP support emerge net-dialup/linux-atm
 
 # Ensure that you have /etc/atmsigd.conf setup correctly
@@ -615,7 +639,7 @@
 #
 # Here you should specify what pppd plugins you want to use
 # Available plugins are: pppoe, pppoa, capi, dhcpc, minconn, radius,
-#			 radattr, radrealms and winbind 
+#			 radattr, radrealms and winbind
 #plugins_ppp0="pppoe"			# Required plugin for PPPoE
 #plugins_ppp0="pppoa vc-encaps"		# Required plugin for PPPoA with an option
 #plugins_ppp0="capi"			# Required plugin for ISDN
@@ -653,9 +677,9 @@
 #
 # Dead peer detection
 #	lcp-echo-interval 15	# Send a LCP echo every 15 seconds
-#	lcp-echo-failure 3	# Make peer dead after 3 consective
+#	lcp-echo-failure 3	# Make peer dead after 3 consecutive
 #				# echo-requests
-#	
+#
 # Compression options - use these to completely disable compression
 #	noaccomp noccp nobsdcomp nodeflate nopcomp novj novjccomp
 #
@@ -782,11 +806,18 @@
 #bridge_add_eth0="br0"
 #bridge_add_eth1="br0"
 
-# You need to configure the ports to null values so dhcp does not get started 
+# NOTE: If you want to manually start an empty bridge, and then dynamically add
+# ports to it you must set at least one of the following variables based on the
+# interface name, so that we can pick it up from your configuration. Even an
+# empty value variable is fine, but at least one of them must be set:
+# brctl_IFVAR
+
+# You need to configure the ports to null values so dhcp does not get started
 #config_eth0="null"
 #config_eth1="null"
 
-# Finally give the bridge an address - dhcp or a static IP
+# Finally give the bridge an address - dhcp or a static IP, this is assigned to
+# the bridge when the bridge is explicitly started.
 #config_br0="dhcp" # may not work when adding ports dynamically
 #config_br0="192.168.0.1/24"
 
@@ -800,8 +831,15 @@
 #sethello 0
 #stp off"
 
+# You can also configure the bridge or bridge members via sysfs on 2.6 kernels
+# or newer. See the kernel bridge documentation for a description of these
+# options.
+#stp_state_br0="0"
+#forward_delay_br0="10"
+#hairpin_mode_eth0="1"
+
 #-----------------------------------------------------------------------------
-# RFC 2684 Bridge Support 
+# RFC 2684 Bridge Support
 # For RFC 2684 bridge support emerge net-misc/br2684ctl
 
 # Interface names have to be of the form nas0, nas1, nas2, etc.
@@ -817,8 +855,8 @@
 #config_nas0="'192.168.0.1/24'"
 
 #-----------------------------------------------------------------------------
-# Tunnelling
-# WARNING: For tunnelling it is highly recommended that you
+# Tunneling
+# WARNING: For tunneling it is highly recommended that you
 # emerge sys-apps/iproute2
 #
 # For GRE tunnels
@@ -833,7 +871,7 @@
 
 # 6to4 Tunnels allow IPv6 to work over IPv4 addresses, provided you
 # have a non-private address configured on an interface.
-# link_6to4="eth0"		# Interface to base it's addresses on
+# link_6to4="eth0"		# Interface to base its addresses on
 # config_6to4="ip6to4"
 # You may want to depend on eth0 like so
 #rc_need_6to4="net.eth0"
@@ -843,10 +881,56 @@
 # sit0 - otherwise use a different name like 6to4 in the example above.
 
 # You can also specify a relay and suffix if you like.
-# The default relay is 192.88.99.1 and the defualt suffix is :1
+# The default relay is 192.88.99.1 and the default suffix is :1
 #relay_6to4="192.168.3.2"
 #suffix_6to4=":ff"
 
+#-----------------------------------------------------------------------------
+# Advanced Routing
+# WARNING: For advanced routing you MUST be using sys-apps/iproute2
+#
+# This provides a means to do multi-homing and more using the Routing Policy
+# Database (RPDB).
+#
+# See the following links for background and more information.
+# http://linux-ip.net/html/ch-routing.html
+# http://linux-ip.net/html/ch-advanced-routing.html
+
+# The rules listed will be added with 'ip rule add LINE' when the interface is
+# being brought up. They will also be removed with 'ip rule delete LINE'.
+# The rules added are also stored for later removal, so if you alter your rules
+# directly before stopping, you should review your rules again after stopping.
+
+# Note in earlier versions of openrc, this was provided as an example in
+# postup/postdown, however that implementation suffered some bugs in corner
+# cases, which are now fixed with this merger. If you used the previous
+# example, you should only need to drop the relevent portions of your
+# postup/postdown functions, and review the quoting in your rules_IFACE
+# variables.
+
+# Below is a trivial example for a dual-homed connection where there is an OOB
+# management network. Only packets explicitly with an address from or to the
+# OOB are sent via eth0. All others go via eth1 as the eth1 rules have a lower
+# priority.
+
+# If you want to use names for your tables, you should put lines into
+# /etc/iproute2/rt_tables, an example follows:
+# 2 oob
+# 3 external
+
+#rules_eth0="
+#from ZZZ.ZZZ.200.128/27 table oob priority 500
+#to ZZZ.ZZZ.200.128/27 table oob priority 550"
+#rules_eth1="
+#from XXX.XXX.112.0/24 table external priority 400
+#to XXX.XXX.112.0/24 table external priority 450"
+#routes_eth0="
+#ZZZ.ZZZ.200.128/27 dev eth0 table oob scope link
+#default via ZZZ.ZZZ.200.129 table oob"
+#routes_eth1="
+#XXX.XXX.112.0/24 dev eth1 table external scope link
+#default via XXX.XXX.112.1 dev eth1"
+
 
 #-----------------------------------------------------------------------------
 # System
@@ -891,10 +975,12 @@
 # and you're done :)
 
 # By default we don't wait for netplug/ifplugd to configure the interface.
-# If you would like it to wait so that other services now that network is up
-# then you can specify a timeout here.
+# If you would like it to wait so that other services know that network is
+# up then you can specify a timeout here. A value of 0 means wait forever,
+# and a negative value means never wait.
+#plug_timeout_eth0="10"
+# If you want to set it for all interfaces:
 #plug_timeout="10"
-# A value of 0 means wait forever.
 
 # If you don't want to use netplug on a specific interface but you have it
 # installed, you can disable it for that interface via the modules statement
@@ -908,9 +994,75 @@
 #ifplugd_eth0="--api-mode=wlan"
 # man ifplugd for more options
 
+#-----------------------------------------------------------------------------
+# Interface hardware tuning & configuration via ethtool
+# If you need to change explicit hardware settings on your network card prior
+# to bringing the interface up, the following is available.
+#
+# For a full listing of settings, please consulting ethtool(8) and the output
+# of "ethtool --help".
+#
+# Multiple entries (seperated by newlines) are supported in all of the
+# variables as some settings cannot be changed at the same time.
+#
+# Valid variable name fragments: change pause coalesce ring offload
+# change_eeprom identify nfc flash rxfh_indir ntuple
+
+# Set Wake-On-Lan to listen for SecureOn MagicPacket(tm), the message level to
+# notify us of WOL changes, and the SecureOn password to 'DE:AD:BE:EF:CA:FE'.
+#ethtool_change_eth0="wol gs
+#msglvl wol on
+#sopass DE:AD:BE:EF:CA:FE"
+
+# Disable pause auto-negotiation and explicitly enable RX and TX pause.
+#ethtool_pause_eth0="autoneg off
+#rx on tx on"
+
+# Enasble adaptive RX and TX coalescing
+#ethtool_coalesce_eth0="adaptive-rx on adaptive-tx on"
+
+# Change ring buffer settings
+#ethtool_ring_eth0=""
+
+# Enable all offload settings
+#ethtool_offload_eth0="rx on tx on sg on tso on ufo on gso on gro on lro on"
+
+# Change specific bytes in the EEPROM
+#ethtool_change_eeprom_eth0=""
+
+# Run the identify sequence on the interface for 1 second (does not return until completion)
+#ethtool_identify_eth0="1"
+
+# Configure receive network flow classification
+#ethtool_nfc_eth0="
+#rx-flow-hash tcp4 f
+#rx-flow-hash udp4 s"
+
+# Flash firmware to all regions
+#ethtool_flash_eth0="/some/path/firmware1 0"
+
+# Flash firmware to region 1
+#ethtool_flash_eth0="/some/path/firmware2 1"
+
+# Set receive flow hash indirection table for even balancing between N receive queues
+#ethtool_rxfh_indir_eth0="equal 4"
+
+# Configure Rx ntuple filters and actions
+#ethtool_ntuple_eth0=""
+
+# Additionally, there is a special control variable, if you need to change the
+# order of option processing. The default order is:
+# flash change-eeprom change pause coalesce ring offload identify nfc rxfh-indir ntuple
+
+# Set global order to default
+#ethtool_order="flash change-eeprom change pause coalesce ring offload identify nfc rxfh-indir ntuple"
+
+# Hypothetical network card that requires a change-eeprom toggle to enable flashing
+#ethtool_order_eth0="change-eeprom flash change pause coalesce ring offload nfc rxfh-indir ntuple"
+
 ##############################################################################
 # ADVANCED CONFIGURATION
-# 
+#
 # Four functions can be defined which will be called surrounding the
 # start/stop operations.  The functions are called with the interface
 # name first so that one function can control multiple adapters. An extra two
@@ -931,12 +1083,12 @@
 
 #preup() {
 #	# Test for link on the interface prior to bringing it up.  This
-#	# only works on some network adapters and requires the mii-diag
-#	# package to be installed.
+#	# only works on some network adapters and requires the
+#	# sys-apps/net-tools package to be installed.
 #	if mii-tool "${IFACE}" 2> /dev/null | grep -q 'no link'; then
 #		ewarn "No link on ${IFACE}, aborting configuration"
 #		return 1
-#	fi 
+#	fi
 #
 #	# Test for link on the interface prior to bringing it up.  This
 #	# only works on some network adapters and requires the ethtool
@@ -975,55 +1127,13 @@
 #	# This function could be used, for example, to register with a
 #	# dynamic DNS service.  Another possibility would be to
 #	# send/receive mail once the interface is brought up.
-
-#	# Here is an example that allows the use of iproute rules
-#	# which have been configured using the rules_eth0 variable.
-#	#rules_eth0=" \
-#	#	'from 24.80.102.112/32 to 192.168.1.0/24 table localnet priority 100' \
-#	#	'from 216.113.223.51/32 to 192.168.1.0/24 table localnet priority 100' \
-#	#"
-#	eval set -- $\rules_${IFVAR}
-#	if [ $# != 0 ]; then
-#		einfo "Adding IP policy routing rules"
-#		eindent
-#		# Ensure that the kernel supports policy routing
-#		if ! ip rule list | grep -q "^"; then
-#			eerror "You need to enable IP Policy Routing (CONFIG_IP_MULTIPLE_TABLES)"
-#			eerror "in your kernel to use ip rules"
-#		else
-#			for x; do
-#				ebegin "${x}"
-#				ip rule add ${x} dev "${IFACE}"
-#				eend $?
-#			done
-#		fi
-#		eoutdent
-#		# Flush the cache
-#		ip route flush cache dev "${IFACE}"
-#	fi
-
 #}
 
 #postdown() {
 #	# Enable Wake-On-LAN for every interface except for lo
-#	# Probably a good idea to set RC_DOWN_INTERFACE="no" in /etc/conf.d/rc
+#	# Probably a good idea to set ifdown="no" in /etc/conf.d/net
 #	# as well ;)
 #	[ "${IFACE}" != "lo" ] && ethtool -s "${IFACE}" wol g
-
-#	Automatically erase any ip rules created in the example postup above
-#	if interface_exists "${IFACE}"; then
-#		# Remove any rules for this interface
-#		local rule
-#		ip rule list | grep " iif ${IFACE}[ ]*" | {
-#			while read rule; do
-#				rule="${rule#*:}"	
-#				ip rule del ${rule}
-#			done
-#		}
-#		# Flush the route cache
-#		ip route flush cache dev "${IFACE}"
-#	fi
-
 #	# Return 0 always
 #	return 0
 #}

etc.BSD/Makefile

@@ -1,10 +0,0 @@
-DIR=		${SYSCONFDIR}
-CONF=		rc rc.shutdown
-
-MK=		../mk
-include ${MK}/scripts.mk
-include Makefile.${OS}
-
-.SUFFIXES:	.in
-.in:
-	sed -e 's:@SHELL@:${SHELL}:' -e 's:@TERM@:${DEFTERM}:' $< > $@

etc.BSD/Makefile.FreeBSD

@@ -1 +0,0 @@
-DEFTERM=	cons25

etc.BSD/Makefile.NetBSD

@@ -1 +0,0 @@
-DEFTERM=	wsvt25

etc.BSD/rc.in

@@ -1,22 +0,0 @@
-#!@SHELL@
-# Copyright 2007-2008 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
-
-# If $TERM is not set then assume default of @TERM@
-# This gives us a nice colour boot :)
-[ -z "$TERM" -o "$TERM" = "dumb" ] && export TERM="@TERM@"
-
-# Handle interrupts 
-trap : SIGINT
-trap "echo 'Boot interrupted'; exit 1" SIGQUIT
-
-# BSD's init works somewhat differently to sysvinit.
-# This block should 'translate' from the way init calls it to the way it would
-# be called by sysvinit on linux.
-RUNLEVEL="1" /sbin/rc sysinit || exit 1
-RUNLEVEL="1" /sbin/rc boot || exit 1
-PREVLEVEL="1" /sbin/rc default
-
-# We don't actually care if rc default worked or not, we should exit 0
-# to allow logins
-exit 0

etc.BSD/rc.shutdown.in

@@ -1,26 +0,0 @@
-#!@SHELL@
-# Copyright 2007-2008 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
-
-# Handle interrupts 
-trap : SIGINT SIGQUIT
-
-# Try and use stuff in /lib over anywhere else so we can shutdown
-# local mounts correctly.
-export LD_LIBRARY_PATH="/lib${LD_LIBRARY_PATH:+:}${LDLIBRARY_PATH}"
-
-# If $TERM is not set then assume default of @TERM@
-# This gives us a nice colour boot :)
-[ -z "$TERM" -o "$TERM" = "dumb" ] && export TERM="@TERM@"
-
-action=${1:-shutdown}
-
-# BSD's init works somewhat differently to sysvinit.
-# This block should 'translate' from the way init calls it to the way it would
-# be called by sysvinit on linux.
-case "${action}" in
-	reboot) 	export RUNLEVEL=6;;
-	single)		export RUNLEVEL=S;;
-	*)		export RUNLEVEL=0;;
-esac
-exec /sbin/rc "${action}"

etc.FreeBSD/Makefile

@@ -1,6 +0,0 @@
-DIR=	/etc
-CONF=	devd.conf
-BIN=	rc.devd
-
-MK=	../mk
-include ${MK}/scripts.mk

etc.Linux/Makefile

@@ -1,5 +0,0 @@
-DIR=		${SYSCONFDIR}
-CONF_APPEND=	rc.conf
-
-MK=		../mk
-include ${MK}/scripts.mk

etc.Linux/rc.conf

@@ -1,25 +0,0 @@
-
-##############################################################################
-# LINUX SPECIFIC OPTIONS
-
-# This is the number of tty's used in most of the rc-scripts (like
-# consolefont, numlock, etc ...)
-rc_tty_number=12
-
-# Use this variable to control the /dev management behavior.
-#  devfs  - use devfs (requires sys-fs/devfsd)
-#  mdev   - use mdev (requires sys-apps/busybox)
-#  udev   - use udev (requires sys-fs/udev)
-#  static - let the user manage /dev (YOU need to create ALL device nodes)
-# Leave it blank to let rc work it out (udev, mdev, devfs, static)
-#rc_devices=""
-
-# UDEV OPTION:
-# Set to "yes" if you want to save /dev to a tarball on shutdown
-# and restore it on startup.  This is useful if you have a lot of
-# custom device nodes that udev does not handle/know about.
-rc_device_tarball="NO"
-
-# Sets the level at which logging of messages is done to the
-# console.  See dmesg(8) for more info.
-dmesg_level="1"

etc/.gitignore

@@ -1,2 +1,3 @@
+rc.conf
 rc
 rc.shutdown

etc/Makefile

@@ -1,5 +1,21 @@
 DIR=	${SYSCONFDIR}
 CONF=	rc.conf
 
+CLEANFILES+=	rc.conf
+
 MK=	../mk
+include ${MK}/os.mk
+include Makefile.${OS}
 include ${MK}/scripts.mk
+
+# We can't use "ifndef" here because that treats set-but-empty
+# as not-set which is not what we want
+MKRCSYS ?= automagicplease
+ifeq ($(MKRCSYS),automagicplease)
+# If the user isn't picking a default, then have the
+# config go with runtime automagic detection #357247
+rc.conf: SED_EXTRA += -e '/^rc_sys=""/s:^:\#:'
+MKRCSYS =
+endif
+rc.conf: rc.conf.in rc.conf.${OS}
+	${SED} ${SED_REPLACE} ${SED_EXTRA} $^ > $@

etc/Makefile.FreeBSD

@@ -0,0 +1,4 @@
+SED_EXTRA=	-e 's:@TERM@:cons25:g'
+SRCS+=		rc.conf.in rc.in rc.shutdown.in
+CONF+=		devd.conf
+BIN+=		rc rc.shutdown rc.devd

etc/Makefile.Linux

@@ -0,0 +1,2 @@
+SED_EXTRA=	-e 's:@TERM@:wsvt25:g'
+SRCS+=		rc.conf.in rc.in rc.shutdown.in

etc/Makefile.NetBSD

@@ -0,0 +1,3 @@
+SED_EXTRA=	-e 's:@TERM@:wsvt25:g'
+SRCS+=		rc.conf.in rc.in rc.shutdown.in
+BIN+=		rc rc.shutdown

etc/rc.conf

@@ -1,91 +0,0 @@
-# Global OpenRC configuration settings
-
-# Set to "YES" if you want the rc system to try and start services
-# in parallel for a slight speed improvement. When running in parallel we
-# prefix the service output with it's name as the output will get
-# jumbled up.
-rc_parallel="NO"
-
-# Set rc_interactive to "YES" and you'll be able to press the I key during
-# boot so you can choose to start specific services. Set to "NO" to disable
-# this feature.
-rc_interactive="YES"
-
-# Do we allow any started service in the runlevel to satisfy the depedency
-# or do we want all of them regardless of state? For example, if net.eth0
-# and net.eth1 are in the default runlevel then with rc_depend_strict="NO"
-# both will be started, but services that depend on 'net' will work if either
-# one comes up. With rc_depend_strict="YES" we would require them both to
-# come up.
-rc_depend_strict="YES"
-
-# Do we allow services to be hotplugged? If not, set to rc_hotplug="NO"
-# NOTE: This does not affect anything hotplug/udev/devd related, just the
-# starting/stopping of the init.d service triggered by it.
-rc_hotplug="YES"
-
-# Dynamic /dev managers can trigger coldplug events which cause services to
-# start before we are ready for them. If this happens, we can defer these
-# services to start in the boot runlevel. Set rc_coldplug="NO" if you don't
-# want this.
-# NOTE: This also affects module coldplugging in udev-096 and higher
-# If you want module coldplugging but not coldplugging of services then you
-# can set rc_coldplug="YES" and rc_plug_services="!*"
-rc_coldplug="YES"
-
-# Some people want a finer grain over hotplug/coldplug. rc_plug_services is a
-# list of services that are matched in order, either allowing or not. By
-# default we allow services through as rc_coldplug/rc_hotplug has to be YES
-# anyway.
-# Example - rc_plug_services="net.wlan !net.*"
-# This allows net.wlan and any service not matching net.* to be plugged.
-rc_plug_services=""
-
-# rc_logger launches a logging daemon to log the entire rc process to
-# /var/log/rc.log
-rc_logger="NO"
-
-# By default we filter the environment for our running scripts. To allow other
-# variables through, add them here. Use a * to allow all variables through.
-# rc_env_allow="VAR1 VAR2"
-
-##############################################################################
-# MISC CONFIGURATION VARIABLES
-# There variables are shared between many init scripts
-
-# Set unicode to YES to turn on unicode support for keyboards and screens.
-unicode="NO"
-
-# Network fstypes. Below is the default.
-net_fs_list="afs cifs coda davfs fuse gfs ncpfs nfs nfs4 ocfs2 shfs smbfs"
-
-##############################################################################
-# SERVICE CONFIGURATION VARIABLES
-# These variables are documented here, but should be configured in
-# /etc/conf.d/foo for service foo and NOT enabled here unless you
-# really want them to work on a global basis.
-
-# Some daemons are started and stopped via start-stop-daemon.
-# We can set some things on a per service basis, like the nicelevel.
-#export SSD_NICELEVEL="-19"
-
-# Pass ulimit parameters 
-#rc_ulimit="-u 30"
-
-# It's possible to define extra dependencies for services like so
-#rc_config="/etc/foo"
-#rc_need="openvpn"
-#rc_use="net.eth0"
-#rc_after="clock"
-#rc_before="local"
-#rc_provide="!net"
-
-# You can also enable the above commands here for each service. Below is an
-# example for service foo.
-#rc_foo_config="/etc/foo"
-#rc_foo_need="openvpn"
-#rc_foo_after="clock"
-
-# You can also remove dependencies.
-# This is mainly used for saying which servies do NOT provide net.
-#rc_net_tap0_provide="!net"

etc/rc.conf.FreeBSD

@@ -0,0 +1,14 @@
+##############################################################################
+# FreeBSD SPECIFIC OPTIONS
+
+# This is the subsystem type. Valid options on FreeBSD:
+# ""        - nothing special
+# "jail"    - FreeBSD jails
+# "prefix"  - Prefix
+# If this is commented out, automatic detection will be attempted.
+# Note that automatic detection does not work in a prefix environment.
+#
+# This should be set to the value representing the environment this file is
+# PRESENTLY in, not the virtualization the environment is capable of.
+rc_sys="@RC_SYS_DEFAULT@"
+

etc/rc.conf.Linux

@@ -0,0 +1,24 @@
+##############################################################################
+# LINUX SPECIFIC OPTIONS
+
+# This is the subsystem type. Valid options on Linux:
+# ""        - nothing special
+# "lxc"     - Linux Containers
+# "openvz"  - Linux OpenVZ
+# "prefix"  - Prefix
+# "uml"     - Usermode Linux
+# "vserver" - Linux vserver
+# "xen0"    - Xen0 Domain
+# "xenU"    - XenU Domain
+# If this is commented out, automatic detection will be attempted.
+# Note that autodetection will not work in a prefix environment or in a
+# linux container.
+#
+# This should be set to the value representing the environment this file is
+# PRESENTLY in, not the virtualization the environment is capable of.
+rc_sys="@RC_SYS_DEFAULT@"
+
+# This is the number of tty's used in most of the rc-scripts (like
+# consolefont, numlock, etc ...)
+rc_tty_number=12
+

etc/rc.conf.NetBSD

@@ -0,0 +1,15 @@
+##############################################################################
+# NetBSD SPECIFIC OPTIONS
+
+# This is the subsystem type. Valid options on NetBSD:
+# ""        - nothing special
+# "prefix"  - Prefix
+# "xen0"    - Xen0 Domain
+# "xenU"    - XenU Domain
+# If this is commented out, automatic detection will be attempted.
+# Note that automatic detection does not work in a prefix environment.
+#
+# This should be set to the value representing the environment this file is
+# PRESENTLY in, not the virtualization the environment is capable of.
+rc_sys="@RC_SYS_DEFAULT@"
+

etc/rc.conf.in

@@ -0,0 +1,122 @@
+# Global OpenRC configuration settings
+
+# Set to "YES" if you want the rc system to try and start services
+# in parallel for a slight speed improvement. When running in parallel we
+# prefix the service output with its name as the output will get
+# jumbled up.
+# WARNING: whilst we have improved parallel, it can still potentially lock
+# the boot process. Don't file bugs about this unless you can supply
+# patches that fix it without breaking other things!
+#rc_parallel="NO"
+
+# Set rc_interactive to "YES" and you'll be able to press the I key during
+# boot so you can choose to start specific services. Set to "NO" to disable
+# this feature. This feature is automatically disabled if rc_parallel is
+# set to YES.
+#rc_interactive="YES"
+
+# If we need to drop to a shell, you can specify it here.
+# If not specified we use $SHELL, otherwise the one specified in /etc/passwd,
+# otherwise /bin/sh
+# Linux users could specify /sbin/sulogin
+#rc_shell=/bin/sh
+
+# Do we allow any started service in the runlevel to satisfy the dependency
+# or do we want all of them regardless of state? For example, if net.eth0
+# and net.eth1 are in the default runlevel then with rc_depend_strict="NO"
+# both will be started, but services that depend on 'net' will work if either
+# one comes up. With rc_depend_strict="YES" we would require them both to
+# come up.
+#rc_depend_strict="YES"
+
+# rc_hotplug is a list of services that we allow to be hotplugged.
+# By default we do not allow hotplugging.
+# A hotplugged service is one started by a dynamic dev manager when a matching
+# hardware device is found.
+# This service is intrinsically included in the boot runlevel.
+# To disable services, prefix with a !
+# Example - rc_hotplug="net.wlan !net.*"
+# This allows net.wlan and any service not matching net.* to be plugged.
+# Example - rc_hotplug="*"
+# This allows all services to be hotplugged
+#rc_hotplug="*"
+
+# rc_logger launches a logging daemon to log the entire rc process to
+# /var/log/rc.log
+# NOTE: Linux systems require the devfs service to be started before
+# logging can take place and as such cannot log the sysinit runlevel.
+#rc_logger="YES"
+
+# Through rc_log_path you can specify a custom log file.
+# The default value is: /var/log/rc.log
+#rc_log_path="/var/log/rc.log"
+
+# By default we filter the environment for our running scripts. To allow other
+# variables through, add them here. Use a * to allow all variables through.
+#rc_env_allow="VAR1 VAR2"
+
+# By default we assume that all daemons will start correctly.
+# However, some do not - a classic example is that they fork and return 0 AND
+# then child barfs on a configuration error. Or the daemon has a bug and the
+# child crashes. You can set the number of milliseconds start-stop-daemon
+# waits to check that the daemon is still running after starting here.
+# The default is 0 - no checking.
+#rc_start_wait=100
+
+# rc_nostop is a list of services which will not stop when changing runlevels.
+# This still allows the service itself to be stopped when called directly.
+#rc_nostop=""
+
+# rc will attempt to start crashed services by default.
+# However, it will not stop them by default as that could bring down other
+# critical services.
+#rc_crashed_stop=NO
+#rc_crashed_start=YES
+
+##############################################################################
+# MISC CONFIGURATION VARIABLES
+# There variables are shared between many init scripts
+
+# Set unicode to YES to turn on unicode support for keyboards and screens.
+#unicode="NO"
+
+# Below is the default list of network fstypes.
+#
+# afs cifs coda davfs fuse fuse.sshfs gfs glusterfs lustre ncpfs
+# nfs nfs4 ocfs2 shfs smbfs
+#
+# If you would like to add to this list, you can do so by adding your
+# own fstypes to the following variable.
+#extra_net_fs_list=""
+
+##############################################################################
+# SERVICE CONFIGURATION VARIABLES
+# These variables are documented here, but should be configured in
+# /etc/conf.d/foo for service foo and NOT enabled here unless you
+# really want them to work on a global basis.
+
+# Some daemons are started and stopped via start-stop-daemon.
+# We can set some things on a per service basis, like the nicelevel.
+#export SSD_NICELEVEL="-19"
+
+# Pass ulimit parameters
+#rc_ulimit="-u 30"
+
+# It's possible to define extra dependencies for services like so
+#rc_config="/etc/foo"
+#rc_need="openvpn"
+#rc_use="net.eth0"
+#rc_after="clock"
+#rc_before="local"
+#rc_provide="!net"
+
+# You can also enable the above commands here for each service. Below is an
+# example for service foo.
+#rc_foo_config="/etc/foo"
+#rc_foo_need="openvpn"
+#rc_foo_after="clock"
+
+# You can also remove dependencies.
+# This is mainly used for saying which servies do NOT provide net.
+#rc_net_tap0_provide="!net"
+

etc/rc.devd

@@ -1,6 +1,6 @@
 #!/bin/sh
-# Copyright 2007-2008 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
+# Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
+# Released under the 2-clause BSD license.
 
 # Inform RC that we are in the background and hotplugged
 export IN_BACKGROUND=yes

etc/rc.in

@@ -0,0 +1,19 @@
+#!@SHELL@
+# Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
+# Released under the 2-clause BSD license.
+
+# If $TERM is not set then assume default of @TERM@
+# This gives us a nice colour boot :)
+[ -z "$TERM" -o "$TERM" = "dumb" ] && export TERM="@TERM@"
+
+# Handle interrupts
+trap : SIGINT
+trap "echo 'Boot interrupted'; exit 1" SIGQUIT
+
+/sbin/rc sysinit || exit 1
+/sbin/rc boot || exit 1
+/sbin/rc default
+
+# We don't actually care if rc default worked or not, we should exit 0
+# to allow logins
+exit 0

etc/rc.shutdown.in

@@ -0,0 +1,17 @@
+#!@SHELL@
+# Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
+# Released under the 2-clause BSD license.
+
+# Handle interrupts
+trap : SIGINT SIGQUIT
+
+# Try and use stuff in /lib over anywhere else so we can shutdown
+# local mounts correctly.
+export LD_LIBRARY_PATH="/lib${LD_LIBRARY_PATH:+:}${LDLIBRARY_PATH}"
+
+# If $TERM is not set then assume default of @TERM@
+# This gives us a nice colour boot :)
+[ -z "$TERM" -o "$TERM" = "dumb" ] && export TERM="@TERM@"
+
+action=${1:-shutdown}
+exec /sbin/rc "${action}"

init.d.BSD/.gitignore

@@ -1,10 +0,0 @@
-hostid
-moused
-newsyslog
-pf
-rarpd
-rc-enabled
-rpcbind
-savecore
-sysctl
-syslogd

init.d.BSD/Makefile

@@ -1,7 +0,0 @@
-DIR=	${INITDIR}
-SRCS=	hostid.in moused.in newsyslog.in pf.in rarpd.in rc-enabled.in \
-	rpcbind.in savecore.in sysctl.in syslogd.in
-BIN=	${OBJS}
-
-MK=	../mk
-include ${MK}/scripts.mk

init.d.BSD/hostid.in

@@ -1,78 +0,0 @@
-#!@PREFIX@/sbin/runscript
-# Copyright 2007-2008 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
-
-extra_commands="reset"
-hostid_file=${hostid_file:-/etc/hostid}
-
-depend()
-{
-	need root
-	before devd net
-	keyword nojail noprefix
-}
-
-_set()
-{
-	local id=0
-
-	if [ -n "$1" ]; then
-		id=$(echo "$1" | md5)
-		id="0x${id%????????????????????????}"
-	fi
-	ebegin "Setting Host ID: ${id}"
-	sysctl -w kern.hostid="${id}" >/dev/null
-	eend $? || return 1
-
-	if sysctl -n kern.hostuuid >/dev/null 2>&1; then
-		[ -n "$1" ] && id=$1
-		ebegin "Setting Host UUID: ${id}"
-		sysctl kern.hostuuid="${id}" >/dev/null
-		eend $? || return 1
-	fi
-
-}
-
-# First we check to see if there is a system UUID
-# If so then we use that and erase the hostid file,
-# otherwise we generate a random UUID.
-reset()
-{
-	local uuid=$(kenv smbios.system.uuid 2>/dev/null)
-	local x="[0-9a-f]"
-	local y="${x}${x}${x}${x}"
-	case "${uuid}" in
-		${y}${y}-${y}-${y}-${y}-${y}${y}${y});;
-		*) uuid=;;
-	esac
-
-	if [ -n "${uuid}" ]; then
-		rm -f "${hostid_file}"
-	else
-		uuid=$(uuidgen)
-		if [ -z "${uuid}" ]; then
-			eerror "Unable to generate a UUID"
-			return 1
-		fi
-		if ! echo "${uuid}" > "${hostid_file}"; then
-			eerror "Failed to store UUID in \`${hostid_file}'"
-			return 1
-		fi
-	fi
-
-	_set "${uuid}"
-}
-
-start()
-{
-	if [ -r "${hostid_file}" ]; then
-		_set $(cat "${hostid_file}") 
-	else
-		reset
-	fi
-}
-
-stop()
-{
-	_set
-}

init.d.BSD/moused.in

@@ -1,62 +0,0 @@
-#!@PREFIX@/sbin/runscript
-# Copyright 2007-2008 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
-
-mouse=${SVCNAME##*.}
-if [ -n "${name}" -a "${mouse}" != "moused" ]; then
-	moused_device=/dev/"${mouse}"
-	pidfile=/var/run/moused-"${mouse}".pid
-else
-	pidfile=/var/run/moused.pid
-fi
-name="Console Mouse Daemon"
-[ -n "${moused_device}" ] && name="${name} (${moused_device})"
-
-depend()
-{
-	need localmount
-	after bootmisc
-	keyword nojail noprefix
-}
-
-start()
-{
-	ebegin "Starting ${name}" 
-
-	if [ -z "${moused_device}" ]; then
-		local dev=
-		for dev in /dev/psm[0-9]* /dev/ums[0-9]*; do
-			[ -c "${dev}" ] || continue
-			[ -e /var/run/moused-"${dev##*/}".pid ] && continue 
-			moused_device=${dev}
-			eindent
-			einfo "Using mouse on ${moused_device}"
-			eoutdent
-			break
-		done
-	fi
-
-	if [ -z "${moused_device}" ]; then
-		eend 1 "No mouse device found" 
-		return 1
-	fi
-
-	local args=
-	eval args=\$moused_args_${moused_device##*/}
-	[ -z "${args}" ] && args=${moused_args}
-
-	start-stop-daemon --start --exec /usr/sbin/moused \
-		--pidfile "${pidfile}" \
-		-- ${args} -p "${moused_device}" -I "${pidfile}"
-	local retval=$?
-	
-	if [ ${retval} = 0 ]; then
-		local ttyv=
-		for ttyv in /dev/ttyv*; do
-			vidcontrol < "${ttyv}" -m on
-			: $((retval+= $?))
-		done
-	fi
-	
-	eend ${retval} "Failed to start moused"
-}

init.d.BSD/newsyslog.in

@@ -1,18 +0,0 @@
-#!@PREFIX@/sbin/runscript
-# Copyright 2007-2008 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
-
-required_files="/etc/newsyslog.conf"
-
-depend()
-{
-	need localmount
-	keyword noprefix
-}
-
-start()
-{
-	ebegin "Creating and/or trimming log files"
-	newsyslog -s ${newsyslog_args}
-	eend $?
-}

init.d.BSD/rarpd.in

@@ -1,28 +0,0 @@
-#!@PREFIX@/sbin/runscript
-# Copyright 2007-2008 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
-
-command=/usr/sbin/rarpd
-command_args="-f ${rarpd_args}"
-pidfile=/var/run/rarpd.pid
-name="Reverse ARP Daemon"
-required_files="/etc/ethers"
-
-if [ -z "${rarpd_interface}" ]; then
-	command_args="${command_args} -a"
-else
-	command_args="${command_args} ${rarpd_interface}"
-fi
-command_background="YES"
-
-depend()
-{
-	need localmount
-	after bootmisc
-
-	if [ -z "${rarpd_interface}" ]; then
-		need net
-	else
-		net net."${rarpd_interface}"
-	fi
-}

init.d.BSD/rc-enabled.in

@@ -1,54 +0,0 @@
-#!@PREFIX@/sbin/runscript
-# Copyright 2007-2008 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
-
-depend()
-{
-	need localmount net
-	after *
-	before local
-	keyword noprefix
-}
-
-start()
-{
-	ebegin "Starting local rc services"
-	local svc= enabled= retval=0 service=
-	for svc in $(rcorder /etc/rc.d/* @PKG_PREFIX@/etc/rc.d/* 2>/dev/null); do
-		[ -x "$svc" ] || continue
-		service=${svc##*/}
-
-		# Skip these services
-		for s in cleartmp moused; do
-			[ "${s}" = "${service}" ] && continue 2
-		done
-
-		# If we have an init script for this service, continue
-		[ -x @SYSCONFDIR@/init.d/"${service}" ] && continue
-		[ -x @PKG_PREFIX@/@SYSCONFDIR@/init.d/"${service}" ] && continue
-		[ -x @LOCAL_PREFIX@/@SYSCONFDIR@/init.d/"${service}" ] && continue
-
-		# Ensure that the users rc.conf will start us - ignore the defaults
-		eval enabled=\$${svc##*/}_enable
-		yesno ${enabled} || yesno ${svc##*/} || continue
-
-		# Good to go!
-		"$svc" start && started="${started} ${svc}"
-		: $((retval += $?))
-	done
-	service_set_value started "${started}"
-	eend $retval "Some local rc services failed to start"
-	return 0
-}
-
-stop()
-{
-	ebegin "Stopping local rc services"
-	local svc= retval=0
-	for svc in $(rcorder $(service_get_value started) 2>/dev/null | sort -r); do
-		"${svc}" stop
-		: $((retval += $?))
-	done
-	eend $retval "Some local rc services failed to stop"
-	return 0
-}

init.d.BSD/savecore.in

@@ -1,36 +0,0 @@
-#!@PREFIX@/sbin/runscript
-# Copyright 2007-2008 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
-
-description="Saves a kernel dump."
-
-depend()
-{
-	need localmount
-	keyword nojail noprefix
-}
-
-start()
-{
-	local dump_dir=${dump_dir:-/var/crash}
-	if ! [ -d "${dump_dir}" ]; then
-		mkdir -p "${dump_dir}"
-		chmod 700 "${dump_dir}"
-	fi
-
-	if [ "${RC_UNAME}" = "FreeBSD" ]; then
-		# Don't quote ${dump_device}, so that if it's unset,
-		# savecore will check on the partitions listed in fstab
-		# without errors in the output
-		savecore -C "${dump_dir}" ${dump_device} >/dev/null
-	else
-		ls "${dump_dir}"/bsd* > /dev/null 2>&1
-	fi
-	[ $? = 0 ] || return 0
-
-	local sopts="${dump_dir} ${dump_device}"
-	yesno ${dump_compress} && sopts="-z ${sopts}"
-	ebegin "Saving kernel core dump in ${dump_dir}"
-	savecore ${sopts} >/dev/null
-	eend $?
-}

init.d.BSD/sysctl.in

@@ -1,26 +0,0 @@
-#!@PREFIX@/sbin/runscript
-# Copyright 2007-2008 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
-
-depend()
-{
-	use hostname
-	before bootmisc logger
-	keyword noprefix
-}
-
-start()
-{
-	[ -e /etc/sysctl.conf ] || return 0
-	
-	ebegin "Configuring kernel parameters"
-	local retval=0 var= comments=
-	while read var comments; do
-		case "${var}" in
-			""|"#"*) continue;;
-		esac
-		sysctl -w "${var}" >/dev/null || retval=1
-	done < /etc/sysctl.conf
-	eend ${retval} "Some errors were encountered"
-	eend $?
-}

init.d.FreeBSD/.gitignore

@@ -1,8 +0,0 @@
-clock
-devd
-dumpon
-ipfw
-mixer
-nscd
-powerd
-syscons

init.d.FreeBSD/Makefile

@@ -1,6 +0,0 @@
-DIR=	${INITDIR}
-SRCS=	clock.in devd.in dumpon.in ipfw.in mixer.in nscd.in powerd.in syscons.in
-BIN=	${OBJS}
-
-MK=	../mk
-include ${MK}/scripts.mk

init.d.FreeBSD/devd.in

@@ -1,22 +0,0 @@
-#!@PREFIX@/sbin/runscript
-# Copyright 2007-2008 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
-
-command=/sbin/devd
-command_args=${devd_args}
-name="Device State Change Daemon"
-
-depend() {
-	need localmount
-	after bootmisc
-	before net.lo0
-	keyword nojail noprefix
-}
-
-start_pre() {
-    sysctl hw.bus.devctl_disable=0 >/dev/null
-}
-
-stop_post() {
-    sysctl hw.bus.devctl_disable=1 >/dev/null
-}

init.d.FreeBSD/powerd.in

@@ -1,35 +0,0 @@
-#!@PREFIX@/sbin/runscript
-# Copyright 2007-2008 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
-
-command=/usr/sbin/powerd
-command_args=${powerd_args}
-pidfile=/var/run/powerd.pid
-name="Power Control Daemon"
-
-depend()
-{
-	need localmount
-	use logger
-	after bootmisc
-	keyword nojail noprefix
-}
-
-start_pre()
-{
-	if [ -n "${powerd_battery_mode}" ]; then
-		command_args="${command_args} -b ${powerd_battery_mode}"
-	fi
-	if [ -n "${powerd_ac_mode}" ]; then
-		command_args="${command_args} -a ${powerd_ac_mode}"
-	fi
-}
-
-stop_post()
-{
-	local level=$(sysctl -n dev.cpu.0.freq_levels |
-	    sed -e 's:/.*::')
-	if [ -n "${level}" ]; then
-		sysctl dev.cpu.0.freq="${level}" >/dev/null
-	fi
-}

init.d.FreeBSD/syscons.in

@@ -1,83 +0,0 @@
-#!@PREFIX@/sbin/runscript
-# Copyright 2007-2008 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
-
-depend() {
-	need localmount
-	keyword nojail noprefix
-}
-
-start() {
-	if [ -n "${allscreen_flags}" ]; then
-		ebegin "Setting mode to ${allscreen_flags} for all screens"
-		for v in /dev/ttyv*; do
-			vidcontrol ${allscreen_flags} <"${v}"
-		done
-		eend $?
-	fi
-	
-	if [ -n "${keymap}" ]; then
-		ebegin "Setting keymap to ${keymap}"
-		kbdcontrol -l ${keymap} </dev/console
-		eend $?
-	fi
-	
-	if [ -n "${keyrate}" ]; then
-		ebegin "Setting keyrate to ${keyrate}"
-		kbdcontrol -r ${keyrate} </dev/console
-		eend $?
-	fi
-
-	if [ -n "${keychange}" ]; then
-		ebegin "Changing function keys"
-		eval set -- "${keychange}"
-		eindent
-		while [ $# -gt 0 ]; do
-			veinfo "F$1 -> \`$2'"
-			kbdcontrol -f "$1" "$2" </dev/console
-			veend $?
-			shift; shift
-		done
-		eoutdent
-	fi
-	
-	if [ -n "${cursor}" ]; then
-		ebegin "Setting cursor"
-		vidcontrol -c ${cursor}
-		eend $?
-	fi
-
-	local v= f=
-	for v in font8x16 font8x14 font8x8; do
-		f=$(eval \$"${v}")
-		if [ -n "${f}" ]; then
-			ebegin "Setting font ${f}"
-			vidcontrol -f ${v##FONT} ${f}
-			eend $?
-		fi
-	done
-
-	if [ -n "${blanktime}" ]; then
-		ebegin "Setting blanktime"
-		vidcontrol -t ${blanktime}
-		eend $?
-	fi
-
-	if [ -n "${saver}" ]; then
-		local i=
-		for i in $(kldstat | sed -n -e 's/.* \(splash_.*\)/\1/p'); do
-			kldunload "${i}"
-		done
-		kldstat -v | grep -q _saver || kldload ${saver}_saver
-	fi
-
-	if [ -n "${kbdflags}" ]; then
-		ebegin "Setting keyboard flags for all screens"
-		for v in /dev/ttyv*; do
-			kbdcontrol ${kbdflags} <${v}
-		done
-		eend $?
-	fi
-
-	return 0
-}

init.d.Linux/.gitignore

@@ -1,8 +0,0 @@
-clock
-consolefont
-keymaps
-modules
-mtab
-numlock
-procfs
-sysctl

init.d.Linux/Makefile

@@ -1,7 +0,0 @@
-DIR=	${INITDIR}
-SRCS=	clock.in consolefont.in keymaps.in modules.in mtab.in numlock.in \
-	procfs.in sysctl.in
-BIN=${OBJS}
-
-MK=	../mk
-include ${MK}/scripts.mk

init.d.Linux/clock.in

@@ -1,136 +0,0 @@
-#!@PREFIX@/sbin/runscript
-# Copyright 2007-2008 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
-
-extra_commands="save show"
-
-description="Sets the local clock to UTC or Local Time." 
-description_save="Saves the current time in the BIOS."
-description_show="Displays the current time in the BIOS."
-
-clock_adjfile=${clock_adjfile:-${CLOCK_ADJFILE}}
-clock_args=${clock_args:-${CLOCK_OPTS}}
-clock_systohc=${clock_systohc:-${CLOCK_SYSTOHC}}
-
-clock=${clock:-${CLOCK:-UTC}}
-if [ "${clock}" = "UTC" ]; then
-	utc="UTC"
-	utc_cmd="--utc"
-else
-	utc="Local Time"
-	utc_cmd="--localtime"
-fi
-
-depend()
-{
-	if yesno ${clock_adjfile}; then
-		use root
-	else
-		before *
-	fi
-	keyword noopenvz noprefix nouml novserver noxenu
-}
-
-setupopts()
-{
-	case "$(uname -m)" in
-		s390*)
-			utc="s390"
-			;;
-		*)
-			if [ -e /proc/devices ] && \
-				grep -q " cobd$" /proc/devices
-			then
-				utc="coLinux"
-			fi
-			;;
-	esac
-
-	case "${utc}" in
-		UTC|Local" "Time);;
-		*) unset utc_cmd;;
-	esac
-}
-
-# hwclock doesn't always return non zero on error
-_hwclock()
-{
-	local err="$(hwclock "$@" 2>&1 >/dev/null)"
-
-	[ -z "${err}" ] && return 0
-	echo "${err}" >&2
-	return 1
-}
-
-start()
-{
-	local retval=0 errstr=""
-	setupopts
-
-	if [ -z "${utc_cmd}" ]; then
-		ewarn "Not setting clock for ${utc} system"
-		return 0
-	fi
-
-	ebegin "Setting system clock using the hardware clock [${utc}]"
-	if [ -e /proc/modules -a ! -e /dev/rtc ]; then
-		modprobe -q rtc || modprobe -q genrtc
-	fi
-
-	if [ -e /etc/adjtime ] && yesno ${clock_adjfile}; then
-		_hwclock --adjust ${utc_cmd}
-		retval=$((${retval} + $?))
-	fi
-	
-	# If setting UTC, don't bother to run hwclock when first booting
-	# as that's the default
-	if [ "${PREVLEVEL}" != "N" -o \
-		"${utc_cmd}" != "--utc" -o \
-		-n "${clock_args}" ];
-	then
-		_hwclock --hctosys ${utc_cmd} ${clock_args}
-		retval=$((${retval} + $?))
-	fi
-	
-	eend ${retval} "Failed to set the system clock"
-
-	return 0
-}
-
-stop()
-{
-	# Don't tweak the hardware clock on LiveCD halt.
-	[ -n "${CDBOOT}" ] && return 0
-	yesno ${clock_systohc} || return 0
-
-	local retval=0 errstr=""
-	setupopts
-
-	[ -z "${utc_cmd}" ] && return 0
-
-	ebegin "Setting hardware clock using the system clock" "[${utc}]"
-
-	if ! yesno "${clock_adjfile}"; then
-		# Some implementations don't handle adjustments
-		if LC_ALL=C hwclock --help | grep -q "\-\-noadjfile"; then
-			utc_cmd="${utc_cmd} --noadjfile"
-		fi
-	fi
-
-	_hwclock --systohc ${utc_cmd} ${clock_args}
-	retval=$?
-
-	eend ${retval} "Failed to sync clocks" 
-}
-
-save()
-{
-	clock_systohc="yes"
-	stop
-}
-
-show()
-{
-	setupopts
-	hwclock --show "${utc_cmd}" ${clock_args} 
-}

init.d.Linux/consolefont.in

@@ -1,78 +0,0 @@
-#!@PREFIX@/sbin/runscript
-# Copyright 2007-2008 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
-
-description="Sets a font for the consoles."
-
-depend()
-{
-	need localmount
-	need keymaps    # sets up terminal encoding scheme
-	after hotplug
-	keyword noopenvz noprefix nouml novserver noxenu
-}
-
-start()
-{
-	# Forget about any font until we are successful
-	rm -rf "${RC_LIBDIR}"/console
-
-	ttyn=${rc_tty_number:-${RC_TTY_NUMBER:-12}}
-	consolefont=${consolefont:-${CONSOLEFONT}}
-	unicodemap=${unicodemap:-${UNICODEMAP}}
-	consoletranslation=${consoletranslation:-${CONSOLETRANSLATION}}
-
-	if [ -z "${consolefont}" ]; then
-		ebegin "Using the default console font"
-		eend 0
-		return 0
-	fi
-
-	if [ "${ttyn}" = 0 ]; then
-		ebegin "Skipping font setup (rc_tty_number == 0)"
-		eend 0
-		return 0
-	fi
-
-	local x= param= sf_param= retval=0 ttydev=
-
-	# Get additional parameters
-	if [ -n "${consoletranslation}" ]; then
-		param="${param} -m ${consoletranslation}"
-	fi
-	if [ -n "${unicodemap}" ]; then
-		param="${param} -u ${unicodemap}"
-	fi
-
-	# Set the console font
-	ebegin "Setting user font"
-	[ -d /dev/vc ] \
-		&& ttydev=/dev/vc/ \
-		|| ttydev=/dev/tty
-
-	x=1
-	while [ ${x} -le ${ttyn} ]; do
-		setfont ${consolefont} ${param} -C ${ttydev}${x} >/dev/null 
-		retval=$((${retval} + $?))
-		x=$((${x} + 1))
-	done
-	eend ${retval}
-
-	# Store the last font so we can use it ASAP on boot
-	if [ ${retval} -eq 0 -a -w "${RC_LIBDIR}" ]; then
-		mkdir -p "${RC_LIBDIR}"/console
-
-		for font in /usr/share/consolefonts/"${consolefont}".*; do
-			:
-	     	done
-		cp "${font}" "${RC_LIBDIR}"/console
-		echo "${font##*/}" > "${RC_LIBDIR}"/console/font
-		if yesno ${unicode:-${UNICODE}}; then
-			cp /dev/null "${RC_LIBDIR}"/console/unicode
-		else
-			rm -f "${RC_LIBDIR}"/console/unicode
-		fi
-	fi
-
-	return ${retval}
-}

init.d.Linux/keymaps.in

@@ -1,69 +0,0 @@
-#!@PREFIX@/sbin/runscript
-# Copyright 2007-2008 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
-
-description="Applies a keymap for the consoles."
-
-ttyn=${rc_tty_number:-${RC_TTY_NUMBER:-12}}
-unicode=${unicode:-${UNICODE}}
-keymap=${keymap:-${KEYMAP}}
-extended_keymaps=${extended_keymaps:-${EXTENDED_KEYMAPS}}
-windowskeys=${windowskeys:-${SET_WINDOWSKEYS}} 
-fix_euro=${fix_euro:-${FIX_EURO}}
-dumpkeys_charset=${dumpkeys_charset:-${DUMPKEYS_CHARSET}}
-
-depend()
-{
-	need localmount
-	keyword noopenvz noprefix nouml novserver noxenu
-}
-
-start()
-{
-	if [ -z "${keymap}" ]; then
-		eerror "You need to setup keymap in /etc/conf.d/keymaps first"
-		return 1
-	fi
-
-	local ttydev= n=
-	[ -d /dev/vc ] \
-		&& ttydev=/dev/vc/ \
-		|| ttydev=/dev/tty
-
-	# Force linux keycodes for PPC.
-	if [ -f /proc/sys/dev/mac_hid/keyboard_sends_linux_keycodes ]; then
-		echo 1 > /proc/sys/dev/mac_hid/keyboard_sends_linux_keycodes
-	fi
-
-	ebegin "Loading key mappings"
-	local loadkeys_uni= wkeys= 
-	yesno ${unicode} && loadkeys_uni="--unicode"
-	yesno ${windowskeys} && wkeys="windowkeys"
-	loadkeys -q ${loadkeys_uni} ${wkeys} ${keymap} ${extended_keymaps} 
-	eend $? "Error loading key mappings" || return $?
-
-	if yesno ${fix_euro}; then
-		# Fix some fonts displaying the Euro, #173528.
-		echo "altgr keycode 18 = U+20AC" | loadkeys -q
-	fi
-
-	# Set terminal encoding to either ASCII or UNICODE.
-	# See utf-8(7) for more information.
-	local termencoding="%@" termmsg="ASCII" kmode="-a"
-	if yesno ${unicode}; then
-		dumpkeys ${dumpkeys_charset:+-c} \
-			${dumpkeys_charset} | loadkeys --unicode
-		termencoding="%G"
-		termmsg="UTF-8"
-		kmode="-u"
-	fi
-
-	ebegin "Setting terminal encoding to" ${termmsg}
-	n=1
-	while [ ${n} -le "${ttyn}" ]; do
-		printf "\033%s" "${termencoding}" >"${ttydev}${n}"
-		kbd_mode "${kmode}" -C "${ttydev}${n}"
-		n=$((${n} + 1))
-	done
-	eend 0
-}

init.d.Linux/modules.in

@@ -1,50 +0,0 @@
-#!@PREFIX@/sbin/runscript
-# Copyright 2007-2008 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
-
-description="Loads a user defined list of kernel modules."
-
-depend()
-{
-	use isapnp
-	keyword noopenvz noprefix novserver
-}
-
-start()
-{
-	# Should not fail if kernel do not have module
-	# support compiled in ...
-	[ ! -f /proc/modules ] && return 0
-
-	local KV=$(uname -r)
-	local KV_MAJOR=${KV%%.*}
-	local x=${KV#*.}
-	local KV_MINOR=${x%%.*}
-	x=${KV#*.*.}
-	local KV_MICRO=${x%%-*}
-
-	local list= x= args= cnt=0
-	for x in "${KV}" \
-		${KV_MAJOR}.${KV_MINOR}.${KV_MICRO} \
-		${KV_MAJOR}.${KV_MINOR} \
-	; do
-		eval list=\$modules_$(shell_var "${x}")
-		[ -n "${list}" ] && break
-	done
-	[ -z "${list}" ] && list=${modules}
-
-	for x in ${list}; do
-		ebegin "Loading module ${x}"
-		eval args=\$module_$(shell_var "${x}")_args
-		eval modprobe -q "${x}" "${args}"
-		eend $? "Failed to load ${x}" && cnt=$((${cnt} + 1))
-	done
-	einfo "Autoloaded ${cnt} module(s)"
-
-	# Just in case a sysadmin prefers generic symbolic links in
-	# /lib/modules/boot for boot time modules we will load these modules
-	[ -n "$(modprobe -l -t boot)" ] && modprobe -a -t boot \* 2>/dev/null
-	
-	# Above test clobbers the return
-	return 0
-}

init.d.Linux/sysctl.in

@@ -1,18 +0,0 @@
-#!@PREFIX@/sbin/runscript
-# Copyright 2007-2008 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
-
-depend()
-{
-	use hostname
-	before bootmisc logger
-	keyword noopenvz noprefix novserver
-}
-
-start()
-{
-	[ -e /etc/sysctl.conf ] || return 0
-	ebegin "Configuring kernel parameters"
-	sysctl -p /etc/sysctl.conf >/dev/null
-	eend $?
-}

init.d.NetBSD/.gitignore

@@ -1,3 +0,0 @@
-swap-blk
-ttys
-wscons

init.d.NetBSD/Makefile

@@ -1,6 +0,0 @@
-DIR=	${INITDIR}	
-SRCS=	swap-blk.in ttys.in wscons.in
-BIN=	${OBJS}
-
-MK=	../mk
-include ${MK}/scripts.mk

init.d.NetBSD/wscons.in

@@ -1,100 +0,0 @@
-#!@PREFIX@/sbin/runscript
-# Copyright 2008 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
-
-depend()
-{
-	need localmount
-	keyword noprefix
-}
-
-start()
-{
-	wscfg=/usr/sbin/wsconscfg
-	wsfld=/usr/sbin/wsfontload
-	wsctl=/sbin/wsconsctl
-	config=/etc/wscons.conf
-
-	# args mean:
-	#	screen idx scr emul
-	#	font   name width height enc file
-	while read type arg1 arg2 arg3 arg4 arg5; do
-		case "${type}" in
-			\#*|"")
-				continue
-				;;
-
-			font)
-				cmd=${wsfld}
-				[ "${arg2}" != "-" ] && cmd="${cmd} -w ${arg2}"
-				[ "${arg3}" != "-" ] && cmd="${cmd} -h ${arg3}" 
-				[ "${arg4}" != "-" ] && cmd="${cmd} -e ${arg4}"
-				cmd="${cmd} -N ${arg1} ${arg5}"
-				eval "${cmd}"				
-				;;
-
-			screen)
-				cmd=${wscfg}
-				[ "${arg2}" != "-" ] && cmd="${cmd} -t ${arg2}"
-				[ "${arg3}" != "-" ] && cmd="${cmd} -e ${arg3}"
-				cmd="${cmd} ${arg1}"
-				eval "${cmd}"
-				;;
-
-			keyboard)
-				cmd=${wscfg}
-				case "${arg1}" in
-					-|auto)
-						cmd="${cmd} -k"
-						;;
-					*)
-						cmd="${cmd} -k ${arg1}"
-						;;
-				esac
-				${cmd}
-				;;
-
-			encoding)
-				eval ${wsctl} -w "\"encoding=${arg1}\""
-				;;
-
-			mapfile)
-				local entry=
-				while read entry; do
-				    case "${entry}" in
-					\#*|"")
-					    continue
-					    ;;
-					*)
-					    cmd="${wsctl} -w \"map+=${entry}\""
-					    eval "${cmd} >/dev/null"
-					    ;;
-				    esac
-				done < "${arg1}"
-				;;
-
-			mux)
-				eval "${wscfg} -m ${arg1}"
-				;;
-
-			setvar)
-				case "${arg1}" in
-				keyboard)
-					cmd="${wsctl} -kw ${arg2}"
-					;;
-				display)
-					cmd="${wsctl} -dw ${arg2}"
-					;;
-				mouse)
-					cmd="${wsctl} -mw ${arg2}"
-					;;
-				*)
-					cmd="${wsctl} -w ${arg1}"
-					;;
-				esac
-				eval "${cmd}"
-				;;
-
-		esac
-	done < "${config}"
-}

init.d.misc/.gitignore

@@ -1,5 +1,6 @@
 avahi-dnsconfd
 avahid
+dhcpcd
 dbus
 hald
 named
@@ -7,3 +8,4 @@ ntpd
 openvpn
 polkitd
 sshd
+wpa_supplicant

init.d.misc/Makefile

@@ -1,7 +1,11 @@
 DIR=	${INITDIR}
-SRCS=	avahi-dnsconfd.in avahid.in dbus.in hald.in named.in ntpd.in \
-	openvpn.in polkitd.in sshd.in
+SRCS=	avahi-dnsconfd.in avahid.in dhcpcd.in dbus.in \
+	hald.in named.in ntpd.in \
+	openvpn.in polkitd.in sshd.in wpa_supplicant.in
 
 MK=	../mk
+
+SED_EXTRA+= -e 's:@VARBASE@:/var:g'
+
 include ${MK}/scripts.mk
 include Makefile.${OS}

init.d.misc/Makefile.FreeBSD

@@ -1 +1 @@
-PREFIX?=	/usr/local
+PKG_PREFIX?=	/usr/local

init.d.misc/Makefile.Linux

@@ -1 +1 @@
-PREFIX=/usr
+PKG_PREFIX?=/usr

init.d.misc/Makefile.NetBSD

@@ -1 +1 @@
-PREFIX?=	/usr/pkg
+PKG_PREFIX?=	/usr/pkg

init.d.misc/avahi-dnsconfd.in

@@ -1,9 +1,9 @@
 #!@PREFIX@/sbin/runscript
-# Copyright 2007-2008 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
+# Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
+# Released under the 2-clause BSD license.
 
 command=@PKG_PREFIX@/sbin/avahi-dnsconfd
-command_args="${avahi_dnsconfd_args} -D"
+command_args="$avahi_dnsconfd_args -D"
 pidfile=@VARBASE@/run/avahi-dnsconfd.pid
 name="Avahi DNS Configuration Daemon"