From 2e8cbf0e43b507bf04fe7414aeaf492004f0aa0c Mon Sep 17 00:00:00 2001
From: Dirk von Suchodoletz
Date: Tue, 3 Feb 2009 18:35:51 +0000
Subject: Small fixes for the dreshal block in SuSE10.2 (increase the
 probability that polkitd is started) ...

git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2566 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 initramfs/distro-specs/suse/functions-10.2 | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/initramfs/distro-specs/suse/functions-10.2 b/initramfs/distro-specs/suse/functions-10.2
index 657f71dd..16d0cdee 100644
--- a/initramfs/distro-specs/suse/functions-10.2
+++ b/initramfs/distro-specs/suse/functions-10.2
@@ -45,20 +45,9 @@ if [ "x$start_dreshal" = "xyes" ]; then
     strinfile "messagebus:" /mnt/etc/group || \
       echo "messagebus:!:101:" >> /mnt/etc/group
     # set permissions with userid
-    echo -e "\tchown messagebus:messagebus /var/run/dbus 2>/dev/null" \
-      >>/mnt/etc/init.d/boot.slx
+    testmkd /mnt/var/run/dbus messagebus:messagebus
     rllinker "dbus" $start $stop
   fi
-  if [ -f /mnt/etc/init.d/consolekit ] ; then
-    strinfile "polkituser:" /mnt/etc/passwd || \
-      echo "polkituser:x:104:106:PolicyKit:/var/run/PolicyKit:/bin/false" \
-        >> /mnt/etc/passwd
-    start=$(($start + 1))
-    stop=$(($stop - 1))
-    rllinker "consolekit" $start $stop
-    echo -n > /mnt/var/lib/misc/PolicyKit.reload
-    chmod a+x /mnt/var/lib/misc/PolicyKit.reload
-  fi
   if [ -f /mnt/etc/init.d/resmgr ] ; then
     start=$(($start + 1))
     stop=$(($stop - 1))
@@ -74,12 +63,20 @@ if [ "x$start_dreshal" = "xyes" ]; then
     # set permissions with userid
     echo -e "\tchown haldaemon:haldaemon /var/run/hal /var/cache/hald \
       2>/dev/null" >>/mnt/etc/init.d/boot.slx
-
-    # this seems important for suse-10.2
-    rllinker "policykitd" $start $stop
     start=$(($start + 1))
     stop=$(($stop - 1))
     rllinker "haldaemon" $start $stop
   fi
+  if [ -f /mnt/etc/init.d/policykitd ] ; then
+    strinfile "polkituser:" /mnt/etc/passwd || \
+      echo "polkituser:x:104:106:PolicyKit:/var/run/PolicyKit:/bin/false" \
+        >> /mnt/etc/passwd
+    testmkd /mnt/var/run/polkit polkit:polkit 
+    start=$(($start + 10))
+    stop=$(($stop - 1))
+    rllinker "policykitd" $start $stop
+    echo -n > /mnt/var/lib/misc/PolicyKit.reload
+    chmod a+x /mnt/var/lib/misc/PolicyKit.reload
+  fi
 fi
 }
-- 
cgit v1.2.3-55-g7522