Removed all kdm/gdm/xdm and most of X configuration. Before altering these file this step should be testet, so that painfull merging can be avoided. The files in initramfs/distro-specs and initramfs/initrd-stuff should be cleaned. Maybe we should drop support for a few older systems and refer to an older revision. Dhclinet config should be altered or removed since we do not use it anymore. Udhcp should be the default. Example line 267 in initrd-stuff/etc/functions, begins with: "# create configuration file for dhclient."

Removed obsolete theme plugin and the displaymanager themes from the themes dir in the repos. The themes (kdm/gdm) are located in the plugin dir anyway.



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

2 files changed, 0 insertions, 153 deletions

diff --git a/os-plugins/plugins/theme/OpenSLX/OSPlugin/theme.pm b/os-plugins/plugins/theme/OpenSLX/OSPlugin/theme.pm
deleted file mode 100644
index 4487be87..00000000
--- a/os-plugins/plugins/theme/OpenSLX/OSPlugin/theme.pm
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright (c) 2007 - OpenSLX GmbH
-#
-# This program is free software distributed under the GPL version 2.
-# See http://openslx.org/COPYING
-#
-# If you have any feedback please consult http://openslx.org/feedback and
-# send your suggestions, praise, or complaints to feedback@openslx.org
-#
-# General information about OpenSLX can be found at http://openslx.org/
-# -----------------------------------------------------------------------------
-# theme.pm
-#    - implementation of the 'theme' plugin, which applies theming to the 
-#     following places:
-#        + bootsplash (via splashy)
-#        + displaymanager (gdm, kdm, ...)
-#        + desktop (to be done)
-# -----------------------------------------------------------------------------
-package OpenSLX::OSPlugin::theme;
-
-use strict;
-use warnings;
-
-use base qw(OpenSLX::OSPlugin::Base);
-
-use OpenSLX::Basics;
-use OpenSLX::Utils;
-
-sub new
-{
-    my $class = shift;
-
-    my $self = {
-        name => 'theme',
-    };
-
-    return bless $self, $class;
-}
-
-sub getInfo
-{
-    my $self = shift;
-
-    return {
-        description => unshiftHereDoc(<<'        End-of-Here'),
-            Applies a graphical theme to the displaymanager.
-        End-of-Here
-        precedence => 40,
-    };
-}
-
-sub getAttrInfo
-{
-    my $self = shift;
-
-    return {
-        'theme::active' => {
-            applies_to_systems => 1,
-            applies_to_clients => 0,
-            description => unshiftHereDoc(<<'            End-of-Here'),
-                should the 'theme'-plugin be executed during boot?
-            End-of-Here
-            content_regex => qr{^(0|1)$},
-            content_descr => '1 means active - 0 means inactive',
-            default => '1',
-        },
-        'theme::displaymanager' => {
-            applies_to_systems => 1,
-            applies_to_clients => 0,
-            description => unshiftHereDoc(<<'            End-of-Here'),
-                name of the theme to apply to displaymanager (unset for no theme)
-            End-of-Here
-            content_regex => undef,
-            content_descr => undef,
-            default => 'openslx',
-        },
-        'theme::desktop' => {
-            applies_to_systems => 1,
-            applies_to_clients => 0,
-            description => unshiftHereDoc(<<'            End-of-Here'),
-                name of the theme to apply to desktop (unset for no theme)
-            End-of-Here
-            content_regex => undef,
-            content_descr => undef,
-            default => 'openslx',
-        },
-    };
-}
-
-sub copyRequiredFilesIntoInitramfs
-{
-    my $self                = shift;
-    my $targetPath          = shift;
-    my $attrs                = shift;
-    my $makeInitRamFSEngine = shift;
-    
-    my $themeDir = "$openslxConfig{'base-path'}/share/themes";
-
-    my $displayManagerTheme = $attrs->{'theme::displaymanager'} || '';
-    if ($displayManagerTheme) {
-        my $displayManagerThemeDir 
-            = "$themeDir/$displayManagerTheme/displaymanager";
-        if (-d $displayManagerThemeDir) {
-            $makeInitRamFSEngine->addCMD(
-                "mkdir -p $targetPath/usr/share/themes"
-            );
-            $makeInitRamFSEngine->addCMD(
-                "cp -a $displayManagerThemeDir $targetPath/usr/share/themes/"
-            );
-        }
-    }
-    else {
-        $displayManagerTheme = '<none>';
-    }
-
-    vlog(
-        1, 
-        _tr(
-            "theme-plugin: displaymanager=%s", $displayManagerTheme)
-    );
-
-    return;
-}
-
-1;
diff --git a/os-plugins/plugins/theme/XX_theme.sh b/os-plugins/plugins/theme/XX_theme.sh
deleted file mode 100644
index 765a16ce..00000000
--- a/os-plugins/plugins/theme/XX_theme.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#! /bin/sh
-#
-# stage3 part of 'theme' plugin - the runlevel script
-#
-. /etc/functions
-. /etc/distro-functions
-. /etc/sysconfig/config
-if [ -e /initramfs/plugin-conf/theme.conf ]; then
-	. /initramfs/plugin-conf/theme.conf
-	if [ $theme_active -ne 0 ]; then
-		[ $DEBUGLEVEL -gt 0 ] && echo "executing the 'theme' os-plugin ...";
-	
-		testmkd /mnt/var/lib/openslx/themes/displaymanager
-		testmkd /mnt/var/lib/openslx/bin
-                if [ -d /usr/share/themes/displaymanager ]; then
-                        cp -a /usr/share/themes/displaymanager \
-                          /mnt/var/lib/openslx/themes
-                        if [ -f /mnt/${D_KDMRCPATH}/kdmrc ]; then
-                          sed -i "s,UseTheme=false,UseTheme=true," /mnt/${D_KDMRCPATH}/kdmrc
-			fi
-                        if [ -f /mnt/etc/gdm/gdm.conf ]; then
-			  sed -i "s,^\(GraphicalThemeDir=.*\)$,#\1 \nGraphicalThemeDir=/var/lib/openslx/themes/displaymanager," /mnt/etc/gdm/gdm.conf
-			  sed -i "s,^\(GraphicalTheme=.*\)$,#\1 \nGraphicalTheme=gdm," /mnt/etc/gdm/gdm.conf
-			fi
-                fi
-
-		[ $DEBUGLEVEL -gt 0 ] && echo "done with 'theme' os-plugin ...";
-        fi
-fi