diff options
author | Oliver Tappe | 2008-06-03 01:52:06 +0200 |
---|---|---|
committer | Oliver Tappe | 2008-06-03 01:52:06 +0200 |
commit | 26f2a2855f43cf5d8516b110149247af7b1b3fb7 (patch) | |
tree | 2a4ef4bb54d6967e4720d16c00b63566d89775ef /os-plugins/plugins/desktop/OpenSLX/Distro | |
parent | Implemented a better algorithm for keeping the plugins and the references (diff) | |
download | core-26f2a2855f43cf5d8516b110149247af7b1b3fb7.tar.gz core-26f2a2855f43cf5d8516b110149247af7b1b3fb7.tar.xz core-26f2a2855f43cf5d8516b110149247af7b1b3fb7.zip |
* reorganized the themes-folders of the desktop-plugin as discussed with Michael
recently: now it's kdm/<theme> and gdm/<theme> instead of <theme>/kdm and
<theme>/gdm, as that makes handling of GDM less cumbersome
* renamed actual theme description files to theme.xml instead of being
named like the theme (in this case: openslx.xml)
Tested with GDM and KDM on SUSE-10.2
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@1838 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'os-plugins/plugins/desktop/OpenSLX/Distro')
-rw-r--r-- | os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm | 10 | ||||
-rw-r--r-- | os-plugins/plugins/desktop/OpenSLX/Distro/Suse.pm | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm b/os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm index 2777dc13..dbd12416 100644 --- a/os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm +++ b/os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm @@ -152,9 +152,9 @@ sub setupGDMScript # activate theme only if the corresponding xml file is found # (otherwise fall back to default theme of vendor-OS) if [ -n "\$desktop_theme" ]; then - thdir=/opt/openslx/plugin-repo/desktop/themes/\$desktop_theme/gdm + thdir=/opt/openslx/plugin-repo/desktop/themes/gdm theme=\$desktop_theme - if [ -e /mnt\$thdir/\$theme/\$theme.xml ]; then + if [ -e /mnt\$thdir/\$theme/theme.xml ]; then sed -i "s,\\[greeter\\],[greeter]\\nGraphicalThemeDir=\$thdir," \\ /mnt$configFile sed -i "s,\\[greeter\\],[greeter]\\nGraphicalTheme=\$theme," \\ @@ -298,10 +298,10 @@ sub setupKDMScript # activate theme only if the corresponding xml file is found # (otherwise fall back to default theme of vendor-OS) if [ -n "\$desktop_theme" ]; then - thdir=/opt/openslx/plugin-repo/desktop/themes/\$desktop_theme/kdm theme=\$desktop_theme - if [ -e /mnt\$thdir/\$theme.xml ]; then - sed -i "s,\\[X-\\*-Greeter\\],[X-*-Greeter]\\nTheme=\$thdir," \\ + thfile=/opt/openslx/plugin-repo/desktop/themes/kdm/\$theme/theme.xml + if [ -e /mnt\$thfile ]; then + sed -i "s,\\[X-\\*-Greeter\\],[X-*-Greeter]\\nTheme=\$thfile," \\ /mnt$configFile sed -i "s,\\[X-\\*-Greeter\\],[X-*-Greeter]\\nUseTheme=true," \\ /mnt$configFile diff --git a/os-plugins/plugins/desktop/OpenSLX/Distro/Suse.pm b/os-plugins/plugins/desktop/OpenSLX/Distro/Suse.pm index 08633fcd..0e2095c6 100644 --- a/os-plugins/plugins/desktop/OpenSLX/Distro/Suse.pm +++ b/os-plugins/plugins/desktop/OpenSLX/Distro/Suse.pm @@ -65,7 +65,7 @@ sub setupKDMScript # SUSE reads /var/adm/kdm/kdmrc.sysconfig, so we link that to # our config file - my $pathInfo = $self->GDMPathInfo(); + my $pathInfo = $self->KDMPathInfo(); my $configFile = $pathInfo->{config}; mkpath("/etc/opt/kdm"); system("ln -sfn /etc/opt/kdm/kdmrc /var/adm/kdm/kdmrc.sysconfig"); |