- upstart: upstart_controlled early

Changed files:
    dbus.spec -> 1.216
    messagebus.init -> 1.21

diff --git a/dbus.spec b/dbus.spec
index 4e6c49570bd2311acd139d5f843c6c7ab507c8da..6b230d29d0fead2859839691b697b80b170d5491 100644 (file)
--- a/dbus.spec
+++ b/dbus.spec
@@ -8,7 +8,7 @@ Summary:        D-BUS message bus
 Summary(pl.UTF-8):     Magistrala przesyłania komunikatów D-BUS
 Name:          dbus
 Version:       1.4.10
-Release:       2
+Release:       3
 License:       AFL v2.1 or GPL v2
 Group:         Libraries
 Source0:       http://dbus.freedesktop.org/releases/dbus/%{name}-%{version}.tar.gz
@@ -163,11 +163,11 @@ install -d $RPM_BUILD_ROOT/etc/{init,profile.d,rc.d/init.d,sysconfig,X11/xinit/x
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/messagebus
-install %{SOURCE2} $RPM_BUILD_ROOT/etc/profile.d/dbus-daemon-1.sh
-install %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/messagebus
-install %{SOURCE4} $RPM_BUILD_ROOT/etc/X11/xinit/xinitrc.d
-install %{SOURCE5} $RPM_BUILD_ROOT/etc/init/messagebus.conf
+install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/messagebus
+install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/profile.d/dbus-daemon-1.sh
+cp -p %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/messagebus
+install -p %{SOURCE4} $RPM_BUILD_ROOT/etc/X11/xinit/xinitrc.d
+cp -p %{SOURCE5} $RPM_BUILD_ROOT/etc/init/messagebus.conf
 
 # upstart (/sbin/init) requires libdbus so it must be in /lib(64)
 mv -f $RPM_BUILD_ROOT%{_libdir}/libdbus-1.so.* $RPM_BUILD_ROOT/%{_lib}

diff --git a/messagebus.init b/messagebus.init
index 4aa87210aff98c6f4790b10e6c1e75d70ddea280..d70ccd6ab6fb03c3f8732c1076d19ef5d026d7dd 100644 (file)
--- a/messagebus.init
+++ b/messagebus.init
@@ -12,6 +12,8 @@
 # Source function library
 . /etc/rc.d/init.d/functions
 
+upstart_controlled
+
 # Get network config
 . /etc/sysconfig/network
 
@@ -84,8 +86,6 @@ reload() {
        RETVAL=$?
 }
 
-upstart_controlled
-
 RETVAL=0
 # See how we were called.
 case "$1" in