summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Janczyk2008-01-24 19:26:09 +0100
committerMichael Janczyk2008-01-24 19:26:09 +0100
commit0974a727036454ce446395b4ee948a748c0eb3e4 (patch)
tree755a47314075404472cc2f3da05a305e92bcef9d
parentBUGFIX: kdm theme works now, we hope;), moved theme to plugin (diff)
downloadcore-0974a727036454ce446395b4ee948a748c0eb3e4.tar.gz
core-0974a727036454ce446395b4ee948a748c0eb3e4.tar.xz
core-0974a727036454ce446395b4ee948a748c0eb3e4.zip
kdm theme doesnt work yet, testcommit
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1491 95ad53e4-c205-0410-b2fa-d234c58c8868
-rw-r--r--initramfs/distro-specs/suse/config-default2
-rw-r--r--initramfs/distro-specs/suse/functions-default4
-rw-r--r--os-plugins/plugins/Theme/XX_Theme.sh2
3 files changed, 4 insertions, 4 deletions
diff --git a/initramfs/distro-specs/suse/config-default b/initramfs/distro-specs/suse/config-default
index 8c75e4f7..1426bbc8 100644
--- a/initramfs/distro-specs/suse/config-default
+++ b/initramfs/distro-specs/suse/config-default
@@ -61,3 +61,5 @@ D_XFONTPATH="/usr/X11R6/lib/X11/fonts/*"
D_DEFAULTCOUNTRY="de"
D_HWMODTOIGNORE="i8xx-tco ichxrom snd-atiixp-modem intel-rng"
D_BOOTLOCAL="init.d/boot.local"
+D_KDMRCPATH=/etc/opt/kde3/share/config/kdm
+D_XDMPATH=/etc/X11/xdm
diff --git a/initramfs/distro-specs/suse/functions-default b/initramfs/distro-specs/suse/functions-default
index 0369d52c..6d70a19e 100644
--- a/initramfs/distro-specs/suse/functions-default
+++ b/initramfs/distro-specs/suse/functions-default
@@ -369,9 +369,7 @@ fi
# configure kdm as display manager
config_kdm () {
# first define directories for kdm
-kdmrcdir=/etc/opt/kde3/share/config/kdm
-xdmdir=/etc/X11/xdm
-testmkd /mnt/${kdmrcdir}
+testmkd /mnt/${D_KDMRCPATH}
config_dm_entry yes
# write configuration file
# use general config in /etc/functions
diff --git a/os-plugins/plugins/Theme/XX_Theme.sh b/os-plugins/plugins/Theme/XX_Theme.sh
index dc429652..b37bd33b 100644
--- a/os-plugins/plugins/Theme/XX_Theme.sh
+++ b/os-plugins/plugins/Theme/XX_Theme.sh
@@ -2,7 +2,7 @@
#
# stage3 part of 'Theme' plugin - the runlevel script
#
-. /etc/distro-functions
+. /etc/sysconfig/config
if [ -e /initramfs/plugin-conf/Theme.conf ]; then
. /initramfs/plugin-conf/Theme.conf
if [ $Theme_active -ne 0 ]; then