aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoy Marples <roy@marples.name>2008-01-11 12:18:05 +0000
committerRoy Marples <roy@marples.name>2008-01-11 12:18:05 +0000
commit6b41b6500842b2b6bd7f78b4f2ccda579ee1a108 (patch)
treea57599974eb573de7b12ec118e1c658a527ad3ec
parent3bf49a9bd19d5bbcf6976dd42b4f87f1b173e287 (diff)
Remove vim settings.
-rw-r--r--init.d.FreeBSD/clock14
-rw-r--r--init.d.misc/avahi-dnsconfd.in3
-rw-r--r--init.d.misc/avahid.in3
-rw-r--r--init.d.misc/dbus.in8
-rw-r--r--init.d.misc/dnsmasq.in8
-rw-r--r--init.d.misc/hald.in5
-rw-r--r--init.d.misc/named.in14
-rw-r--r--init.d.misc/ntpd.in8
-rw-r--r--init.d.misc/openvpn.in8
-rw-r--r--init.d.misc/polkitd.in5
-rw-r--r--init.d.misc/sshd.in8
11 files changed, 44 insertions, 40 deletions
diff --git a/init.d.FreeBSD/clock b/init.d.FreeBSD/clock
index 3e7ce152..1000f846 100644
--- a/init.d.FreeBSD/clock
+++ b/init.d.FreeBSD/clock
@@ -14,7 +14,8 @@ else
utc="Local Time"
fi
-depend() {
+depend()
+{
# BSD adjkerntz needs to be able to write to /etc
if [ "${clock}" = "UTC" -a -e /etc/wall_cmos_clock ] ||
[ "${clock}" != "UTC" -a ! -e /etc/wall_cmos_clock ]; then
@@ -22,7 +23,8 @@ depend() {
fi
}
-start() {
+start()
+{
ebegin "Starting the System Clock Adjuster [${utc}]"
if [ "${clock}" != "UTC" ]; then
echo >/etc/wall_cmos_clock
@@ -34,13 +36,15 @@ start() {
eend $?
}
-save() {
+save()
+{
ebegin "Setting hardware clock using the system clock [${utc}]"
adjkerntz -a
eend $?
}
-stop() {
+stop()
+{
# Don't tweak the hardware clock on LiveCD halt.
if yesno "${clock_systohc:-${CLOCK_SYSTOHC}}"; then
[ -z "${CDBOOT}" ] && save
@@ -54,5 +58,3 @@ stop() {
eend 0
fi
}
-
-# vim: set ts=4 :
diff --git a/init.d.misc/avahi-dnsconfd.in b/init.d.misc/avahi-dnsconfd.in
index f57ccabd..d7e1ddd4 100644
--- a/init.d.misc/avahi-dnsconfd.in
+++ b/init.d.misc/avahi-dnsconfd.in
@@ -7,7 +7,8 @@ command_args="${avahi_dnsconfd_args} -D"
pidfile=@VARBASE@/run/avahi-dnsconfd.pid
name="Avahi DNS Configuration Daemon"
-depend() {
+depend()
+{
use dns
need localmount dbus
after bootmisc
diff --git a/init.d.misc/avahid.in b/init.d.misc/avahid.in
index 344751b2..b2359393 100644
--- a/init.d.misc/avahid.in
+++ b/init.d.misc/avahid.in
@@ -7,7 +7,8 @@ command_args="${avahid_args} -D"
pidfile=@VARBASE@/run/avahi-daemon/pid
name="Avahi Service Advertisement Daemon"
-depend() {
+depend()
+{
use dns
need localmount dbus
after bootmisc
diff --git a/init.d.misc/dbus.in b/init.d.misc/dbus.in
index 2060ee12..ef522891 100644
--- a/init.d.misc/dbus.in
+++ b/init.d.misc/dbus.in
@@ -7,13 +7,13 @@ pidfile=@VARBASE@/run/dbus/dbus.pid
command_args="${dbusd_args---system}"
name="Message Bus Daemon"
-depend() {
+depend()
+{
need localmount net
after bootmisc
}
-start_pre() {
+start_pre()
+{
mkdir -p $(dirname $pidfile)
}
-
-# vim: set ts=4 :
diff --git a/init.d.misc/dnsmasq.in b/init.d.misc/dnsmasq.in
index b84c2750..21ce6f58 100644
--- a/init.d.misc/dnsmasq.in
+++ b/init.d.misc/dnsmasq.in
@@ -9,16 +9,16 @@ required_files=/etc/dnsmasq.conf
extra_started_commands="reload"
-depend() {
+depend()
+{
provide dns
need localmount net
after bootmisc
}
-reload() {
+reload()
+{
ebegin "Reloading ${SVCNAME}"
start-stop-daemon --signal SIGHUP --pidfile "${pidfile}"
eend $?
}
-
-# vim: set ts=4 :
diff --git a/init.d.misc/hald.in b/init.d.misc/hald.in
index 04043df0..1fa50cfd 100644
--- a/init.d.misc/hald.in
+++ b/init.d.misc/hald.in
@@ -7,8 +7,7 @@ pidfile=@VARBASE@/run/hald/hald.pid
command_args="${hald_args}"
name="Hardware Abstraction Layer Daemon"
-depend() {
+depend()
+{
need dbus
}
-
-# vim: set ts=4 :
diff --git a/init.d.misc/named.in b/init.d.misc/named.in
index d92af43e..b8d82750 100644
--- a/init.d.misc/named.in
+++ b/init.d.misc/named.in
@@ -11,13 +11,15 @@ extra_started_commands="reload"
namedb=/etc/namedb
named_uid=${named_uid:-bind}
-depend() {
+depend()
+{
provide dns
need localmount
after bootmisc
}
-start_pre() {
+start_pre()
+{
if [ -n "${named_chroot}" ]; then
# Create (or update) the chroot directory structure
if [ -r /etc/mtree/BIND.chroot.dist ]; then
@@ -84,14 +86,14 @@ start_pre() {
fi
}
-reload() {
+reload()
+{
rndc reload
}
-stop_post() {
+stop_post()
+{
if [ -n "${named_chroot}" -a -c "${named_chroot}"/dev/null ]; then
umount "${named_chroot}"/dev 2>/dev/null || true
fi
}
-
-# vim: set ts=4 :
diff --git a/init.d.misc/ntpd.in b/init.d.misc/ntpd.in
index 1ebd68ee..d8a2d68a 100644
--- a/init.d.misc/ntpd.in
+++ b/init.d.misc/ntpd.in
@@ -10,13 +10,15 @@ pidfile=/var/run/ntpd.pid
command_args="${ntpd_args} -c ${ntpd_config} -f ${ntpd_drift} -p ${pidfile}"
name="Network Time Protocol Daemon"
-depend() {
+depend()
+{
use dns
need localmount
after bootmisc ntp-client
}
-start_pre() {
+start_pre()
+{
if [ ! -r "${ntpd_config}" ]; then
eerror "${ntpd_config} is not readable"
return 1
@@ -36,5 +38,3 @@ start_pre() {
command_args="${command_args} -u ntpd:ntpd -i ${ntpd_chroot}"
fi
}
-
-# vim: set ts=4 :
diff --git a/init.d.misc/openvpn.in b/init.d.misc/openvpn.in
index c180e24f..ad9e9d83 100644
--- a/init.d.misc/openvpn.in
+++ b/init.d.misc/openvpn.in
@@ -28,12 +28,14 @@ if yesno "${openvpn_client}"; then
start_inactive="YES"
fi
-depend() {
+depend()
+{
need net
use dns
}
-start_pre() {
+start_pre()
+{
# Linux has good dynamic tun/tap creation
if [ "${RC_UNAME}" = "Linux" ]; then
if [ ! -e /dev/net/tun ]; then
@@ -62,5 +64,3 @@ start_pre() {
command_args="${command_args} --cd ${openvpn_dir}"
fi
}
-
-# vim: set ts=4 :
diff --git a/init.d.misc/polkitd.in b/init.d.misc/polkitd.in
index 8f45e889..a3f9920b 100644
--- a/init.d.misc/polkitd.in
+++ b/init.d.misc/polkitd.in
@@ -7,8 +7,7 @@ pidfile=@VARBASE@/run/polkitd/polkitd.pid
command_args="${polkitd_args}"
name="PolicyKit Daemon"
-depend() {
+depend()
+{
need dbus
}
-
-# vim: set ts=4 :
diff --git a/init.d.misc/sshd.in b/init.d.misc/sshd.in
index ace5659b..0883af50 100644
--- a/init.d.misc/sshd.in
+++ b/init.d.misc/sshd.in
@@ -8,12 +8,14 @@ pidfile=@VARBASE@/run/sshd.pid
required_files=/etc/ssh/sshd_config
required_dirs=@VARBASE@/empty
-depend() {
+depend()
+{
use logger dns
need net
}
-start_pre() {
+start_pre()
+{
if [ ! -e /etc/ssh/ssh_host_key ]; then
ebegin "Generating Hostkey"
ssh-keygen -t rsa1 -b 1024 -f /etc/ssh/ssh_host_key -N ''
@@ -32,5 +34,3 @@ start_pre() {
${command} -t
}
-
-# vim: set ts=4 :