From d72f9e25e6519a29e7674dfa4182352507f14e79 Mon Sep 17 00:00:00 2001
From: Dirk von Suchodoletz
Date: Fri, 6 Mar 2009 15:41:54 +0000
Subject: Addons to desktop plugin.

git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2691 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm  |   1 +
 .../plugins/desktop/OpenSLX/Distro/Scilin.pm       | 132 +++++++++++++++++++++
 os-plugins/plugins/desktop/OpenSLX/Distro/Suse.pm  |   1 +
 3 files changed, 134 insertions(+)
 create mode 100644 os-plugins/plugins/desktop/OpenSLX/Distro/Scilin.pm

(limited to 'os-plugins/plugins/desktop/OpenSLX')

diff --git a/os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm b/os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm
index d88c8d1e..9e657fbd 100644
--- a/os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm
+++ b/os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm
@@ -174,6 +174,7 @@ sub GDMConfigHashForWorkstation
             AutomaticLoginEnable => 'false',
             Group => 'gdm',
             User => 'gdm',
+            DefaultSession => 'default.desktop',
         },
         'debug' => {
             Enable => 'false',
diff --git a/os-plugins/plugins/desktop/OpenSLX/Distro/Scilin.pm b/os-plugins/plugins/desktop/OpenSLX/Distro/Scilin.pm
new file mode 100644
index 00000000..ef31391a
--- /dev/null
+++ b/os-plugins/plugins/desktop/OpenSLX/Distro/Scilin.pm
@@ -0,0 +1,132 @@
+# Copyright (c) 2006..2009 - 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/
+# -----------------------------------------------------------------------------
+# desktop/OpenSLX/Distro/Scilin.pm
+#    - provides Scilin-specific overrides of the Distro API for the desktop
+#      plugin.
+# -----------------------------------------------------------------------------
+package desktop::OpenSLX::Distro::Scilin;
+
+use strict;
+use warnings;
+
+use base qw(desktop::OpenSLX::Distro::Base);
+
+use File::Path;
+
+use OpenSLX::Basics;
+use OpenSLX::Utils;
+
+################################################################################
+### interface methods
+################################################################################
+
+sub GDMPathInfo
+{
+    my $self = shift;
+    
+    my $pathInfo = $self->SUPER::GDMPathInfo();
+    
+    # create gdm.conf-custom instead of gdm.conf
+    $pathInfo->{config} = '/etc/gdm/custom.conf';
+
+    return $pathInfo;
+}
+
+sub setupGDMScript
+{
+    my $self     = shift;
+    my $repoPath = shift;
+
+    my $script = $self->SUPER::setupGDMScript($repoPath);
+
+    my $configFile = $self->GDMPathInfo->{config};
+
+    # include common stuff (independent of display manager used)
+    $script = _setupCommonDmScript($script);
+
+    $script .= unshiftHereDoc(<<'    End-of-Here');
+        echo "DISPLAYMANAGER=GNOME" \
+            >/mnt/etc/sysconfig/desktop
+        testmkd /mnt/var/gdm root:gdm 1770
+    End-of-Here
+
+    return $script;
+}
+
+sub GDMConfigHashForWorkstation
+{
+    my $self = shift;
+
+    my $configHash = $self->SUPER::GDMConfigHashForWorkstation();
+    $configHash->{'daemon'}->{SessionDesktopDir} =
+        '/etc/X11/sessions/:/usr/share/xsessions/:/usr/share/gdm/BuiltInSessions';
+    $configHash->{'daemon'}->{Greeter} =
+        '/usr/libexec/gdmgreeter';
+
+    return $configHash;
+}
+
+sub setupKDMScript
+{
+    my $self     = shift;
+    my $repoPath = shift;
+
+    # SUSE reads /var/adm/kdm/kdmrc.sysconfig, so we link that to
+    # our config file
+    my $pathInfo   = $self->KDMPathInfo();
+    my $configFile = $pathInfo->{config};
+    mkpath("/etc/opt/kdm");
+    mkpath("/var/adm/kdm");
+    # maybe backup kdmrc.sysconfig sometimes
+    unlink("/var/adm/kdm/kdmrc.sysconfig");
+    # the config file gets overwritten if this script is present
+    unlink("/opt/kde3/share/apps/kdm/read_sysconfig.sh");
+    symlink("/etc/opt/kdm/kdmrc", "/var/adm/kdm/kdmrc.sysconfig");
+
+    my $script = $self->SUPER::setupKDMScript($repoPath);
+
+    # include common stuff (independent of display manager used)
+    $script = _setupCommonDmScript($script);
+
+    $script .= unshiftHereDoc(<<'    End-of-Here');
+        echo "DISPLAYMANAGER=KDE" \
+            >/mnt/etc/sysconfig/desktop
+    End-of-Here
+
+    return $script;
+}
+
+sub setupKDEHOME
+{
+    return;
+}
+
+sub _setupCommonDmScript
+{
+    my $script = shift;
+
+    $script .= unshiftHereDoc(<<'    End-of-Here');
+        # cleanup after users Xorg session
+        sed 's,^#!.*,,' /mnt/etc/X11/xdm/Xreset \
+          > /mnt/etc/X11/xdm/Xreset.system
+        echo -e '#!/bin/sh\n#\n# modified by desktop plugin in Stage3\n#\n
+        # remove safely any remaining files of the leaving user in /tmp
+        ( su -c "rm -rf /tmp/*" - $USER
+          echo "$USER files removed by $0" >/tmp/files.removed 2>/dev/null ) &
+        . /etc/X11/xdm/Xreset.system' >/mnt/etc/X11/xdm/Xreset
+        chmod a+x /mnt/etc/X11/xdm/Xreset*
+
+    End-of-Here
+
+    return $script;
+}
+
+1;
diff --git a/os-plugins/plugins/desktop/OpenSLX/Distro/Suse.pm b/os-plugins/plugins/desktop/OpenSLX/Distro/Suse.pm
index 37f315f8..1a3efc85 100644
--- a/os-plugins/plugins/desktop/OpenSLX/Distro/Suse.pm
+++ b/os-plugins/plugins/desktop/OpenSLX/Distro/Suse.pm
@@ -73,6 +73,7 @@ sub GDMConfigHashForWorkstation
     my $configHash = $self->SUPER::GDMConfigHashForWorkstation();
     $configHash->{'daemon'}->{SessionDesktopDir} =
         '/etc/X11/sessions/:/usr/share/xsessions/';
+    $configHash->{'daemon'}->{DefaultSession} = 'default.desktop';
     $configHash->{'daemon'}->{Greeter} =
         '/usr/lib/gdm/gdmgreeter';
 
-- 
cgit v1.2.3-55-g7522