diff options
author | Arjan Bouter | 2009-09-15 00:33:37 +0200 |
---|---|---|
committer | Arjan Bouter | 2009-09-15 00:33:37 +0200 |
commit | 3089ba70c8c44df590df971f088939e4562a15bc (patch) | |
tree | 511ee795445b8d3cda0d3d0b17d0f00f6526e158 | |
parent | d2802e1735ba4960377b41ce1fc568cff1d7cfdd (diff) |
smgl-upstart: improved native init scripts
-rw-r--r-- | smgl/smgl-upstart/HISTORY | 3 | ||||
-rw-r--r-- | smgl/smgl-upstart/upstart-init/native/README | 3 | ||||
-rw-r--r-- | smgl/smgl-upstart/upstart-init/native/clamav (renamed from smgl/smgl-upstart/upstart-init/native/clamav.conf) | 0 | ||||
-rw-r--r-- | smgl/smgl-upstart/upstart-init/native/freshclam (renamed from smgl/smgl-upstart/upstart-init/native/freshclam.conf) | 0 | ||||
-rw-r--r-- | smgl/smgl-upstart/upstart-init/native/libvirtd.conf | 15 | ||||
-rw-r--r-- | smgl/smgl-upstart/upstart-init/native/rc.conf | 18 | ||||
-rw-r--r-- | smgl/smgl-upstart/upstart-init/native/syslog.conf | 4 | ||||
-rw-r--r-- | smgl/smgl-upstart/upstart-init/native/xend.conf | 25 | ||||
-rw-r--r-- | smgl/smgl-upstart/upstart-init/native/xinetd.conf | 2 |
9 files changed, 48 insertions, 22 deletions
diff --git a/smgl/smgl-upstart/HISTORY b/smgl/smgl-upstart/HISTORY index a406a15e25..6c3aa1fced 100644 --- a/smgl/smgl-upstart/HISTORY +++ b/smgl/smgl-upstart/HISTORY @@ -1,3 +1,6 @@ +2009-09-15 Arjan Bouter <abouter@sourcemage.org> + * improved the native init scripts + 2009-09-11 Arjan Bouter <abouter@sourcemage.org> * rewritten native scripts to emit events to avoid race conditions diff --git a/smgl/smgl-upstart/upstart-init/native/README b/smgl/smgl-upstart/upstart-init/native/README index 7359d101a4..19bbea9076 100644 --- a/smgl/smgl-upstart/upstart-init/native/README +++ b/smgl/smgl-upstart/upstart-init/native/README @@ -1,6 +1,7 @@ Some useful things to know about upstart on smgl -- The jobs upstart knows about are in the *.conf files, one file per service/daemon/task/job +- The jobs upstart knows about are in the *.conf files, one file per service/daemon/task/job, add or remove the .conf + part to en-/disable the job - The jobs MAY NOT FAIL, or the entire boot process is halted... - use a script in the scripts dir and a job pointing to it when a job can fail and make sure the script exits cleanly - if a job needs to emit a signal, name it <jobname>-start or <jobname>-stop for consistency diff --git a/smgl/smgl-upstart/upstart-init/native/clamav.conf b/smgl/smgl-upstart/upstart-init/native/clamav index b3d72deb2a..b3d72deb2a 100644 --- a/smgl/smgl-upstart/upstart-init/native/clamav.conf +++ b/smgl/smgl-upstart/upstart-init/native/clamav diff --git a/smgl/smgl-upstart/upstart-init/native/freshclam.conf b/smgl/smgl-upstart/upstart-init/native/freshclam index ed678c410e..ed678c410e 100644 --- a/smgl/smgl-upstart/upstart-init/native/freshclam.conf +++ b/smgl/smgl-upstart/upstart-init/native/freshclam diff --git a/smgl/smgl-upstart/upstart-init/native/libvirtd.conf b/smgl/smgl-upstart/upstart-init/native/libvirtd.conf new file mode 100644 index 0000000000..06aa4c161a --- /dev/null +++ b/smgl/smgl-upstart/upstart-init/native/libvirtd.conf @@ -0,0 +1,15 @@ +# libvirtd +# +# starts libvirtd + +description "Start libvirtd" +author "Arjan Bouter <abouter@sourcemage.org>" + +start on started xend +stop on stopped xend + +pre-start script + [[ ! -d /var/run/libvirt ]] && mkdir -p /var/run/libvirt +end script + +exec /usr/sbin/libvirtd diff --git a/smgl/smgl-upstart/upstart-init/native/rc.conf b/smgl/smgl-upstart/upstart-init/native/rc.conf deleted file mode 100644 index 46f295bb27..0000000000 --- a/smgl/smgl-upstart/upstart-init/native/rc.conf +++ /dev/null @@ -1,18 +0,0 @@ -# rc -# -# starts essential jobs - -description "Start essential jobs" -author "Arjan Bouter <abouter@sourcemage.org>" - -start on startup -stop on shutdown - -task - -script - start mount_root - start devices - start lvm - start mount_all -end script diff --git a/smgl/smgl-upstart/upstart-init/native/syslog.conf b/smgl/smgl-upstart/upstart-init/native/syslog.conf index 086760e215..21c67e0a3d 100644 --- a/smgl/smgl-upstart/upstart-init/native/syslog.conf +++ b/smgl/smgl-upstart/upstart-init/native/syslog.conf @@ -2,7 +2,7 @@ # # starts a syslog daemon -description "Start and enable a syslog daemon" +description "Start a syslog daemon" author "Arjan Bouter <abouter@sourcemage.org>" start on filesystems-mounted @@ -14,7 +14,7 @@ script . /etc/sysconfig/facilities case $syslog in smgl-metalog) echo "Starting metalog" - initctl emit syslog-start + initctl emit syslog-start & metalog ;; *) echo "unknown syslog provider, aborting" ;; esac diff --git a/smgl/smgl-upstart/upstart-init/native/xend.conf b/smgl/smgl-upstart/upstart-init/native/xend.conf new file mode 100644 index 0000000000..ace598ec69 --- /dev/null +++ b/smgl/smgl-upstart/upstart-init/native/xend.conf @@ -0,0 +1,25 @@ +# xend +# +# starts xend + +description "Check for Xen and run xend" +author "Arjan Bouter <abouter@sourcemage.org>" + +start on network-up and syslog-start +stop on shutdown + +pre-start script + if xen-detect > /dev/null 2>&1 ; then + echo 'Running in xen!' + mount -t xenfs xenfs /proc/xen + else + echo "Not running in Xen, won't start xend." + return 1 + fi +end script + +exec xend start + +#stop exec xend stop + +#status exec xend status diff --git a/smgl/smgl-upstart/upstart-init/native/xinetd.conf b/smgl/smgl-upstart/upstart-init/native/xinetd.conf index f61ba0301e..0245ddc765 100644 --- a/smgl/smgl-upstart/upstart-init/native/xinetd.conf +++ b/smgl/smgl-upstart/upstart-init/native/xinetd.conf @@ -2,7 +2,7 @@ # # starts xinetd -description "Find and enable LVM" +description "Start xinetd" author "Arjan Bouter <abouter@sourcemage.org>" start on network-up and syslog-start |