No need for duplication of script code ...

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

1 files changed, 2 insertions, 15 deletions

diff --git a/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm b/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm
index 74d53181..6f5cfc09 100644
--- a/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm
+++ b/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm
@@ -45,7 +45,8 @@ sub setupGDMScript
 
     my $script = $self->SUPER::setupGDMScript($repoPath);
 
-    my $configFile = $self->GDMPathInfo()->{config};
+    my $pathInfo   = $self->GDMPathInfo();
+    my $configFile = $pathInfo->{config};
     
     $script .= unshiftHereDoc(<<'    End-of-Here');
         rllinker gdm 1 1
@@ -55,20 +56,6 @@ sub setupGDMScript
           /usr/bin/gnome-session
         testmkd /mnt/var/lib/gdm root:gdm 1770
         sed "/[daemon]/ a\BaseXsession=/etc/gdm/Xsession" -i /mnt$configFile
-        case ${desktop_allowshutdown} in
-          none)
-          ;;
-          root)
-            sed "s|AllowShutdown.*|AllowShutdown=true|;\
-                 s|SecureShutdown.*|SecureShutdown=true" -i /mnt$configFile
-          ;;
-          users)
-            sed "s|AllowShutdown.*|AllowShutdown=true|;\
-                 s|SecureShutdown.*|SecureShutdown=false" -i /mnt$configFile
-          ;;
-        esac
-        [ ${desktop_rootlogin} -ne 0 ] && \
-          sed "s|AllowRoot.*|AllowRoot=true|" -i /mnt$configFile
     End-of-Here
 
     return $script;