summaryrefslogtreecommitdiffstats
path: root/src/initramfs
diff options
context:
space:
mode:
authorDirk von Suchodoletz2011-06-04 13:38:45 +0200
committerDirk von Suchodoletz2011-06-04 13:38:45 +0200
commit97b922e40955d8c9ab52649a751092553e397d6b (patch)
treeb0da8ab0ab796675c4024aadf965e121a6705aad /src/initramfs
parentadd funionfs (diff)
downloadcore-97b922e40955d8c9ab52649a751092553e397d6b.tar.gz
core-97b922e40955d8c9ab52649a751092553e397d6b.tar.xz
core-97b922e40955d8c9ab52649a751092553e397d6b.zip
Fix for SuSE11.4 (repair of wrong checkin) ...
Diffstat (limited to 'src/initramfs')
-rw-r--r--src/initramfs/distro-specs/suse/functions-11.48
-rw-r--r--src/initramfs/distro-specs/ubuntu/functions-11.043
2 files changed, 5 insertions, 6 deletions
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*