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 cd53c51974bce5b3c650b37042ce39bbbbd5ee1b..04d0c917608ee0ef33f015cebc07d585d1864f60 100644 (file)
--- 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 ef4a54e99f9ef5b30cdfc00f428dff5fb49d5ab8..af5458a654c789f615cd5e0bac46aca8d580371c 100644 (file)
--- 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 168fbfd50a8c50934e23c2d4d61011d547a704bd..2903dd1738150469c5fa925c3a4e04cc549295a5 100644 (file)
--- 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 85abbc7723a24864fea191f9794073e4066ecc51..0480207046842e6f983f48cb5df03709ef7d17fb 100644 (file)
--- 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 f1981225caacd6e0c710842be5c002bc91c19c3a..15da72958e97e4f964e285e9680e8926a7da9843 100644 (file)
--- 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 de2c02fa46701e804e3f584067f52c8bb4ebda0e..d23f5a484d7a42a66eeea499c2f763a3ca70b13b 100644 (file)
--- 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 4d4e3298fa9cb9ba0c679ac35394c54a4ae6f0c0..06a96ef2ea89035d361e43869dc081ee488ca30f 100644 (file)
--- 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 ebe5e437b99dbd51e6ebbbc341f4964e15d01b62..5e23e8f52d427211f4a53c4c0fc3182922240fba 100644 (file)
--- 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 (executable)
new mode 100644 (file)

diff --git a/src/initscripts/extras/pdns-recursor.conf b/src/initscripts/extras/pdns-recursor.conf
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/initscripts/extras/syslog-ng.conf b/src/initscripts/extras/syslog-ng.conf
index 04eef9e4995ff3cfeb02c2242192a821f6a01708..b28ab9bed210525ad45ff420dd95df1783a0d3bb 100644 (file)
--- 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