Rework our folder structure so that we don't have OS specific dirs, making it easier to share init and conf files per OS.

14 files changed, 141 insertions, 1 deletions

diff --git a/conf.d/Makefile b/conf.d/Makefile
index 9d1891f5..96b0a6eb 100644
--- a/conf.d/Makefile
+++ b/conf.d/Makefile
@@ -1,5 +1,5 @@
 DIR=	${CONFDIR}
-CONF=	bootmisc clock fsck hostname local net urandom
+CONF=	bootmisc fsck hostname local net urandom
 
 MK=	../mk
 include ${MK}/scripts.mk
diff --git a/conf.d/Makefile.FreeBSD b/conf.d/Makefile.FreeBSD
new file mode 100644
index 00000000..ea0c701e
--- /dev/null
+++ b/conf.d/Makefile.FreeBSD
@@ -0,0 +1 @@
+CONF+=	moused powerd rarpd savecore syscons
diff --git a/conf.d/Makefile.Linux b/conf.d/Makefile.Linux
new file mode 100644
index 00000000..628636b0
--- /dev/null
+++ b/conf.d/Makefile.Linux
@@ -0,0 +1 @@
+CONF+=	consolefont hwclock keymaps modules
diff --git a/conf.d/Makefile.NetBSD b/conf.d/Makefile.NetBSD
new file mode 100644
index 00000000..1af0433d
--- /dev/null
+++ b/conf.d/Makefile.NetBSD
@@ -0,0 +1 @@
+CONF+=	moused powerd rarpd savecore
diff --git a/conf.d/clock b/conf.d/adjkerntz
index 4dab74f7..4dab74f7 100644
--- a/conf.d/clock
+++ b/conf.d/adjkerntz
diff --git a/conf.d/consolefont b/conf.d/consolefont
new file mode 100644
index 00000000..c7fe898a
--- /dev/null
+++ b/conf.d/consolefont
@@ -0,0 +1,17 @@
+# consolefont specifies the default font that you'd like Linux to use on the
+# console.  You can find a good selection of fonts in /usr/share/consolefonts;
+# 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).
+consolefont="default8x16"
+
+# consoletranslation is the charset map file to use.  Leave commented to use
+# the default one.  Have a look in /usr/share/consoletrans for a selection of
+# map files you can use.
+#consoletranslation="8859-1_to_uni"
+
+# unicodemap is the unicode map file to use. Leave commented to use the
+# default one. Have a look in /usr/share/unimaps for a selection of map files
+# you can use.
+#unicodemap="iso01"
diff --git a/conf.d/hwclock b/conf.d/hwclock
new file mode 100644
index 00000000..fe94df03
--- /dev/null
+++ b/conf.d/hwclock
@@ -0,0 +1,14 @@
+# Set CLOCK to "UTC" if your system clock is set to UTC (also known as
+# Greenwich Mean Time).  If your 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 
+# 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 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=""
diff --git a/conf.d/keymaps b/conf.d/keymaps
new file mode 100644
index 00000000..842803bb
--- /dev/null
+++ b/conf.d/keymaps
@@ -0,0 +1,21 @@
+# 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".
+windowkeys="NO"
+
+# The maps to load for extended keyboards.  Most users will leave this as is.
+extended_keymaps=""
+#extended_keymaps="backspace keypad euro2"
+
+# Tell dumpkeys(1) to interpret character action codes to be 
+# from the specified character set.
+# This only matters if you set unicode="yes" in /etc/rc.conf.
+# For a list of valid sets, run `dumpkeys --help`
+dumpkeys_charset=""
+
+# Some fonts map AltGr-E to the currency symbol ¤ instead of the Euro €
+# To fix this, set to "yes"
+fix_euro="NO"
diff --git a/conf.d/modules b/conf.d/modules
new file mode 100644
index 00000000..2fc26cf3
--- /dev/null
+++ b/conf.d/modules
@@ -0,0 +1,15 @@
+# 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, per version if necessary.
+#module_ieee1394_args="debug"
+#module_ieee1394_args_2_6_23_gentoo_r5="ieee1394 ohci1394"
+#module_ieee1394_args_2_6_23="tun ieee1394"
+#module_ieee1394_args_2_6="tun"
+
+# You should consult your kernel documentation and configuration
+# for a list of modules and their options.
diff --git a/conf.d/moused b/conf.d/moused
new file mode 100644
index 00000000..a9d2d401
--- /dev/null
+++ b/conf.d/moused
@@ -0,0 +1,16 @@
+# See the moused man page for available settings.
+
+# Set to your mouse device psm[0-9] for PS/2 ports, ums[0-9] for USB ports
+# Leave blank to try to autodetect it
+#moused_device="/dev/psm0"
+
+# Any additional arguments required for a specific port
+#moused_args_psm0=""
+# or for all mice
+#moused_args=""
+
+# You can also multiplex the init script for each device like so
+#   ln -s moused /etc/init.d/moused.ums0
+# This enables you to have a config file per mouse (forces moused_device 
+# to ums0 in this case) and control each mouse.
+# devd can also start and stop these mice, which laptop users will find handy.
diff --git a/conf.d/powerd b/conf.d/powerd
new file mode 100644
index 00000000..df5fb700
--- /dev/null
+++ b/conf.d/powerd
@@ -0,0 +1,7 @@
+# Mode allowed: maximum, minimum, adaptive
+# Default unless specified is adaptive
+powerd_ac_mode="maximum"
+#powerd_battery_mode="minimum"
+
+# Addiditonal arguments for powerd - see the man page for details
+powerd_args=""
diff --git a/conf.d/rarpd b/conf.d/rarpd
new file mode 100644
index 00000000..60d71a45
--- /dev/null
+++ b/conf.d/rarpd
@@ -0,0 +1,3 @@
+# To start rarpd only for a given interface, set the
+# following variable. Otherwise we listen on all interfaces.
+#rarpd_interface="rl0"
diff --git a/conf.d/savecore b/conf.d/savecore
new file mode 100644
index 00000000..99eaefc9
--- /dev/null
+++ b/conf.d/savecore
@@ -0,0 +1,25 @@
+# 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.
+
+# 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.
+#dump_device=/dev/ad0s1b
+
+# 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.
+#dump_dir=/var/crash
+
+# 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.
+#dump_compress=NO
diff --git a/conf.d/syscons b/conf.d/syscons
new file mode 100644
index 00000000..cd012df6
--- /dev/null
+++ b/conf.d/syscons
@@ -0,0 +1,19 @@
+# Example syscons config file. This is the place to set things like keymap, etc.
+
+# Set the video mode - you should check the vidcontrol man page for valid modes
+# NOTE:- This will blank the screen after this command is run
+# NOTE:- You can get more modes if you load the vesa kernel module, but this
+# may require the SC_PIXEL_MODE kernel option
+#allscreen_flags="VGA_80x30"
+
+# Set the keymap to "uk.iso".
+#keymap="uk.iso"
+
+# Set the keyboard rate to 250ms delay, and 34 repeat rate.
+#keyrate="250.34"
+
+# Change the behaviour of F-unction keys (see kbdcontrol(1)).
+#keychange="10 'ssh myhost'"
+
+# See vidcontrol(1) -t
+#blanktime="off"