Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Arjan Bouter (3089ba70c8c44df590df971f088939e4562a15bc)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Arjan Bouter <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Arjan Bouter (3089ba70c8c44df590df971f088939e4562a15bc)
  • Date: Mon, 14 Sep 2009 17:35:28 -0500

GIT changes to master grimoire by Arjan Bouter <abouter AT sourcemage.org>:

smgl/smgl-upstart/HISTORY | 3 ++
smgl/smgl-upstart/upstart-init/native/README | 3 +-
smgl/smgl-upstart/upstart-init/native/clamav | 13 +++++++++
smgl/smgl-upstart/upstart-init/native/clamav.conf | 13 ---------
smgl/smgl-upstart/upstart-init/native/freshclam | 11 ++++++++
smgl/smgl-upstart/upstart-init/native/freshclam.conf | 11 --------
smgl/smgl-upstart/upstart-init/native/libvirtd.conf | 15 +++++++++++
smgl/smgl-upstart/upstart-init/native/rc.conf | 18 -------------
smgl/smgl-upstart/upstart-init/native/syslog.conf | 4 +--
smgl/smgl-upstart/upstart-init/native/xend.conf | 25
+++++++++++++++++++
smgl/smgl-upstart/upstart-init/native/xinetd.conf | 2 -
11 files changed, 72 insertions(+), 46 deletions(-)

New commits:
commit 3089ba70c8c44df590df971f088939e4562a15bc
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

smgl-upstart: improved native init scripts

diff --git a/smgl/smgl-upstart/HISTORY b/smgl/smgl-upstart/HISTORY
index a406a15..6c3aa1f 100644
--- a/smgl/smgl-upstart/HISTORY
+++ b/smgl/smgl-upstart/HISTORY
@@ -1,3 +1,6 @@
+2009-09-15 Arjan Bouter <abouter AT sourcemage.org>
+ * improved the native init scripts
+
2009-09-11 Arjan Bouter <abouter AT 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 7359d10..19bbea9 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
b/smgl/smgl-upstart/upstart-init/native/clamav
new file mode 100644
index 0000000..b3d72de
--- /dev/null
+++ b/smgl/smgl-upstart/upstart-init/native/clamav
@@ -0,0 +1,13 @@
+# clamav
+#
+# starts clamd
+
+description "Start ClamAV"
+author "Arjan Bouter <abouter AT sourcemage.org>"
+
+emits clamav-started clamav-stopped
+
+start on network-start and syslog-start
+stop on shutdown
+
+exec /usr/sbin/clamd
diff --git a/smgl/smgl-upstart/upstart-init/native/clamav.conf
b/smgl/smgl-upstart/upstart-init/native/clamav.conf
deleted file mode 100644
index b3d72de..0000000
--- a/smgl/smgl-upstart/upstart-init/native/clamav.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-# clamav
-#
-# starts clamd
-
-description "Start ClamAV"
-author "Arjan Bouter <abouter AT sourcemage.org>"
-
-emits clamav-started clamav-stopped
-
-start on network-start and syslog-start
-stop on shutdown
-
-exec /usr/sbin/clamd
diff --git a/smgl/smgl-upstart/upstart-init/native/freshclam
b/smgl/smgl-upstart/upstart-init/native/freshclam
new file mode 100644
index 0000000..ed678c4
--- /dev/null
+++ b/smgl/smgl-upstart/upstart-init/native/freshclam
@@ -0,0 +1,11 @@
+# freshclam
+#
+# starts freshclam
+
+description "Start Freshclam, the Clamav updater"
+author "Arjan Bouter <abouter AT sourcemage.org>"
+
+start on network-start and syslog-start
+stop on shutdown
+
+exec /usr/bin/freshclam -d
diff --git a/smgl/smgl-upstart/upstart-init/native/freshclam.conf
b/smgl/smgl-upstart/upstart-init/native/freshclam.conf
deleted file mode 100644
index ed678c4..0000000
--- a/smgl/smgl-upstart/upstart-init/native/freshclam.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-# freshclam
-#
-# starts freshclam
-
-description "Start Freshclam, the Clamav updater"
-author "Arjan Bouter <abouter AT sourcemage.org>"
-
-start on network-start and syslog-start
-stop on shutdown
-
-exec /usr/bin/freshclam -d
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 0000000..06aa4c1
--- /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 AT 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 46f295b..0000000
--- 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 AT 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 086760e..21c67e0 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 AT 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 0000000..ace598e
--- /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 AT 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 f61ba03..0245ddc 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 AT sourcemage.org>"

start on network-up and syslog-start




Archive powered by MHonArc 2.6.24.

Top of Page