summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Schmelzer2009-02-24 19:51:13 +0100
committerSebastian Schmelzer2009-02-24 19:51:13 +0100
commitb9d5a63b437bb1f87de7a782b0bac4de00c53f4d (patch)
tree0295805f4b99c95db39ab79f8732efcc1a26aad2
parentxserver plugin: (diff)
downloadcore-b9d5a63b437bb1f87de7a782b0bac4de00c53f4d.tar.gz
core-b9d5a63b437bb1f87de7a782b0bac4de00c53f4d.tar.xz
core-b9d5a63b437bb1f87de7a782b0bac4de00c53f4d.zip
* test fix for dbus/hal problems
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2635 95ad53e4-c205-0410-b2fa-d234c58c8868
-rw-r--r--initramfs/distro-specs/suse/functions-11.112
1 files changed, 12 insertions, 0 deletions
diff --git a/initramfs/distro-specs/suse/functions-11.1 b/initramfs/distro-specs/suse/functions-11.1
index 2e36c378..d350fa9c 100644
--- a/initramfs/distro-specs/suse/functions-11.1
+++ b/initramfs/distro-specs/suse/functions-11.1
@@ -46,6 +46,13 @@ if [ "x$start_dreshal" = "xyes" ]; then
testmkd /mnt/var/run/PolicyKit polkituser:polkituser
testmkd /mnt/var/lib/PolicyKit polkituser:polkituser
testmkd /mnt/var/run/dbus/at_console/pool
+
+ sed -i /mnt/etc/PolicyKit/PolicyKit.conf \
+ -e "s/\(<\/config>\)/ @@new@@\n\1/" \
+ -e "s/@@new@@/<match action=\"@@action@@\">\n@@return@@\n <\/match>/" \
+ -e "s/@@action@@/org.freedesktop.hal.storage.mount-removable/" \
+ -e "s/@@return@@/ <return result=\"yes\"\/>/"
+
if [ -f /mnt/etc/init.d/dbus ] ; then
strinfile "messagebus:" /mnt/etc/passwd || \
echo "messagebus:x:102:103:User for D-BUS:/var/run/dbus:/bin/false" \
@@ -55,6 +62,11 @@ if [ "x$start_dreshal" = "xyes" ]; then
# create directories and set permissions with user and group id
testmkd /mnt/var/run/dbus messagebus:messagebus
testmkd /mnt/var/lib/dbus
+
+ 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*
+
rllinker "dbus" $start $stop
fi
if [ -f /mnt/etc/init.d/haldaemon ] ; then