diff options
| -rw-r--r-- | initramfs/initrd-stuff/etc/functions | 5 | ||||
| -rw-r--r-- | os-plugins/plugins/Theme/XX_Theme.sh | 9 |
2 files changed, 7 insertions, 7 deletions
diff --git a/initramfs/initrd-stuff/etc/functions b/initramfs/initrd-stuff/etc/functions index 577bf9b8..7b6f127e 100644 --- a/initramfs/initrd-stuff/etc/functions +++ b/initramfs/initrd-stuff/etc/functions @@ -922,9 +922,6 @@ include_in_fsroot_union () { # kdmrc template started from distro specific functions files config_kdm_template () { -usetheme=false -themeconf=$(ls /mnt/var/lib/openslx/themes/displaymanager/*.xml 2>/dev/null) -[ -r "${themeconf}" ] && usetheme=true # check if a kdmrc was provided via ConfTGZ [ -f /rootfs/${kdmrcdir}/kdmrc ] || \ echo -e "# ${kdmrcdir}/kdmrc - \ @@ -978,7 +975,7 @@ AntiAliasing=true Language=$lang EchoMode=OneStar ShowLog=false -UseTheme=${usetheme} +UseTheme=false Theme=/var/lib/openslx/themes/displaymanager UseBackground=true BackgroundCfg=/var/lib/openslx/themes/displaymanager/backgroundrc diff --git a/os-plugins/plugins/Theme/XX_Theme.sh b/os-plugins/plugins/Theme/XX_Theme.sh index e0a6985f..dc429652 100644 --- a/os-plugins/plugins/Theme/XX_Theme.sh +++ b/os-plugins/plugins/Theme/XX_Theme.sh @@ -2,6 +2,7 @@ # # stage3 part of 'Theme' plugin - the runlevel script # +. /etc/distro-functions if [ -e /initramfs/plugin-conf/Theme.conf ]; then . /initramfs/plugin-conf/Theme.conf if [ $Theme_active -ne 0 ]; then @@ -9,9 +10,11 @@ if [ -e /initramfs/plugin-conf/Theme.conf ]; then testmkd /mnt/var/lib/openslx/themes/displaymanager testmkd /mnt/var/lib/openslx/bin - [ -d /usr/share/themes/displaymanager ] \ - && cp -a /usr/share/themes/displaymanager \ - /mnt/var/lib/openslx/themes + if [ -d /usr/share/themes/displaymanager ]; then + cp -a /usr/share/themes/displaymanager \ + /mnt/var/lib/openslx/themes + sed -i "s,UseTheme=false,UseTheme=true," /mnt/${kdmrcdir}/kdmrc + fi [ $DEBUGLEVEL -gt 0 ] && echo "done with 'Theme' os-plugin ..."; fi |