* intermediate check-in of recent work at the desktop plugin - GDM handling

  now seems to work with SUSE and Ubuntu, but proper integration will have
  to wait until I have shaken off the flu


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

1 files changed, 15 insertions, 6 deletions

diff --git a/os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm b/os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm
index dffa1850..80be8bcf 100644
--- a/os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm
+++ b/os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm
@@ -39,12 +39,20 @@ sub initialize
     return 1;
 }
 
+sub pathOf
+{
+    my $self   = shift;
+    my $binary = shift;
+    
+    return qx{which $binary 2>/dev/null};
+}
+
 sub isInPath
 {
     my $self   = shift;
     my $binary = shift;
     
-    my $path = qx{which $binary 2>/dev/null};
+    my $path = $self->pathOf($binary);
 
     return $path ? 1 : 0;
 }
@@ -98,13 +106,14 @@ sub GDMPathInfo
     return $pathInfo;
 }
 
-sub GDMRunlevelLinks
+sub patchGDMScript
 {
     my $self   = shift;
+    my $script = shift;
+    
+    # default implementation does nothing!
     
-    return unshiftHereDoc(<<"    End-of-Here");
-        rllinker gdm 15 15
-    End-of-Here
+    return $script;
 }
 
 sub GDMConfigHashForWorkstation
@@ -124,7 +133,7 @@ sub GDMConfigHashForWorkstation
             Enable => 'false',
         },
         'greeter' => {
-            AllowShutdown => 'true',
+            AllowShutdown => 'false',
             Browser => 'false',
             MinimalUID => '500',
             SecureShutdown => 'false',