summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--etc.BSD/rc.in4
-rw-r--r--etc.BSD/rc.shutdown.in4
-rw-r--r--etc.FreeBSD/rc.devd4
-rw-r--r--init.d.BSD/hostid4
-rw-r--r--init.d.BSD/mixer4
-rw-r--r--init.d.BSD/moused4
-rw-r--r--init.d.BSD/newsyslog4
-rw-r--r--init.d.BSD/powerd4
-rw-r--r--init.d.BSD/rarpd4
-rw-r--r--init.d.BSD/rc-enabled4
-rw-r--r--init.d.BSD/rpcbind4
-rwxr-xr-xinit.d.BSD/savecore4
-rw-r--r--init.d.BSD/sysctl4
-rw-r--r--init.d.BSD/syslogd4
-rw-r--r--init.d.FreeBSD/clock4
-rw-r--r--init.d.FreeBSD/devd4
-rw-r--r--init.d.FreeBSD/dumpon4
-rw-r--r--init.d.FreeBSD/ipfw4
-rw-r--r--init.d.FreeBSD/nscd4
-rw-r--r--init.d.FreeBSD/syscons4
-rwxr-xr-xinit.d.Linux/clock4
-rwxr-xr-xinit.d.Linux/consolefont4
-rwxr-xr-xinit.d.Linux/keymaps4
-rwxr-xr-xinit.d.Linux/modules4
-rwxr-xr-xinit.d.Linux/numlock4
-rw-r--r--init.d.Linux/procfs4
-rw-r--r--init.d.Linux/sysctl4
-rw-r--r--init.d.NetBSD/ttys4
-rw-r--r--init.d.misc/avahi-dnsconfd.in4
-rw-r--r--init.d.misc/avahid.in4
-rw-r--r--init.d.misc/dbus.in4
-rw-r--r--init.d.misc/dnsmasq.in4
-rw-r--r--init.d.misc/hald.in4
-rw-r--r--init.d.misc/named.in4
-rw-r--r--init.d.misc/ntpd.in4
-rw-r--r--init.d.misc/openvpn.in4
-rw-r--r--init.d.misc/polkitd.in4
-rw-r--r--init.d.misc/sshd.in4
-rwxr-xr-xinit.d/bootmisc4
-rwxr-xr-xinit.d/checkfs4
-rwxr-xr-xinit.d/checkroot4
-rwxr-xr-xinit.d/halt.sh4
-rwxr-xr-xinit.d/hostname4
-rwxr-xr-xinit.d/local4
-rwxr-xr-xinit.d/localmount4
-rwxr-xr-xinit.d/netmount4
-rw-r--r--init.d/swap4
-rwxr-xr-xinit.d/urandom4
-rw-r--r--net.BSD/ifconfig.sh4
-rw-r--r--net.BSD/iwconfig.sh4
-rw-r--r--net.Linux/adsl.sh4
-rw-r--r--net.Linux/apipa.sh4
-rw-r--r--net.Linux/arping.sh4
-rw-r--r--net.Linux/bonding.sh4
-rw-r--r--net.Linux/br2684ctl.sh4
-rw-r--r--net.Linux/bridge.sh4
-rw-r--r--net.Linux/ccwgroup.sh4
-rw-r--r--net.Linux/ifconfig.sh4
-rw-r--r--net.Linux/ifplugd.sh4
-rw-r--r--net.Linux/ip6to4.sh4
-rw-r--r--net.Linux/ipppd.sh4
-rw-r--r--net.Linux/iproute2.sh4
-rw-r--r--net.Linux/iwconfig.sh4
-rw-r--r--net.Linux/netplugd.sh4
-rw-r--r--net.Linux/pppd.sh4
-rw-r--r--net.Linux/pump.sh4
-rw-r--r--net.Linux/tuntap.sh4
-rw-r--r--net.Linux/udhcpc.sh4
-rw-r--r--net.Linux/vlan.sh4
-rw-r--r--net/dhclient.sh4
-rw-r--r--net/dhcpcd.sh4
-rw-r--r--net/macchanger.sh4
-rw-r--r--net/macnet.sh4
-rw-r--r--net/ssidnet.sh4
-rw-r--r--net/system.sh4
-rw-r--r--net/wpa_supplicant.sh4
-rwxr-xr-xsh.BSD/init.sh4
-rwxr-xr-xsh.Linux/init-early.sh4
-rwxr-xr-xsh.Linux/init.sh4
-rw-r--r--sh/functions.sh4
-rwxr-xr-xsh/gendepends.sh4
-rw-r--r--sh/init-common-post.sh4
-rwxr-xr-xsh/net.sh4
-rwxr-xr-xsh/rc-functions.sh4
-rw-r--r--sh/rc-mount.sh4
-rwxr-xr-xsh/runscript.sh4
-rwxr-xr-xsupport/openvpn/down.sh25
-rwxr-xr-xsupport/openvpn/up.sh25
88 files changed, 176 insertions, 218 deletions
diff --git a/etc.BSD/rc.in b/etc.BSD/rc.in
index c7d343c..255ff72 100644
--- a/etc.BSD/rc.in
+++ b/etc.BSD/rc.in
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright 2007-2008 Roy Marples
-# All rights reserved
+# 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 :)
diff --git a/etc.BSD/rc.shutdown.in b/etc.BSD/rc.shutdown.in
index 49c512f..b531f30 100644
--- a/etc.BSD/rc.shutdown.in
+++ b/etc.BSD/rc.shutdown.in
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright 2007 Roy Marples
-# All rights reserved
+# Copyright 2007-2008 Roy Marples <roy@marples.name>
+# All rights reserved. Released under the 2-clause BSD license.
# Handle interrupts
trap : SIGINT SIGQUIT
diff --git a/etc.FreeBSD/rc.devd b/etc.FreeBSD/rc.devd
index 9b30576..f44d9ac 100644
--- a/etc.FreeBSD/rc.devd
+++ b/etc.FreeBSD/rc.devd
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright 2007 Roy Marples
-# All rights reserved
+# Copyright 2007-2008 Roy Marples <roy@marples.name>
+# All rights reserved. Released under the 2-clause BSD license.
# Inform RC that we are in the background and hotplugged
export IN_BACKGROUND=yes
diff --git a/init.d.BSD/hostid b/init.d.BSD/hostid
index f97609a..d8e2123 100644
--- a/init.d.BSD/hostid
+++ b/init.d.BSD/hostid
@@ -1,6 +1,6 @@
#!/sbin/runscript
-# Copyright 2007-2008 Roy Marples
-# All rights reserved
+# 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}
diff --git a/init.d.BSD/mixer b/init.d.BSD/mixer
index c491e7d..81341e9 100644
--- a/init.d.BSD/mixer
+++ b/init.d.BSD/mixer
@@ -1,6 +1,6 @@
#!/sbin/runscript
-# Copyright 2007-2008 Roy Marples
-# All rights reserved
+# Copyright 2007-2008 Roy Marples <roy@marples.name>
+# All rights reserved. Released under the 2-clause BSD license.
extra_commands="restore"
diff --git a/init.d.BSD/moused b/init.d.BSD/moused
index bf9623f..f168314 100644
--- a/init.d.BSD/moused
+++ b/init.d.BSD/moused
@@ -1,6 +1,6 @@
#!/sbin/runscript
-# Copyright 2007-2008 Roy Marples
-# All rights reserved
+# 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
diff --git a/init.d.BSD/newsyslog b/init.d.BSD/newsyslog
index dc3616b..a03d379 100644
--- a/init.d.BSD/newsyslog
+++ b/init.d.BSD/newsyslog
@@ -1,6 +1,6 @@
#!/sbin/runscript
-# Copyright 2007-2008 Roy Marples
-# All rights reserved
+# Copyright 2007-2008 Roy Marples <roy@marples.name>
+# All rights reserved. Released under the 2-clause BSD license.
required_files="/etc/newsyslog.conf"
diff --git a/init.d.BSD/powerd b/init.d.BSD/powerd
index 50efd9a..3d3ae7f 100644
--- a/init.d.BSD/powerd
+++ b/init.d.BSD/powerd
@@ -1,6 +1,6 @@
#!/sbin/runscript
-# Copyright 2007-2008 Roy Marples
-# All rights reserved
+# 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}
diff --git a/init.d.BSD/rarpd b/init.d.BSD/rarpd
index a373d02..837e020 100644
--- a/init.d.BSD/rarpd
+++ b/init.d.BSD/rarpd
@@ -1,6 +1,6 @@
#!/sbin/runscript
-# Copyright 2007-2008 Roy Marples
-# All rights reserved
+# 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}"
diff --git a/init.d.BSD/rc-enabled b/init.d.BSD/rc-enabled
index 9c8d758..f30dd28 100644
--- a/init.d.BSD/rc-enabled
+++ b/init.d.BSD/rc-enabled
@@ -1,6 +1,6 @@
#!/sbin/runscript
-# Copyright 2007-2008 Roy Marples
-# All rights reserved
+# Copyright 2007-2008 Roy Marples <roy@marples.name>
+# All rights reserved. Released under the 2-clause BSD license.
depend()
{
diff --git a/init.d.BSD/rpcbind b/init.d.BSD/rpcbind
index d4ff511..1ac3873 100644
--- a/init.d.BSD/rpcbind
+++ b/init.d.BSD/rpcbind
@@ -1,6 +1,6 @@
#!/sbin/runscript
-# Copyright 2007-2008 Roy Marples
-# All rights reserved
+# Copyright 2007-2008 Roy Marples <roy@marples.name>
+# All rights reserved. Released under the 2-clause BSD license.
command=/usr/sbin/rpcbind
command_args=${rpcbind_args}
diff --git a/init.d.BSD/savecore b/init.d.BSD/savecore
index 4f84056..54246a9 100755
--- a/init.d.BSD/savecore
+++ b/init.d.BSD/savecore
@@ -1,6 +1,6 @@
#!/sbin/runscript
-# Copyright 2007-2008 Roy Marples
-# All rights reserved
+# Copyright 2007-2008 Roy Marples <roy@marples.name>
+# All rights reserved. Released under the 2-clause BSD license.
description="Saves a kernel dump."
diff --git a/init.d.BSD/sysctl b/init.d.BSD/sysctl
index 704915f..f963571 100644
--- a/init.d.BSD/sysctl
+++ b/init.d.BSD/sysctl
@@ -1,6 +1,6 @@
#!/sbin/runscript
-# Copyright 2007-2008 Roy Marples
-# All rights reserved
+# Copyright 2007-2008 Roy Marples <roy@marples.name>
+# All rights reserved. Released under the 2-clause BSD license.
depend()
{
diff --git a/init.d.BSD/syslogd b/init.d.BSD/syslogd
index d230f5a..1a9ff3c 100644
--- a/init.d.BSD/syslogd
+++ b/init.d.BSD/syslogd
@@ -1,6 +1,6 @@
#!/sbin/runscript
-# Copyright 2007-2008 Roy Marples
-# All rights reserved
+# Copyright 2007-2008 Roy Marples <roy@marples.name>
+# All rights reserved. Released under the 2-clause BSD license.
command=/usr/sbin/syslogd
command_args=${syslogd_args}
diff --git a/init.d.FreeBSD/clock b/init.d.FreeBSD/clock
index 1000f84..57829f2 100644
--- a/init.d.FreeBSD/clock
+++ b/init.d.FreeBSD/clock
@@ -1,6 +1,6 @@
#!/sbin/runscript
-# Copyright 2007-2008 Roy Marples
-# All rights reserved
+# Copyright 2007-2008 Roy Marples <roy@marples.name>
+# All rights reserved. Released under the 2-clause BSD license.
extra_commands="save"
diff --git a/init.d.FreeBSD/devd b/init.d.FreeBSD/devd
index e389a37..ff500bf 100644
--- a/init.d.FreeBSD/devd
+++ b/init.d.FreeBSD/devd
@@ -1,6 +1,6 @@
#!/sbin/runscript
-# Copyright 2007-2008 Roy Marples
-# All rights reserved
+# 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}
diff --git a/init.d.FreeBSD/dumpon b/init.d.FreeBSD/dumpon
index 9fbd900..9d40f91 100644
--- a/init.d.FreeBSD/dumpon
+++ b/init.d.FreeBSD/dumpon
@@ -1,6 +1,6 @@
#!/sbin/runscript
-# Copyright 2007-2008 Roy Marples
-# All rights reserved
+# Copyright 2007-2008 Roy Marples <roy@marples.name>
+# All rights reserved. Released under the 2-clause BSD license.
description="Configures a specific kernel dump device."
diff --git a/init.d.FreeBSD/ipfw b/init.d.FreeBSD/ipfw
index 132912f..c1c0cb3 100644
--- a/init.d.FreeBSD/ipfw
+++ b/init.d.FreeBSD/ipfw
@@ -1,6 +1,6 @@
#!/sbin/runscript
-# Copyright 2007-2008 Roy Marples
-# All rights reserved
+# Copyright 2007-2008 Roy Marples <roy@marples.name>
+# All rights reserved. Released under the 2-clause BSD license.
# This is based on /etc/rc.firewall and /etc/rc.firewall6 from FreeBSD
diff --git a/init.d.FreeBSD/nscd b/init.d.FreeBSD/nscd
index 7ffab11..e75f5dc 100644
--- a/init.d.FreeBSD/nscd
+++ b/init.d.FreeBSD/nscd
@@ -1,6 +1,6 @@
#!/sbin/runscript
-# Copyright 2007-2008 Roy Marples
-# All rights reserved
+# Copyright 2007-2008 Roy Marples <roy@marples.name>
+# All rights reserved. Released under the 2-clause BSD license.
command=/usr/sbin/nscd
command_args="${nscd_args}"
diff --git a/init.d.FreeBSD/syscons b/init.d.FreeBSD/syscons
index 443db59..93d3c7c 100644
--- a/init.d.FreeBSD/syscons
+++ b/init.d.FreeBSD/syscons
@@ -1,6 +1,6 @@
#!/sbin/runscript
-# Copyright 2007-2008 Roy Marples
-# All rights reserved
+# Copyright 2007-2008 Roy Marples <roy@marples.name>
+# All rights reserved. Released under the 2-clause BSD license.
depend() {
need localmount
diff --git a/init.d.Linux/clock b/init.d.Linux/clock
index 5ac6592..898fc90 100755
--- a/init.d.Linux/clock
+++ b/init.d.Linux/clock
@@ -1,6 +1,6 @@
#!/sbin/runscript
-# Copyright 2007-2008 Roy Marples
-# All rights reserved
+# Copyright 2007-2008 Roy Marples <roy@marples.name>
+# All rights reserved. Released under the 2-clause BSD license.
extra_commands="save show"
diff --git a/init.d.Linux/consolefont b/init.d.Linux/consolefont
index d65a4fd..e2d0639 100755
--- a/init.d.Linux/consolefont
+++ b/init.d.Linux/consolefont
@@ -1,6 +1,6 @@
#!/sbin/runscript
-# Copyright 2007-2008 Roy Marples
-# All rights reserved
+# 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."
diff --git a/init.d.Linux/keymaps b/init.d.Linux/keymaps
index 5456b98..5e21765 100755
--- a/init.d.Linux/keymaps
+++ b/init.d.Linux/keymaps
@@ -1,6 +1,6 @@
#!/sbin/runscript
-# Copyright 2007-2008 Roy Marples
-# All rights reserved
+# 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."
diff --git a/init.d.Linux/modules b/init.d.Linux/modules
index ef67147..a695265 100755
--- a/init.d.Linux/modules
+++ b/init.d.Linux/modules
@@ -1,6 +1,6 @@
#!/sbin/runscript
-# Copyright 2007-2008 Roy Marples
-# All rights reserved
+# 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."
diff --git a/init.d.Linux/numlock b/init.d.Linux/numlock
index 8ad4a66..6327361 100755
--- a/init.d.Linux/numlock
+++ b/init.d.Linux/numlock
@@ -1,6 +1,6 @@
#!/sbin/runscript
-# Copyright 2007-2008 Roy Marples
-# All rights reserved
+# Copyright 2007-2008 Roy Marples <roy@marples.name>
+# All rights reserved. Released under the 2-clause BSD license.
description="Turns numlock on for the consoles."
diff --git a/init.d.Linux/procfs b/init.d.Linux/procfs
index fecaa42..248e419 100644
--- a/init.d.Linux/procfs
+++ b/init.d.Linux/procfs
@@ -1,6 +1,6 @@
#!/sbin/runscript
-# Copyright 2007-2008 Roy Marples
-# All rights reserved
+# Copyright 2007-2008 Roy Marples <roy@marples.name>
+# All rights reserved. Released under the 2-clause BSD license.
description="Mounts misc filesystems in /proc."
diff --git a/init.d.Linux/sysctl b/init.d.Linux/sysctl
index 495f8ae..d56bf93 100644
--- a/init.d.Linux/sysctl
+++ b/init.d.Linux/sysctl
@@ -1,6 +1,6 @@
#!/sbin/runscript
-# Copyright 2007-2008 Roy Marples
-# All rights reserved
+# Copyright 2007-2008 Roy Marples <roy@marples.name>
+# All rights reserved. Released under the 2-clause BSD license.
depend()
{
diff --git a/init.d.NetBSD/ttys b/init.d.NetBSD/ttys
index 64c4ccd..c8e9d87 100644
--- a/init.d.NetBSD/ttys
+++ b/init.d.NetBSD/ttys
@@ -1,6 +1,6 @@
#!/sbin/runscript
-# Copyright 2007 Roy Marples
-# All rights reserved
+# Copyright 2007 Roy Marples <roy@marples.name>
+# All rights reserved. Released under the 2-clause BSD license.
start()
{
diff --git a/init.d.misc/avahi-dnsconfd.in b/init.d.misc/avahi-dnsconfd.in
index d7e1ddd..dc12688 100644
--- a/init.d.misc/avahi-dnsconfd.in
+++ b/init.d.misc/avahi-dnsconfd.in
@@ -1,6 +1,6 @@
#!/sbin/runscript
-# Copyright 2007-2008 Roy Marples
-# All rights reserved
+# Copyright 2007-2008 Roy Marples <roy@marples.name>
+# All rights reserved. Released under the 2-clause BSD license.
command=@PREFIX@/sbin/avahi-dnsconfd
command_args="${avahi_dnsconfd_args} -D"
diff --git a/init.d.misc/avahid.in b/init.d.misc/avahid.in
index b235939..7ef37e2 100644
--- a/init.d.misc/avahid.in
+++ b/init.d.misc/avahid.in
@@ -1,6 +1,6 @@
#!/sbin/runscript
-# Copyright 2007-2008 Roy Marples
-# All rights reserved
+# Copyright 2007-2008 Roy Marples <roy@marples.name>
+# All rights reserved. Released under the 2-clause BSD license.
command=@PREFIX@%%/sbin/avahi-daemon
command_args="${avahid_args} -D"
diff --git a/init.d.misc/dbus.in b/init.d.misc/dbus.in
index ef52289..d022662 100644
--- a/init.d.misc/dbus.in
+++ b/init.d.misc/dbus.in
@@ -1,6 +1,6 @@
#!/sbin/runscript
-# Copyright 2007-2008 Roy Marples
-# All rights reserved
+# Copyright 2007-2008 Roy Marples <roy@marples.name>
+# All rights reserved. Released under the 2-clause BSD license.
command=@PREFIX@%%/bin/dbus-daemon
pidfile=@VARBASE@/run/dbus/dbus.pid
diff --git a/init.d.misc/dnsmasq.in b/init.d.misc/dnsmasq.in
index 21ce6f5..067b3c6 100644
--- a/init.d.misc/dnsmasq.in
+++ b/init.d.misc/dnsmasq.in
@@ -1,6 +1,6 @@
#!/sbin/runscript
-# Copyright 2007-2008 Roy Marples
-# All rights reserved
+# Copyright 2007-2008 Roy Marples <roy@marples.name>
+# All rights reserved. Released under the 2-clause BSD license.
command=@PREFIX@/sbin/dnsmasq
command_args=${dnsmasq_args}
diff --git a/init.d.misc/hald.in b/init.d.misc/hald.in
index 1fa50cf..591cd0b 100644
--- a/init.d.misc/hald.in
+++ b/init.d.misc/hald.in
@@ -1,6 +1,6 @@
#!/sbin/runscript
-# Copyright 2007-2008 Roy Marples
-# All rights reserved
+# Copyright 2007-2008 Roy Marples <roy@marples.name>
+# All rights reserved. Released under the 2-clause BSD license.
command=@PREFIX@/sbin/hald
pidfile=@VARBASE@/run/hald/hald.pid
diff --git a/init.d.misc/named.in b/init.d.misc/named.in
index b8d8275..2bdbef7 100644
--- a/init.d.misc/named.in
+++ b/init.d.misc/named.in
@@ -1,6 +1,6 @@
#!/sbin/runscript
-# Copyright 2007-2008 Roy Marples
-# All rights reserved
+# Copyright 2007-2008 Roy Marples <roy@marples.name>
+# All rights reserved. Released under the 2-clause BSD license.
command=/usr/sbin/named
command_args=${named_args}
diff --git a/init.d.misc/ntpd.in b/init.d.misc/ntpd.in
index d8a2d68..618da8a 100644
--- a/init.d.misc/ntpd.in
+++ b/init.d.misc/ntpd.in
@@ -1,6 +1,6 @@
#!/sbin/runscript
-# Copyright 2007-2008 Roy Marples
-# All rights reserved
+# Copyright 2007-2008 Roy Marples <roy@marples.name>
+# All rights reserved. Released under the 2-clause BSD license.
ntpd_config=${ntpd_config:-/etc/ntp.conf}
ntpd_drift=${ntpd_drift:-/var/db/ntpd.drift}
diff --git a/init.d.misc/openvpn.in b/init.d.misc/openvpn.in
index ad9e9d8..721ad23 100644
--- a/init.d.misc/openvpn.in
+++ b/init.d.misc/openvpn.in
@@ -1,6 +1,6 @@
#!/sbin/runscript
-# Copyright 2007-2008 Roy Marples
-# All rights reserved
+# Copyright 2007-2008 Roy Marples <roy@marples.name>
+# All rights reserved. Released under the 2-clause BSD license.
vpn=${SVCNAME#*.}
name="OpenVPN"
diff --git a/init.d.misc/polkitd.in b/init.d.misc/polkitd.in
index a3f9920..b76a88a 100644
--- a/init.d.misc/polkitd.in
+++ b/init.d.misc/polkitd.in
@@ -1,6 +1,6 @@
#!/sbin/runscript
-# Copyright 2007-2008 Roy Marples
-# All rights reserved
+# Copyright 2007-2008 Roy Marples <roy@marples.name>
+# All rights reserved. Released under the 2-clause BSD license.
command=@PREFIX@/sbin/polkitd
pidfile=@VARBASE@/run/polkitd/polkitd.pid
diff --git a/init.d.misc/sshd.in b/init.d.misc/sshd.in
index 0883af5..bfac8ef 100644
--- a/init.d.misc/sshd.in
+++ b/init.d.misc/sshd.in
@@ -1,6 +1,6 @@
#!/sbin/runscript
-# Copyright 2007-2008 Roy Marples
-# All rights reserved
+# Copyright 2007-2008 Roy Marples <roy@marples.name>
+# All rights reserved. Released under the 2-clause BSD license.
command=/usr/sbin/sshd
command_args=${sshd_args}
diff --git a/init.d/bootmisc b/init.d/bootmisc
index 43550dd..fd56a76 100755
--- a/init.d/bootmisc
+++ b/init.d/bootmisc
@@ -1,6 +1,6 @@
#!/sbin/runscript
-# Copyright 2007-2008 Roy Marples
-# All rights reserved
+# Copyright 2007-2008 Roy Marples <roy@marples.name>
+# All rights reserved. Released under the 2-clause BSD license.
depend()
{
diff --git a/init.d/checkfs b/init.d/checkfs
index 5e34e51..31982c8 100755
--- a/init.d/checkfs
+++ b/init.d/checkfs
@@ -1,6 +1,6 @@
#!/sbin/runscript
-# Copyright 2007-2008 Roy Marples
-# All rights reserved
+# Copyright 2007-2008 Roy Marples <roy@marples.name>
+# All rights reserved. Released under the 2-clause BSD license.
description="Check filesystems according to /etc/fstab for errors and \
optionally repair them."
diff --git a/init.d/checkroot b/init.d/checkroot
index 8e4bf64..0599140 100755
--- a/init.d/checkroot
+++ b/init.d/checkroot
@@ -1,6 +1,6 @@
#!/sbin/runscript
-# Copyright 2007-2008 Roy Marples
-# All rights reserved
+# Copyright 2007-2008 Roy Marples <roy@marples.name>
+# All rights reserved. Released under the 2-clause BSD license.
description="Check the root filesystem according to /etc/fstab for errors \
and optionally repair them."
diff --git a/init.d/halt.sh b/init.d/halt.sh
index c760af7..044659b 100755
--- a/init.d/halt.sh
+++ b/init.d/halt.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright 2007-2008 Roy Marples
-# All rights reserved
+# Copyright 2007-2008 Roy Marples <roy@marples.name>
+# All rights reserved. Released under the 2-clause BSD license.
. /etc/init.d/functions.sh
. "${RC_LIBDIR}"/sh/rc-functions.sh
diff --git a/init.d/hostname b/init.d/hostname
index 448f0b0..1ee3e38 100755
--- a/init.d/hostname
+++ b/init.d/hostname
@@ -1,6 +1,6 @@
#!/sbin/runscript
-# Copyright 2007-2008 Roy Marples
-# All rights reserved
+# Copyright 2007-2008 Roy Marples <roy@marples.name>
+# All rights reserved. Released under the 2-clause BSD license.
description="Sets the hostname of the machine."
diff --git a/init.d/local b/init.d/local
index bf8692a..dbb06b5 100755
--- a/init.d/local
+++ b/init.d/local
@@ -1,6 +1,6 @@
#!/sbin/runscript
-# Copyright 2007-2008 Roy Marples
-# All rights reserved
+# Copyright 2007-2008 Roy Marples <roy@marples.name>
+# All rights reserved. Released under the 2-clause BSD license.
description="Executes user commands in /etc/conf.d/local"
diff --git a/init.d/localmount b/init.d/localmount
index 8653399..1983aa5 100755
--- a/init.d/localmount
+++ b/init.d/localmount
@@ -1,6 +1,6 @@
#!/sbin/runscript
-# Copyright 2007-2008 Roy Marples
-# All rights reserved
+# Copyright 2007-2008 Roy Marples <roy@marples.name>
+# All rights reserved. Released under the 2-clause BSD license.
description="Mounts disks and swap according to /etc/fstab."
diff --git a/init.d/netmount b/init.d/netmount
index cc886c6..dd149a9 100755
--- a/init.d/netmount
+++ b/init.d/netmount
@@ -1,6 +1,6 @@
#!/sbin/runscript
-# Copyright 2007-2008 Roy Marples
-# All rights reserved
+# Copyright 2007-2008 Roy Marples <roy@marples.name>
+# All rights reserved. Released under the 2-clause BSD license.
description="Mounts network shares according to /etc/fstab."
diff --git a/init.d/swap b/init.d/swap
index aefe717..53cf45c 100644
--- a/init.d/swap
+++ b/init.d/swap
@@ -1,6 +1,6 @@
#!/sbin/runscript
-# Copyright 2007-2008 Roy Marples
-# All rights reserved
+# Copyright 2007-2008 Roy Marples <roy@marples.name>
+# All rights reserved. Released under the 2-clause BSD license.
depend()
{
diff --git a/init.d/urandom b/init.d/urandom
index f6585de..d02c66d 100755
--- a/init.d/urandom
+++ b/init.d/urandom
@@ -1,6 +1,6 @@
#!/sbin/runscript
-# Copyright 2007-2008 Roy Marples
-# All rights reserved
+# Copyright 2007-2008 Roy Marples <roy@marples.name>
+# All rights reserved. Released under the 2-clause BSD license.
urandom_seed=${urandom_seed:-${URANDOM_SEED:-/var/run/random-seed}}
diff --git a/net.BSD/ifconfig.sh b/net.BSD/ifconfig.sh
index 1a8d2f0..8b73973 100644
--- a/net.BSD/ifconfig.sh
+++ b/net.BSD/ifconfig.sh
@@ -1,5 +1,5 @@
-# Copyright 2007-2008 Roy Marples
-# All rights reserved
+# Copyright 2007-2008 Roy Marples <roy@marples.name>
+# All rights reserved. Released under the 2-clause BSD license.
ifconfig_depend()
{
diff --git a/net.BSD/iwconfig.sh b/net.BSD/iwconfig.sh
index 76cf71a..3a276cd 100644
--- a/net.BSD/iwconfig.sh
+++ b/net.BSD/iwconfig.sh
@@ -1,5 +1,5 @@
-# Copyright 2007-2008 Roy Marples
-# All rights reserved
+# Copyright 2007-2008 Roy Marples <roy@marples.name>
+# All rights reserved. Released under the 2-clause BSD license.
_config_vars="$_config_vars ssid mode associate_timeout preferred_aps"
_config_vars="$_config_vars blacklist_aps"
diff --git a/net.Linux/adsl.sh b/net.Linux/adsl.sh
index d866c59..6dd93e0 100644
--- a/net.Linux/adsl.sh
+++ b/net.Linux/adsl.sh
@@ -1,6 +1,6 @@
# Copyright 2004-2007 Gentoo Foundation
-# Copyright 2007 Roy Marples
-# All rights reserved
+# Copyright 2007-2008 Roy Marples <roy@marples.name>
+# All rights reserved. Released under the 2-clause BSD license.
adsl_depend()
{
diff --git a/net.Linux/apipa.sh b/net.Linux/apipa.sh
index 3236466..39da392 100644
--- a/net.Linux/apipa.sh
+++ b/net.Linux/apipa.sh
@@ -1,5 +1,5 @@
-# Copyright 2007-2008 Roy Marples
-# All rights reserved
+# Copyright 2007-2008 Roy Marples <roy@marples.name>
+# All rights reserved. Released under the 2-clause BSD license.
apipa_depend()
{
diff --git a/net.Linux/arping.sh b/net.Linux/arping.sh
index 7bea0d0..8046c47 100644
--- a/net.Linux/arping.sh
+++ b/net.Linux/arping.sh
@@ -1,5 +1,5 @@
-# Copyright 2007-2008 Roy Marples
-# All rights reserved
+# Copyright 2007-2008 Roy Marples <roy@marples.name>
+# All rights reserved. Released under the 2-clause BSD license.
arping_depend()
{
diff --git a/net.Linux/bonding.sh b/net.Linux/bonding.sh
index 122d70a..69de32a 100644
--- a/net.Linux/bonding.sh
+++ b/net.Linux/bonding.sh
@@ -1,5 +1,5 @@
-# Copyright 2007-2008 Roy Marples
-# All rights reserved
+# Copyright 2007-2008 Roy Marples <roy@marples.name>
+# All rights reserved. Released under the 2-clause BSD license.
bonding_depend()
{
diff --git a/net.Linux/br2684ctl.sh b/net.Linux/br2684ctl.sh
index 8d15f78..11ee4f5 100644
--- a/net.Linux/br2684ctl.sh
+++ b/net.Linux/br2684ctl.sh
@@ -1,5 +1,5 @@
-# Copyright 2007-2008 Roy Marples
-# All rights reserved
+# Copyright 2007-2008 Roy Marples <roy@marples.name>
+# All rights reserved. Released under the 2-clause BSD license.
_br2684ctl()
{
diff --git a/net.Linux/bridge.sh b/net.Linux/bridge.sh
index b35e6a6..517fe72 100644
--- a/net.Linux/bridge.sh
+++ b/net.Linux/bridge.sh
@@ -1,5 +1,5 @@
-# Copyright 2007-2008 Roy Marples
-# All rights reserved
+# Copyright 2007-2008 Roy Marples <roy@marples.name>
+# All rights reserved. Released under the 2-clause BSD license.
bridge_depend()
{
diff --git a/net.Linux/ccwgroup.sh b/net.Linux/ccwgroup.sh
index dcdb7b1..d40e713 100644
--- a/net.Linux/ccwgroup.sh
+++ b/net.Linux/ccwgroup.sh
@@ -1,5 +1,5 @@
-# Copyright 2007-2008 Roy Marples
-# All rights reserved
+# Copyright 2007-2008 Roy Marples <roy@marples.name>
+# All rights reserved. Released under the 2-clause BSD license.
_config_vars="$_config_vars ccwgroup"
diff --git a/net.Linux/ifconfig.sh b/net.Linux/ifconfig.sh
index 12c71eb..f82f25c 100644
--- a/net.Linux/ifconfig.sh
+++ b/net.Linux/ifconfig.sh
@@ -1,5 +1,5 @@
-# Copyright 2007-2008 Roy Marples
-# All rights reserved
+# Copyright 2007-2008 Roy Marples <roy@marples.name>
+# All rights reserved. Released under the 2-clause BSD license.
ifconfig_depend()
{
diff --git a/net.Linux/ifplugd.sh b/net.Linux/ifplugd.sh
index 098e68d..db7007a 100644
--- a/net.Linux/ifplugd.sh
+++ b/net.Linux/ifplugd.sh
@@ -1,5 +1,5 @@
-# Copyright 2007-2008 Roy Marples
-# All rights reserved
+# Copyright 2007-2008 Roy Marples <roy@marples.name>
+# All rights reserved. Released under the 2-clause BSD license.
_config_vars="$_config_vars plug_timeout"
diff --git a/net.Linux/ip6to4.sh b/net.Linux/ip6to4.sh
index 0216484..d58eb31 100644
--- a/net.Linux/ip6to4.sh
+++ b/net.Linux/ip6to4.sh
@@ -1,5 +1,5 @@
-# Copyright 2007-2008 Roy Marples
-# All rights reserved
+# Copyright 2007-2008 Roy Marples <roy@marples.name>
+# All rights reserved. Released under the 2-clause BSD license.
_config_vars="$_config_vars link suffix relay"
diff --git a/net.Linux/ipppd.sh b/net.Linux/ipppd.sh
index 5c633ad..cf4558d 100644
--- a/net.Linux/ipppd.sh
+++ b/net.Linux/ipppd.sh
@@ -1,5 +1,5 @@
-# Copyright 2007-2008 Roy Marples
-# All rights reserved
+# Copyright 2007-2008 Roy Marples <roy@marples.name>
+# All rights reserved. Released under the 2-clause BSD license.
ipppd_depend()
{
diff --git a/net.Linux/iproute2.sh b/net.Linux/iproute2.sh
index 8cfcae9..de76537 100644
--- a/net.Linux/iproute2.sh
+++ b/net.Linux/iproute2.sh
@@ -1,5 +1,5 @@
-# Copyright 2007-2008 Roy Marples
-# All rights reserved
+# Copyright 2007-2008 Roy Marples <roy@marples.name>
+# All rights reserved. Released under the 2-clause BSD license.
iproute2_depend()
{
diff --git a/net.Linux/iwconfig.sh b/net.Linux/iwconfig.sh
index 89e466a..1610cba 100644
--- a/net.Linux/iwconfig.sh
+++ b/net.Linux/iwconfig.sh
@@ -1,5 +1,5 @@
-# Copyright 2007-2008 Roy Marples
-# All rights reserved
+# Copyright 2007-2008 Roy Marples <roy@marples.name>
+# All rights reserved. Released under the 2-clause BSD license.
_config_vars="$_config_vars ssid mode associate_timeout sleep_scan"
_config_vars="$_config_vars preferred_aps blacklist_aps"
diff --git a/net.Linux/netplugd.sh b/net.Linux/netplugd.sh
index cad380e..eed37aa 100644
--- a/net.Linux/netplugd.sh
+++ b/net.Linux/netplugd.sh
@@ -1,5 +1,5 @@
-# Copyright 2007-2008 Roy Marples
-# All rights reserved
+# Copyright 2007-2008 Roy Marples <roy@marples.name>
+# All rights reserved. Released under the 2-clause BSD license.
_config_vars="$_config_vars plug_timeout"
diff --git a/net.Linux/pppd.sh b/net.Linux/pppd.sh
index 4ab2007..abee058 100644
--- a/net.Linux/pppd.sh
+++ b/net.Linux/pppd.sh
@@ -1,6 +1,6 @@
# Copyright 2005-2007 Gentoo Foundation
-# Copyright 2007-2008 Roy Marples
-# All rights reserved
+# Copyright 2007-2008 Roy Marples <roy@marples.name>
+# All rights reserved. Released under the 2-clause BSD license.
pppd_depend()
{
diff --git a/net.Linux/pump.sh b/net.Linux/pump.sh
index dd399ab..4ab7929 100644
--- a/net.Linux/pump.sh
+++ b/net.Linux/pump.sh
@@ -1,5 +1,5 @@
-# Copyright 2007-2008 Roy Marples
-# All rights reserved
+# Copyright 2007-2008 Roy Marples <roy@marples.name>
+# All rights reserved. Released under the 2-clause BSD license.
pump_depend()
{
diff --git a/net.Linux/tuntap.sh b/net.Linux/tuntap.sh
index 64b09d7..79d8071 100644
--- a/net.Linux/tuntap.sh
+++ b/net.Linux/tuntap.sh
@@ -1,5 +1,5 @@
-# Copyright 2007-2008 Roy Marples
-# All rights reserved
+# Copyright 2007-2008 Roy Marples <roy@marples.name>
+# All rights reserved. Released under the 2-clause BSD license.
tuntap_depend()
{
diff --git a/net.Linux/udhcpc.sh b/net.Linux/udhcpc.sh
index 542c7e0..462f058 100644
--- a/net.Linux/udhcpc.sh
+++ b/net.Linux/udhcpc.sh
@@ -1,5 +1,5 @@
-# Copyright 2007-2008 Roy Marples
-# All rights reserved
+# Copyright 2007-2008 Roy Marples <roy@marples.name>
+# All rights reserved. Released under the 2-clause BSD license.
udhcpc_depend()
{
diff --git a/net.Linux/vlan.sh b/net.Linux/vlan.sh
index f8cc4fd..2883f3b 100644
--- a/net.Linux/vlan.sh
+++ b/net.Linux/vlan.sh
@@ -1,5 +1,5 @@
-# Copyright 2007-2008 Roy Marples
-# All rights reserved
+# Copyright 2007-2008 Roy Marples <roy@marples.name>
+# All rights reserved. Released under the 2-clause BSD license.
vlan_depend()
{
diff --git a/net/dhclient.sh b/net/dhclient.sh
index 196fea0..9404656 100644
--- a/net/dhclient.sh
+++ b/net/dhclient.sh
@@ -1,5 +1,5 @@
-# Copyright 2007-2008 Roy Marples
-# All rights reserved
+# Copyright 2007-2008 Roy Marples <roy@marples.name>
+# All rights reserved. Released under the 2-clause BSD license.
dhclient_depend()
{
diff --git a/net/dhcpcd.sh b/net/dhcpcd.sh
index fe2fba5..c732ed9 100644
--- a/net/dhcpcd.sh
+++ b/net/dhcpcd.sh
@@ -1,5 +1,5 @@
-# Copyright 2007-2008 Roy Marples
-# All rights reserved
+# Copyright 2007-2008 Roy Marples <roy@marples.name>
+# All rights reserved. Released under the 2-clause BSD license.
dhcpcd_depend()
{
diff --git a/net/macchanger.sh b/net/macchanger.sh
index 42d3f73..b2d0cd7 100644
--- a/net/macchanger.sh
+++ b/net/macchanger.sh
@@ -1,5 +1,5 @@
-# Copyright 2007-2008 Roy Marples
-# All rights reserved
+# Copyright 2007-2008 Roy Marples <roy@marples.name>
+# All rights reserved. Released under the 2-clause BSD license.
macchanger_depend()
{
diff --git a/net/macnet.sh b/net/macnet.sh
index c1d5a78..bbea18e 100644
--- a/net/macnet.sh
+++ b/net/macnet.sh
@@ -1,5 +1,5 @@
-# Copyright 2007-2008 Roy Marples
-# All rights reserved
+# Copyright 2007-2008 Roy Marples <roy@marples.name>
+# All rights reserved. Released under the 2-clause BSD license.
macnet_depend()
{
diff --git a/net/ssidnet.sh b/net/ssidnet.sh
index b9324d3..4837091 100644
--- a/net/ssidnet.sh
+++ b/net/ssidnet.sh
@@ -1,5 +1,5 @@
-# Copyright 2007-2008 Roy Marples
-# All rights reserved
+# Copyright 2007-2008 Roy Marples <roy@marples.name>
+# All rights reserved. Released under the 2-clause BSD license.
ssidnet_depend()
{
diff --git a/net/system.sh b/net/system.sh
index 1b1b271..2cbab9c 100644
--- a/net/system.sh
+++ b/net/system.sh
@@ -1,5 +1,5 @@
-# Copyright 2007-2008 Roy Marples
-# All rights reserved
+# Copyright 2007-2008 Roy Marples <roy@marples.name>
+# All rights reserved. Released under the 2-clause BSD license.
_config_vars="$_config_vars dns_servers dns_domain dns_search"
_config_vars="$_config_vars dns_sortlist dns_options"
diff --git a/net/wpa_supplicant.sh b/net/wpa_supplicant.sh
index c6870b4..fe9e3d2 100644
--- a/net/wpa_supplicant.sh
+++ b/net/wpa_supplicant.sh
@@ -1,5 +1,5 @@
-# Copyright 2007-2008 Roy Marples
-# All rights reserved
+# Copyright 2007-2008 Roy Marples <roy@marples.name>
+# All rights reserved. Released under the 2-clause BSD license.
wpa_supplicant_depend()
{
diff --git a/sh.BSD/init.sh b/sh.BSD/init.sh
index c226e31..71902c5 100755
--- a/sh.BSD/init.sh
+++ b/sh.BSD/init.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright 2007-2008 Roy Marples
-# All rights reserved
+# Copyright 2007-2008 Roy Marples <roy@marples.name>
+# All rights reserved. Released under the 2-clause BSD license.
# void single_user()
# Drop to a shell, remount / ro, and then reboot
diff --git a/sh.Linux/init-early.sh b/sh.Linux/init-early.sh
index 328b0a9..784ddfd 100755
--- a/sh.Linux/init-early.sh
+++ b/sh.Linux/init-early.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright 2007-2008 Roy Marples
-# All rights reserved
+# Copyright 2007-2008 Roy Marples <roy@marples.name>
+# All rights reserved. Released under the 2-clause BSD license.
# Try and set a font and as early as we can
if [ -e /etc/runlevels/"${RC_DEFAULTLEVEL}"/consolefont \
diff --git a/sh.Linux/init.sh b/sh.Linux/init.sh
index 9acf883..1be9b4a 100755
--- a/sh.Linux/init.sh
+++ b/sh.Linux/init.sh
@@ -1,7 +1,7 @@
#!/bin/sh
# Copyright 1999-2007 Gentoo Foundation
-# Copyright 2007-2008 Roy Marples
-# All rights reserved
+# Copyright 2007-2008 Roy Marples <roy@marples.name>
+# All rights reserved. Released under the 2-clause BSD license.
# udev needs these functions still :/
try()
diff --git a/sh/functions.sh b/sh/functions.sh
index 56af00f..effce67 100644
--- a/sh/functions.sh
+++ b/sh/functions.sh
@@ -1,5 +1,5 @@
-# Copyright 2007-2008 Roy Marples
-# All rights reserved
+# Copyright 2007-2008 Roy Marples <roy@marples.name>
+# All rights reserved. Released under the 2-clause BSD license.
# Allow any sh script to work with einfo functions and friends
# We also provide a few helpful functions for other programs to use
diff --git a/sh/gendepends.sh b/sh/gendepends.sh
index de12bc2..0fd5b19 100755
--- a/sh/gendepends.sh
+++ b/sh/gendepends.sh
@@ -1,8 +1,8 @@
#!/bin/sh
# Shell wrapper to list our dependencies
-# Copyright 2007-2008 Roy Marples
-# All rights reserved
+# Copyright 2007-2008 Roy Marples <roy@marples.name>
+# All rights reserved. Released under the 2-clause BSD license.
. /etc/init.d/functions.sh
diff --git a/sh/init-common-post.sh b/sh/init-common-post.sh
index ca61d09..a246a84 100644
--- a/sh/init-common-post.sh
+++ b/sh/init-common-post.sh
@@ -1,5 +1,5 @@
-# Copyright 2007-2008 Roy Marples
-# All rights reserved
+# Copyright 2007-2008 Roy Marples <roy@marples.name>
+# All rights reserved. Released under the 2-clause BSD license.
# mount $svcdir as something we can write to if it's not rw
# On vservers, / is always rw at this point, so we need to clean out
diff --git a/sh/net.sh b/sh/net.sh
index f3e43e2..e42c086 100755
--- a/sh/net.sh
+++ b/sh/net.sh
@@ -1,6 +1,6 @@
#!/sbin/runscript
-# Copyright 2007-2008 Roy Marples
-# All rights reserved
+# Copyright 2007-2008 Roy Marples <roy@marples.name>
+# All rights reserved. Released under the 2-clause BSD license.
MODULESDIR="${RC_LIBDIR}/net"
MODULESLIST="${RC_SVCDIR}/nettree"
diff --git a/sh/rc-functions.sh b/sh/rc-functions.sh
index 66a26f4..2a57709 100755
--- a/sh/rc-functions.sh
+++ b/sh/rc-functions.sh
@@ -1,6 +1,6 @@
# Copyright 2007 Gentoo Foundation
-# Copyright 2007-2008 Roy Marples
-# All rights reserved
+# Copyright 2007-2008 Roy Marples <roy@marples.name>
+# All rights reserved. Released under the 2-clause BSD license.
has_addon()
{
diff --git a/sh/rc-mount.sh b/sh/rc-mount.sh
index 5e791b7..56a8f78 100644
--- a/sh/rc-mount.sh
+++ b/sh/rc-mount.sh
@@ -1,5 +1,5 @@
-# Copyright 2007-2008 Roy Marples
-# All rights reserved
+# Copyright 2007-2008 Roy Marples <roy@marples.name>
+# All rights reserved. Released under the 2-clause BSD license.
# Handy function to handle all our unmounting needs
# mountinfo is a C program to actually find our mounts on our supported OS's
diff --git a/sh/runscript.sh b/sh/runscript.sh
index eea9a3e..a59584c 100755
--- a/sh/runscript.sh
+++ b/sh/runscript.sh
@@ -1,8 +1,8 @@
#!/bin/sh
# Shell wrapper for runscript
-# Copyright 2007-2008 Roy Marples
-# All rights reserved
+# Copyright 2007-2008 Roy Marples <roy@marples.name>
+# All rights reserved. Released under the 2-clause BSD license.
. /etc/init.d/functions.sh
. "${RC_LIBDIR}"/sh/rc-functions.sh
diff --git a/support/openvpn/down.sh b/support/openvpn/down.sh
index 063c69c..686838a 100755
--- a/support/openvpn/down.sh
+++ b/support/openvpn/down.sh
@@ -1,27 +1,6 @@
#!/bin/sh
-# Copyright 2007 Roy Marples
-# All rights reserved
-
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
+# Copyright 2007-2008 Roy Marples <roy@marples.name>
+# All rights reserved. Released under the 2-clause BSD license.
# If we have a service specific script, run this now
[ -x "${SVCNAME}"-down.sh ] && "${SVCNAME}"-down.sh
diff --git a/support/openvpn/up.sh b/support/openvpn/up.sh
index 4fa5836..6d0c43e 100755
--- a/support/openvpn/up.sh
+++ b/support/openvpn/up.sh
@@ -1,27 +1,6 @@
#!/bin/sh
-# Copyright 2007 Roy Marples
-# All rights reserved
-
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
+# Copyright 2007-2008 Roy Marples <roy@marples.name>
+# All rights reserved. Released under the 2-clause BSD license.
# Setup our resolv.conf
# Vitally important that we use the domain entry in resolv.conf so we