removed bootsplash stuff from theme plugin, because of conflicts with bootsplash. didn't remove it until now because one could use it instead of bootsplash and displaymanager plugin but bootsplash doesn't work anymore with the themem plugin. so it had to be removed so bootsplash can be installed.

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

11 files changed, 3 insertions, 109 deletions

diff --git a/os-plugins/plugins/theme/OpenSLX/OSPlugin/theme.pm b/os-plugins/plugins/theme/OpenSLX/OSPlugin/theme.pm
index 28cc943b..4487be87 100644
--- a/os-plugins/plugins/theme/OpenSLX/OSPlugin/theme.pm
+++ b/os-plugins/plugins/theme/OpenSLX/OSPlugin/theme.pm
@@ -42,9 +42,9 @@ sub getInfo
 
     return {
         description => unshiftHereDoc(<<'        End-of-Here'),
-            Applies a graphical theme to the bootsplash and the displaymanager.
+            Applies a graphical theme to the displaymanager.
         End-of-Here
-        precedence => 30,
+        precedence => 40,
     };
 }
 
@@ -63,17 +63,6 @@ sub getAttrInfo
             content_descr => '1 means active - 0 means inactive',
             default => '1',
         },
-
-        'theme::splash' => {
-            applies_to_systems => 1,
-            applies_to_clients => 0,
-            description => unshiftHereDoc(<<'            End-of-Here'),
-                name of the theme to apply to bootsplash (unset for no theme)
-            End-of-Here
-            content_regex => undef,
-            content_descr => undef,
-            default => 'openslx',
-        },
         'theme::displaymanager' => {
             applies_to_systems => 1,
             applies_to_clients => 0,
@@ -97,41 +86,6 @@ sub getAttrInfo
     };
 }
 
-sub suggestAdditionalKernelParams
-{
-    my $self                = shift;
-    my $makeInitRamFSEngine = shift;
-
-    my @suggestedParams;
-    
-    # add vga=0x317 unless explicit vga-mode is already set
-    if (!$makeInitRamFSEngine->haveKernelParam(qr{\bvga=})) {
-        push @suggestedParams, 'vga=0x317';
-    }
-
-    # add quiet, if not already set
-    if (!$makeInitRamFSEngine->haveKernelParam('quiet')) {
-        push @suggestedParams, 'quiet';
-    }
-
-    return @suggestedParams;
-}
-
-sub suggestAdditionalKernelModules
-{
-    my $self                = shift;
-    my $makeInitRamFSEngine = shift;
-
-    my @suggestedModules;
-    
-    # Ubuntu needs vesafb and fbcon (which drags along some others)
-    if ($makeInitRamFSEngine->{'distro-name'} =~ m{^ubuntu}i) {
-        push @suggestedModules, qw( vesafb fbcon )
-    }
-    
-    return @suggestedModules;
-}
-
 sub copyRequiredFilesIntoInitramfs
 {
     my $self                = shift;
@@ -140,25 +94,6 @@ sub copyRequiredFilesIntoInitramfs
     my $makeInitRamFSEngine = shift;
     
     my $themeDir = "$openslxConfig{'base-path'}/share/themes";
-    my $splashTheme = $attrs->{'theme::splash'} || '';
-    if ($splashTheme) {
-        my $splashThemeDir = "$themeDir/$splashTheme/bootsplash";
-        if (-d $splashThemeDir) {
-            my $splashyPath = "$openslxConfig{'base-path'}/share/splashy";
-            $makeInitRamFSEngine->addCMD(
-                "cp -p $splashyPath/* $targetPath/bin/"
-            );
-            $makeInitRamFSEngine->addCMD(
-                "mkdir -p $targetPath/etc/splashy"
-            );
-            $makeInitRamFSEngine->addCMD(
-                "cp -a $splashThemeDir/* $targetPath/etc/splashy/"
-            );
-        }
-    }
-    else {
-        $splashTheme = '<none>';
-    }
 
     my $displayManagerTheme = $attrs->{'theme::displaymanager'} || '';
     if ($displayManagerTheme) {
@@ -180,9 +115,7 @@ sub copyRequiredFilesIntoInitramfs
     vlog(
         1, 
         _tr(
-            "theme-plugin: bootsplash=%s displaymanager=%s", 
-            $splashTheme, $displayManagerTheme
-        )
+            "theme-plugin: displaymanager=%s", $displayManagerTheme)
     );
 
     return;
diff --git a/os-plugins/plugins/theme/XX_theme.sh b/os-plugins/plugins/theme/XX_theme.sh
index 097397bf..765a16ce 100644
--- a/os-plugins/plugins/theme/XX_theme.sh
+++ b/os-plugins/plugins/theme/XX_theme.sh
@@ -25,20 +25,5 @@ if [ -e /initramfs/plugin-conf/theme.conf ]; then
                 fi
 
 		[ $DEBUGLEVEL -gt 0 ] && echo "done with 'theme' os-plugin ...";
-
-                if [ ${theme_nosplash} -eq 0 ]; then
-                        # make the splashy_update binary available in stage4 ...
-                        mkdir -p /mnt/var/lib/openslx/bin
-                        cp -a /bin/splashy_update /mnt/var/lib/openslx/bin
-
-                        # ... and create a runlevelscript that will stop splashy somewhere near
-                        # the end of stage4
-                        d_mkrlscript init splashy.stop "Stopping Splashy ..."
-                        echo -e "\t/var/lib/openslx/bin/splashy_update exit 2>/dev/null \
-                                \n\ttype killall >/dev/null 2>&1 && killall -9 splashy \
-                                \n\trm -f /var/lib/openslx/bin/splashy_update 2>/dev/null" \
-                                >>/mnt/etc/${D_INITDIR}/splashy.stop
-                        d_mkrlscript close splashy.stop ""
-	        fi
         fi
 fi
diff --git a/os-plugins/plugins/theme/init-hooks/05-have-kernelvars/theme.sh b/os-plugins/plugins/theme/init-hooks/05-have-kernelvars/theme.sh
deleted file mode 100644
index 8fdec8d7..00000000
--- a/os-plugins/plugins/theme/init-hooks/05-have-kernelvars/theme.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-# splashy depends on /proc/fb with VESA
-# only activate with kernel option quiet and no debuglevel
-if grep -E "(VESA|VGA)" /proc/fb > /dev/null 2>&1 \
-  && grep -qi " quiet " /proc/cmdline > /dev/null 2>&1 \
-  && [ $DEBUGLEVEL -eq 0 ] \
-  && [ -e /bin/splashy ] ; then
-  export theme_nosplash=0
-else
-  export theme_nosplash=1
-fi
-
-if [ ${theme_nosplash} -eq 0 ]; then
-        /bin/splashy boot 2>/dev/null
-        # add splashy.stop runlevel script
-        D_SPLASHY=splashy.stop
-fi
diff --git a/os-plugins/plugins/theme/init-hooks/15-have-ip-config/theme.sh b/os-plugins/plugins/theme/init-hooks/15-have-ip-config/theme.sh
deleted file mode 100644
index cb89362e..00000000
--- a/os-plugins/plugins/theme/init-hooks/15-have-ip-config/theme.sh
+++ /dev/null
@@ -1 +0,0 @@
-[ ${theme_nosplash} = 0 ] && /bin/splashy_update "progress 15" >/dev/null 2>&1
diff --git a/os-plugins/plugins/theme/init-hooks/25-have-network-root/theme.sh b/os-plugins/plugins/theme/init-hooks/25-have-network-root/theme.sh
deleted file mode 100644
index 369f8d45..00000000
--- a/os-plugins/plugins/theme/init-hooks/25-have-network-root/theme.sh
+++ /dev/null
@@ -1 +0,0 @@
-[ ${theme_nosplash} = 0 ] && /bin/splashy_update "progress 25" >/dev/null 2>&1
diff --git a/os-plugins/plugins/theme/init-hooks/40-started-hw-config/theme.sh b/os-plugins/plugins/theme/init-hooks/40-started-hw-config/theme.sh
deleted file mode 100644
index ac91157f..00000000
--- a/os-plugins/plugins/theme/init-hooks/40-started-hw-config/theme.sh
+++ /dev/null
@@ -1 +0,0 @@
-[ ${theme_nosplash} = 0 ] && /bin/splashy_update "progress 40" >/dev/null 2>&1
diff --git a/os-plugins/plugins/theme/init-hooks/50-have-layered-fs/theme.sh b/os-plugins/plugins/theme/init-hooks/50-have-layered-fs/theme.sh
deleted file mode 100644
index 85a8279a..00000000
--- a/os-plugins/plugins/theme/init-hooks/50-have-layered-fs/theme.sh
+++ /dev/null
@@ -1 +0,0 @@
-[ ${theme_nosplash} -eq 0 ] && /bin/splashy_update "progress 50" >/dev/null 2>&1
diff --git a/os-plugins/plugins/theme/init-hooks/60-have-servconfig/theme.sh b/os-plugins/plugins/theme/init-hooks/60-have-servconfig/theme.sh
deleted file mode 100644
index 91a0ed45..00000000
--- a/os-plugins/plugins/theme/init-hooks/60-have-servconfig/theme.sh
+++ /dev/null
@@ -1 +0,0 @@
-[ ${theme_nosplash} = 0 ] && /bin/splashy_update "progress 60" >/dev/null 2>&1
diff --git a/os-plugins/plugins/theme/init-hooks/70-before-plugins/theme.sh b/os-plugins/plugins/theme/init-hooks/70-before-plugins/theme.sh
deleted file mode 100644
index 170fba3e..00000000
--- a/os-plugins/plugins/theme/init-hooks/70-before-plugins/theme.sh
+++ /dev/null
@@ -1 +0,0 @@
-[ ${theme_nosplash} = 0 ] && /bin/splashy_update "progress 70" >/dev/null 2>&1
diff --git a/os-plugins/plugins/theme/init-hooks/80-after-plugins/theme.sh b/os-plugins/plugins/theme/init-hooks/80-after-plugins/theme.sh
deleted file mode 100644
index 53032caf..00000000
--- a/os-plugins/plugins/theme/init-hooks/80-after-plugins/theme.sh
+++ /dev/null
@@ -1 +0,0 @@
-[ ${theme_nosplash} = 0 ] && /bin/splashy_update "progress 80" >/dev/null 2>&1
diff --git a/os-plugins/plugins/theme/init-hooks/99-handing-over/theme.sh b/os-plugins/plugins/theme/init-hooks/99-handing-over/theme.sh
deleted file mode 100644
index 4f01b512..00000000
--- a/os-plugins/plugins/theme/init-hooks/99-handing-over/theme.sh
+++ /dev/null
@@ -1 +0,0 @@
-[ ${theme_nosplash} -eq 0 ] && /bin/splashy_update "progress 100" >/dev/null 2>&1