[maemo-commits] [maemo-commits] r16868 - projects/haf/trunk/dbus/debian

[From: subversion at stage.maemo.org]

Author: guillem
Date: 2008-12-05 12:10:42 +0200 (Fri, 05 Dec 2008)
New Revision: 16868

Modified:
   projects/haf/trunk/dbus/debian/changelog
   projects/haf/trunk/dbus/debian/control
   projects/haf/trunk/dbus/debian/dbus.init
Log:
Optimize and correct init script not running on sbox arm

- Checking for existance of /scratchbox directory instead of architecture
  being arm when deciding to use dsmetool.
- Using 'chown user:group' syntax instead of chown and chgrp.
- Add a missing Depends on passwd.

Thanks to Riku Voipio <ext-riku.voipio at nokia.com>. (Fixes: NB#94340)


Modified: projects/haf/trunk/dbus/debian/changelog
===================================================================
--- projects/haf/trunk/dbus/debian/changelog	2008-12-05 01:25:38 UTC (rev 16867)
+++ projects/haf/trunk/dbus/debian/changelog	2008-12-05 10:10:42 UTC (rev 16868)
@@ -1,3 +1,14 @@
+dbus (1.2.4-0maemo3) UNRELEASED; urgency=low
+
+  * Optimize and correct init script not running on sbox arm by:
+    - Checking for existance of /scratchbox directory instead of architecture
+      being arm when deciding to use dsmetool.
+    - Using 'chown user:group' syntax instead of chown and chgrp.
+    - Add a missing Depends on passwd.
+    Thanks to Riku Voipio <ext-riku.voipio at nokia.com>. (Fixes: NB#94340)
+
+ -- Guillem Jover <guillem.jover at nokia.com>  Tue, 02 Dec 2008 19:33:52 +0200
+
 dbus (1.2.4-0maemo2) unstable; urgency=low
 
   * Reset the scheduling policy to SCHED_OTHER for spawned services.

Modified: projects/haf/trunk/dbus/debian/control
===================================================================
--- projects/haf/trunk/dbus/debian/control	2008-12-05 01:25:38 UTC (rev 16867)
+++ projects/haf/trunk/dbus/debian/control	2008-12-05 10:10:42 UTC (rev 16868)
@@ -15,6 +15,7 @@
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
+         passwd,
          lsb-base (>= 3.1)
 Conflicts: libdbus0,
            dbus-1,

Modified: projects/haf/trunk/dbus/debian/dbus.init
===================================================================
--- projects/haf/trunk/dbus/debian/dbus.init	2008-12-05 01:25:38 UTC (rev 16867)
+++ projects/haf/trunk/dbus/debian/dbus.init	2008-12-05 10:10:42 UTC (rev 16868)
@@ -43,8 +43,7 @@
     log_warning_msg "To disable the service use a runlevel editor like sysv-rc-conf or bum instead."
 fi
 
-echo `uname -m` | grep "^armv" > /dev/null
-if [ $? = 0 -a -x /usr/sbin/dsmetool ]; then
+if [ ! -d /scratchbox  -a -x /usr/sbin/dsmetool ]; then
   USE_DT=1
 else
   USE_DT=""
@@ -117,8 +116,7 @@
   # does not need changes
   if [ ! -d $PIDDIR ]; then
     mkdir -p $PIDDIR
-    chown $DAEMONUSER $PIDDIR
-    chgrp $DAEMONUSER $PIDDIR
+    chown $DAEMONUSER:$DAEMONUSER $PIDDIR
   fi
 
   if [ -e $PIDFILE ]; then