From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 26 Aug 2009 18:52:58 +0000 (+0200)
Subject: initscripts: Fixed shutdown/reboot with upstart.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=72d56a7c4b6cfeba25b8466e194f12514e11550c;p=ipfire-3.x.git

initscripts: Fixed shutdown/reboot with upstart.

Upstart should be stable now and must not be touched
any more except for testing.
---

diff --git a/src/initscripts/core/tty1.conf b/src/initscripts/core/tty1.conf
index cd53c5197..04d0c9176 100644
--- a/src/initscripts/core/tty1.conf
+++ b/src/initscripts/core/tty1.conf
@@ -2,7 +2,7 @@ description		"Start a tty"
 author			"IPFire Team"
 
 start on stopped mountfs
-stop on shutdown or reboot
+stop on starting shutdown
 
 respawn
 exec /sbin/agetty 9600 tty1
diff --git a/src/initscripts/core/tty2.conf b/src/initscripts/core/tty2.conf
index ef4a54e99..af5458a65 100644
--- a/src/initscripts/core/tty2.conf
+++ b/src/initscripts/core/tty2.conf
@@ -2,7 +2,7 @@ description		"Start a tty"
 author			"IPFire Team"
 
 start on stopped mountfs
-stop on shutdown or reboot
+stop on starting shutdown
 
 respawn
 exec /sbin/agetty 9600 tty2
diff --git a/src/initscripts/core/tty3.conf b/src/initscripts/core/tty3.conf
index 168fbfd50..2903dd173 100644
--- a/src/initscripts/core/tty3.conf
+++ b/src/initscripts/core/tty3.conf
@@ -2,7 +2,7 @@ description		"Start a tty"
 author			"IPFire Team"
 
 start on stopped mountfs
-stop on shutdown or reboot
+stop on starting shutdown
 
 respawn
 exec /sbin/agetty 9600 tty3
diff --git a/src/initscripts/core/tty4.conf b/src/initscripts/core/tty4.conf
index 85abbc772..048020704 100644
--- a/src/initscripts/core/tty4.conf
+++ b/src/initscripts/core/tty4.conf
@@ -2,7 +2,7 @@ description		"Start a tty"
 author			"IPFire Team"
 
 start on stopped mountfs
-stop on shutdown or reboot
+stop on starting shutdown
 
 respawn
 exec /sbin/agetty 9600 tty4
diff --git a/src/initscripts/core/udev.conf b/src/initscripts/core/udev.conf
index f1981225c..15da72958 100644
--- a/src/initscripts/core/udev.conf
+++ b/src/initscripts/core/udev.conf
@@ -2,7 +2,7 @@ description		"Start Udev Daemon"
 author			"IPFire Team"
 
 start on stopped mount-kernel-filesystems
-stop on shutdown or reboot
+stop on starting shutdown
 
 emits block-device-added block-device-removed
 emits network-device-added network-device-removed
diff --git a/src/initscripts/extras/messagebus.conf b/src/initscripts/extras/messagebus.conf
index de2c02fa4..d23f5a484 100644
--- a/src/initscripts/extras/messagebus.conf
+++ b/src/initscripts/extras/messagebus.conf
@@ -2,7 +2,7 @@ description		"Starts the message bus daemon"
 author			"IPFire Team"
 
 start on stopped mountfs
-stop on shutdown or reboot
+stop on starting shutdown
 
 exec /usr/bin/dbus-daemon --config-file=/etc/dbus-1/system.conf --nofork
 respawn
diff --git a/src/initscripts/extras/network.conf b/src/initscripts/extras/network.conf
index 4d4e3298f..06a96ef2e 100644
--- a/src/initscripts/extras/network.conf
+++ b/src/initscripts/extras/network.conf
@@ -2,7 +2,7 @@ description		"Control the networking"
 author			"IPFire Team"
 
 start on stopped mountfs
-stop on shutdown or reboot
+stop on starting shutdown
 
 pre-start script
 	network start
diff --git a/src/initscripts/extras/openldap.conf b/src/initscripts/extras/openldap.conf
index ebe5e437b..5e23e8f52 100644
--- a/src/initscripts/extras/openldap.conf
+++ b/src/initscripts/extras/openldap.conf
@@ -2,7 +2,7 @@ description		"Starts OpenLDAP slapd daemon"
 author			"IPFire Team"
 
 start on started mountfs
-stop on shutdown or reboot
+stop on starting shutdown
 
 exec /usr/sbin/slapd
 expect fork
diff --git a/src/initscripts/extras/openlldp.conf b/src/initscripts/extras/openlldp.conf
old mode 100755
new mode 100644
diff --git a/src/initscripts/extras/pdns-recursor.conf b/src/initscripts/extras/pdns-recursor.conf
old mode 100755
new mode 100644
diff --git a/src/initscripts/extras/syslog-ng.conf b/src/initscripts/extras/syslog-ng.conf
index 04eef9e49..b28ab9bed 100644
--- a/src/initscripts/extras/syslog-ng.conf
+++ b/src/initscripts/extras/syslog-ng.conf
@@ -2,7 +2,7 @@ description		"Start system log daemon"
 author			"IPFire Team"
 
 start on stopped mountfs
-stop on shutdown or reboot
+stop on starting shutdown
 
 exec /sbin/syslog-ng -F
 respawn