config.xml which sets splashy theme is now generated via demuxer. The theme dir does only contain theme specific stuff now. Should be less confusing.

git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@1725 95ad53e4-c205-0410-b2fa-d234c58c8868

5 files changed, 21 insertions, 14 deletions

diff --git a/os-plugins/plugins/bootsplash/OpenSLX/OSPlugin/bootsplash.pm b/os-plugins/plugins/bootsplash/OpenSLX/OSPlugin/bootsplash.pm
index fef84d29..1604e271 100644
--- a/os-plugins/plugins/bootsplash/OpenSLX/OSPlugin/bootsplash.pm
+++ b/os-plugins/plugins/bootsplash/OpenSLX/OSPlugin/bootsplash.pm
@@ -136,14 +136,33 @@ sub copyRequiredFilesIntoInitramfs
         }
         if (-d $splashyThemeDir) {
             my $splashyPath = "$bootsplashDir/files/bin";
+            my $defSplashyTheme = "/etc/splashy/themes/$bootsplashTheme";
+            my $splashyConfig = unshiftHereDoc(<<"            End-of-Here");
+                <?xml version="1.0" encoding="UTF-8"?>
+                <!-- Autogenerated by OpenSLX-plugin 'bootsplash' -->
+                <splashy>
+                    <!-- themes directory: -->
+                    <themes>/etc/splashy/themes</themes>
+                    <!-- current theme (relative path) -->
+                    <current_theme>$bootsplashTheme</current_theme>
+                    <!-- full path to theme, fall back in case of problems -->
+                    <default_theme>$defSplashyTheme</default_theme>
+                    <pid>/etc/splashy/splashy.pid</pid>
+                    <fifo>/dev/.initramfs/splashy.fifo</fifo>
+                </splashy>
+            End-of-Here
+            spitFile("$bootsplashConfigDir/config.xml", $splashyConfig);
             $makeInitRamFSEngine->addCMD(
                 "cp -p $splashyPath/splashy* $targetPath/bin/"
             );
             $makeInitRamFSEngine->addCMD(
-                "mkdir -p $targetPath/etc/splashy"
+                "mkdir -p $targetPath/etc/splashy/themes"
+            );
+            $makeInitRamFSEngine->addCMD(
+                "cp -a $bootsplashConfigDir/config.xml $targetPath/etc/splashy/"
             );
             $makeInitRamFSEngine->addCMD(
-                "cp -a $splashyThemeDir/* $targetPath/etc/splashy/"
+                "cp -a $splashyThemeDir $targetPath/etc/splashy/themes/"
             );
         }
     }
diff --git a/os-plugins/plugins/bootsplash/files/themes/openslx/themes/openslx/blank.ttf b/os-plugins/plugins/bootsplash/files/themes/openslx/blank.ttf
index e69de29b..e69de29b 100644
--- a/os-plugins/plugins/bootsplash/files/themes/openslx/themes/openslx/blank.ttf
+++ b/os-plugins/plugins/bootsplash/files/themes/openslx/blank.ttf
diff --git a/os-plugins/plugins/bootsplash/files/themes/openslx/config.xml b/os-plugins/plugins/bootsplash/files/themes/openslx/config.xml
deleted file mode 100644
index 16080a07..00000000
--- a/os-plugins/plugins/bootsplash/files/themes/openslx/config.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Automatically generated by splashy_config. Do not edit -->
-<splashy>
-    <!-- themes directory: conventional path /etc/splashy/themes -->
-    <themes>/etc/splashy/themes</themes>
-    <!-- current theme could be relative the themes defined above or full path -->
-    <current_theme>openslx</current_theme>
-    <!-- full path to theme to fall back in case of problems. DO NOT CHANGE -->
-    <default_theme>/etc/splashy/themes/openslx</default_theme>
-    <pid>/etc/splashy/splashy.pid</pid>
-    <fifo>/dev/.initramfs/splashy.fifo</fifo>
-</splashy>
diff --git a/os-plugins/plugins/bootsplash/files/themes/openslx/themes/openslx/openslx.png b/os-plugins/plugins/bootsplash/files/themes/openslx/openslx.png
index 62fc1320..62fc1320 100644
--- a/os-plugins/plugins/bootsplash/files/themes/openslx/themes/openslx/openslx.png
+++ b/os-plugins/plugins/bootsplash/files/themes/openslx/openslx.png
diff --git a/os-plugins/plugins/bootsplash/files/themes/openslx/themes/openslx/theme.xml b/os-plugins/plugins/bootsplash/files/themes/openslx/theme.xml
index d3c9bb1b..d3c9bb1b 100644
--- a/os-plugins/plugins/bootsplash/files/themes/openslx/themes/openslx/theme.xml
+++ b/os-plugins/plugins/bootsplash/files/themes/openslx/theme.xml