diff options
Diffstat (limited to 'os-plugins')
| -rw-r--r-- | os-plugins/plugins/displaymanager/OpenSLX/OSPlugin/displaymanager.pm | 2 | ||||
| -rw-r--r-- | os-plugins/plugins/displaymanager/XX_displaymanager.sh | 17 |
2 files changed, 10 insertions, 9 deletions
diff --git a/os-plugins/plugins/displaymanager/OpenSLX/OSPlugin/displaymanager.pm b/os-plugins/plugins/displaymanager/OpenSLX/OSPlugin/displaymanager.pm index 44ffd52b..2740a2b3 100644 --- a/os-plugins/plugins/displaymanager/OpenSLX/OSPlugin/displaymanager.pm +++ b/os-plugins/plugins/displaymanager/OpenSLX/OSPlugin/displaymanager.pm @@ -102,9 +102,9 @@ sub copyRequiredFilesIntoInitramfs my $attrs = shift; my $makeInitRamFSEngine = shift; - my $xdmcpConfigDir = "$openslxConfig{'base-path'}/lib/plugins/displaymanager/config/$displaymanagerXdmcp"; my $themeDir = "$openslxConfig{'base-path'}/share/themes"; my $displaymanagerXdmcp = $attrs->{'displaymanager::xdmcp'} || ''; + my $xdmcpConfigDir = "$openslxConfig{'base-path'}/lib/plugins/displaymanager/config/$displaymanagerXdmcp"; my $displaymanagerTheme = $attrs->{'displaymanager::theme'} || ''; if ($displaymanagerTheme) { my $displaymanagerThemeDir diff --git a/os-plugins/plugins/displaymanager/XX_displaymanager.sh b/os-plugins/plugins/displaymanager/XX_displaymanager.sh index aa064ebe..0a4a3267 100644 --- a/os-plugins/plugins/displaymanager/XX_displaymanager.sh +++ b/os-plugins/plugins/displaymanager/XX_displaymanager.sh @@ -13,18 +13,19 @@ if [ -e /initramfs/plugin-conf/displaymanager.conf ]; then testmkd /mnt/var/lib/openslx/themes testmkd /mnt/var/lib/openslx/config - if [ -d /usr/share/config/gdm ]; then + if [ "${displaymanager_xdmcp}" = "gdm" ]; then cp /usr/share/config/gdm.conf /mnt/etc/gdm/gdm.conf - cp -a /usr/share/themes/displaymanager/gdm /mnt/var/lib/openslx/themes - sed -i "s,^\(GraphicalThemeDir=.*\)$,#\1 \nGraphicalThemeDir=/var/lib/openslx/themes," \ + cp -a /usr/share/themes/gdm /mnt/var/lib/openslx/themes + sed -i "s,GraphicalThemeDir=.*,GraphicalThemeDir=/var/lib/openslx/themes," \ /mnt/etc/gdm/gdm.conf - sed -i "s,^\(GraphicalTheme=.*\)$,#\1 \nGraphicalTheme=gdm," /mnt/etc/gdm/gdm.conf + sed -i "s,GraphicalTheme=.*GraphicalTheme=gdm," /mnt/etc/gdm/gdm.conf fi - if [ -d /usr/share/config/gdm ]; then - cp /usr/share/config/kdmrc /mnt/${D_KDMRCPATH} - cp -a /usr/share/themes/displaymanager/kdm /mnt/var/lib/openslx/themes - sed -i "s,UseTheme=.*,UseTheme=true," /mnt/${D_KDMRCPATH}/kdmrc + if [ "${displaymanager_xdmcp}" = "kdm" ]; then + cp /usr/share/config/kdmrc /mnt/etc/kde3/kdm/kdmrc + cp -a /usr/share/themes/kdm /mnt/var/lib/openslx/themes + sed -i "s,Theme=.*,Theme=/var/lib/openslx/themes/kdm," /mnt/etc/kde3/kdm/kdmrc + sed -i "s,UseTheme=.*,UseTheme=true," /mnt/etc/kde3/kdm/kdmrc fi [ $DEBUGLEVEL -gt 0 ] && echo "done with 'displaymanager' os-plugin ..."; |