From 97b922e40955d8c9ab52649a751092553e397d6b Mon Sep 17 00:00:00 2001
From: Dirk von Suchodoletz
Date: Sat, 4 Jun 2011 13:38:45 +0200
Subject: Fix for SuSE11.4 (repair of wrong checkin) ...

---
 src/initramfs/distro-specs/suse/functions-11.4    | 8 +++++---
 src/initramfs/distro-specs/ubuntu/functions-11.04 | 3 ---
 2 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'src/initramfs/distro-specs')

diff --git a/src/initramfs/distro-specs/suse/functions-11.4 b/src/initramfs/distro-specs/suse/functions-11.4
index a03309d1..3d0d1cc6 100644
--- a/src/initramfs/distro-specs/suse/functions-11.4
+++ b/src/initramfs/distro-specs/suse/functions-11.4
@@ -45,9 +45,11 @@ if [ "x$start_dreshal" = "xyes" ]; then
   for dir in "/var/lib/misc" "/var/run/ConsoleKit" \
              "/var/lib/dbus" \
              "/var/lib/polkit-1/localauthority" \
-             "/var/run/dbus messagebus:messagebus"; do
-    testmkd /mnt${dir}
-  done
+             "/var/run/dbus messagebus:messagebus"; do testmkd /mnt${dir}
+  testmkd /mnt/var/cache/hald haldaemon:haldaemon
+  touch /mnt/var/lib/misc/PolicyKit.reload
+  chown polkituser:polkituser /mnt/var/lib/misc/PolicyKit.reloaddone
+
 
   if [ -f /mnt/etc/init.d/dbus ] ; then
     strinfile "messagebus:" /mnt/etc/passwd || \
diff --git a/src/initramfs/distro-specs/ubuntu/functions-11.04 b/src/initramfs/distro-specs/ubuntu/functions-11.04
index f2d53e2e..7c4e4444 100644
--- a/src/initramfs/distro-specs/ubuntu/functions-11.04
+++ b/src/initramfs/distro-specs/ubuntu/functions-11.04
@@ -18,9 +18,6 @@ config_dreshal () {
 if [ "x$start_dreshal" = "xyes" ]; then
   testmkd /mnt/var/lib/dbus
   testmkd /mnt/var/lib/misc
-  testmkd /mnt/var/cache/hald haldaemon:haldaemon
-  touch /mnt/var/lib/misc/PolicyKit.reload
-  chown polkituser:polkituser /mnt/var/lib/misc/PolicyKit.reload
   rm -rf /mnt/etc/dbus-1/system.d/*etwork*anager.conf \
          /mnt/etc/dbus-1/system.d/nm-* \
          /mnt/etc/dbus-1/event.d/*NetworkManager*
-- 
cgit v1.2.3-55-g7522