summaryrefslogtreecommitdiffstats
path: root/initramfs
diff options
context:
space:
mode:
authorDirk von Suchodoletz2007-10-13 22:06:48 +0200
committerDirk von Suchodoletz2007-10-13 22:06:48 +0200
commitf3b27fba237616a912c239c3bb099092c14d2662 (patch)
treeff337a299ae9a694c16d4c33c0b15ef5a7b12c5c /initramfs
parentMore fixes and cleanups for SuSE. Strange location of kdmrc in Gentoo!?!? (diff)
downloadcore-f3b27fba237616a912c239c3bb099092c14d2662.tar.gz
core-f3b27fba237616a912c239c3bb099092c14d2662.tar.xz
core-f3b27fba237616a912c239c3bb099092c14d2662.zip
Resmgr/PolKitd seems to be solved, some directories where missing. Still
problems accessing USB removable, but should be solveable ... git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1377 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initramfs')
-rw-r--r--initramfs/distro-specs/suse/functions-default16
1 files changed, 9 insertions, 7 deletions
diff --git a/initramfs/distro-specs/suse/functions-default b/initramfs/distro-specs/suse/functions-default
index 8e11b81d..3d782b43 100644
--- a/initramfs/distro-specs/suse/functions-default
+++ b/initramfs/distro-specs/suse/functions-default
@@ -236,8 +236,8 @@ sed -e "s,DISPLAYMANAGER=.*,DISPLAYMANAGER=\"$start_xdmcp\"," \
-e "s,.*_XSERVER.*,DISPLAYMANAGER_STARTS_XSERVER=\"$dm\"," \
-i /mnt/etc/${D_SYSCONFDIR}/displaymanager
# start the display manager as early as possible in runlevel 5
-ln -sf /etc/${D_INITDIR}/xdm /mnt/etc/${D_INITDIR}/rc5.d/S01xdm
-ln -sf /etc/${D_INITDIR}/xdm /mnt/etc/${D_INITDIR}/rc5.d/K18xdm
+ln -sf ../xdm /mnt/etc/${D_INITDIR}/rc5.d/S01xdm
+ln -sf ../xdm /mnt/etc/${D_INITDIR}/rc5.d/K18xdm
sed -e "s,xdm: .*,xdm:," -i /mnt/etc/${D_INITDIR}/.depend.start
}
# configure X display manager (runlevel links and kind of manager)
@@ -420,20 +420,22 @@ config_dreshal () {
local start=5
local stop=18
if [ "x$start_dreshal" = "xyes" ]; then
+ for dir in /var/run/dbus /var/run/resmgr/classes /var/run/hal \
+ /var/cache/hald /var/lib/PolicyKit; do
+ testmkd /mnt/$dir
+ done
if [ -f /mnt/etc/${D_INITDIR}/dbus ] ; then
strinfile "messagebus:" /mnt/etc/passwd || \
echo "messagebus:x:100:101:User for D-BUS:/var/run/dbus:/bin/false" \
>> /mnt/etc/passwd
strinfile "messagebus:" /mnt/etc/group || \
echo "messagebus:!:101:" >> /mnt/etc/group
- testmkd /mnt/var/run/dbus
# set permissions with userid
echo -e "\tchown messagebus:messagebus /var/run/dbus 2>/dev/null" \
>>/mnt/etc/${D_INITDIR}/boot.slx
rllinker "dbus" $start $stop
fi
if [ -f /mnt/etc/${D_INITDIR}/resmgr ] ; then
- testmkd /mnt/var/run/resmgr/classes
start=$(($start + 1))
stop=$(($stop - 1))
rllinker "resmgr" $start $stop
@@ -444,10 +446,10 @@ if [ "x$start_dreshal" = "xyes" ]; then
>> /mnt/etc/passwd
strinfile "haldaemon:" /mnt/etc/group || \
echo "haldaemon:!:103:" >> /mnt/etc/group
- testmkd /mnt/var/run/hal
+ echo -n "" > /mnt/var/lib/PolicyKit/reload
# set permissions with userid
- echo -e "\tchown haldaemon:haldaemon /var/run/hal 2>/dev/null" \
- >>/mnt/etc/${D_INITDIR}/boot.slx
+ echo -e "\tchown haldaemon:haldaemon /var/run/hal /var/cache/hald \
+ 2>/dev/null" >>/mnt/etc/${D_INITDIR}/boot.slx
start=$(($start + 1))
stop=$(($stop - 1))
rllinker "haldaemon" $start $stop