summaryrefslogtreecommitdiffstats
path: root/initramfs/distro-specs/suse
diff options
context:
space:
mode:
authorDirk von Suchodoletz2010-02-28 17:18:39 +0100
committerDirk von Suchodoletz2010-02-28 17:18:39 +0100
commit907d18debbfd0b49a8a57683b602bdd66ffe8eb3 (patch)
tree7302ce9bcd9db3d2a1d50e9ef150a7af2808e00e /initramfs/distro-specs/suse
parentCreate a needed directory ... (diff)
downloadcore-907d18debbfd0b49a8a57683b602bdd66ffe8eb3.tar.gz
core-907d18debbfd0b49a8a57683b602bdd66ffe8eb3.tar.xz
core-907d18debbfd0b49a8a57683b602bdd66ffe8eb3.zip
Add slx binary path (var/opt/openslx/bin), fix console-kit-daemon issue
...
Diffstat (limited to 'initramfs/distro-specs/suse')
-rw-r--r--initramfs/distro-specs/suse/functions-11.216
-rw-r--r--initramfs/distro-specs/suse/functions-default2
2 files changed, 12 insertions, 6 deletions
diff --git a/initramfs/distro-specs/suse/functions-11.2 b/initramfs/distro-specs/suse/functions-11.2
index 62ef1142..ae8008b9 100644
--- a/initramfs/distro-specs/suse/functions-11.2
+++ b/initramfs/distro-specs/suse/functions-11.2
@@ -41,11 +41,13 @@ config_dreshal () {
local start=1
local stop=10
if [ "x$start_dreshal" = "xyes" ]; then
- testmkd /mnt/var/lib/misc
- testmkd /mnt/var/run/PolicyKit polkituser:polkituser
- testmkd /mnt/var/lib/PolicyKit polkituser:polkituser
- testmkd /mnt/var/run/dbus/at_console/pool
-
+ for dir in /var/lib/misc /var/run/ConsoleKit \
+ "/var/run/PolicyKit polkituser:polkituser" \
+ "/var/lib/PolicyKit polkituser:polkituser" \
+ "/var/run/dbus/at_console/pool"; do
+ testmkd /mnt${dir}
+ done
+ # enable access to removable devices
sed -i /mnt/etc/PolicyKit/PolicyKit.conf \
-e "s/\(<\/config>\)/ @@new@@\n\1/" \
-e "s/@@new@@/<match action=\"@@action@@\">\n@@return@@\n <\/match>/" \
@@ -61,6 +63,10 @@ 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
+ # console-kit-daemon is often not started properly (why ever)
+ sed -i /mnt/etc/init.d/dbus \
+ -e '/start_daemon -f $DBUS_D/a\
+\ \ \ \ \ \ \ \ start_daemon -f /usr/sbin/console-kit-daemon'
rm -rf /mnt/etc/dbus-1/system.d/*etwork*anager.conf \
/mnt/etc/dbus-1/system.d/nm-* \
diff --git a/initramfs/distro-specs/suse/functions-default b/initramfs/distro-specs/suse/functions-default
index 5b02909b..d9efadbd 100644
--- a/initramfs/distro-specs/suse/functions-default
+++ b/initramfs/distro-specs/suse/functions-default
@@ -1,5 +1,5 @@
# Copyright (c) 2003..2006 - RZ Uni Freiburg
-# Copyright (c) 2006..2008 - OpenSLX GmbH
+# Copyright (c) 2006..2010 - OpenSLX GmbH
#
# This program/file is free software distributed under the GPL version 2.
# See http://openslx.org/COPYING