Changing directory 'X11/sessions' to 'X11/session' as this one seems to

be the proper one ...

7 files changed, 29 insertions, 31 deletions

diff --git a/os-plugins/plugins/desktop/OpenSLX/Distro/Scilin.pm b/os-plugins/plugins/desktop/OpenSLX/Distro/Scilin.pm
index dfeb1d0a..1dc0482c 100644
--- a/os-plugins/plugins/desktop/OpenSLX/Distro/Scilin.pm
+++ b/os-plugins/plugins/desktop/OpenSLX/Distro/Scilin.pm
@@ -69,7 +69,7 @@ sub GDMConfigHashForWorkstation
 

     my $configHash = $self->SUPER::GDMConfigHashForWorkstation();

     $configHash->{'daemon'}->{SessionDesktopDir} =

-        '/etc/X11/sessions/:/usr/share/xsessions/:/usr/share/gdm/BuiltInSessions';

+        '/etc/X11/session/:/usr/share/xsessions/:/usr/share/gdm/BuiltInSessions';

     $configHash->{'daemon'}->{Greeter} =

         '/usr/libexec/gdmgreeter';

 

@@ -119,10 +119,10 @@ sub _setupCommonDmScript
         ( 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*
-
-        # enable the inittab entry again (incomplete)
-        # sed -e "s,# line deleted.*,x:5:respawn:/etc/X11/prefdm -nodaemon," \
+        chmod a+x /mnt/etc/X11/xdm/Xreset*

+

+        # enable the inittab entry again (incomplete)

+        # sed -e "s,# line deleted.*,x:5:respawn:/etc/X11/prefdm -nodaemon," \

         # -i /mnt/etc/inittab 

     End-of-Here

 

diff --git a/os-plugins/plugins/desktop/OpenSLX/Distro/Suse.pm b/os-plugins/plugins/desktop/OpenSLX/Distro/Suse.pm
index 3d451e9e..fb71afce 100644
--- a/os-plugins/plugins/desktop/OpenSLX/Distro/Suse.pm
+++ b/os-plugins/plugins/desktop/OpenSLX/Distro/Suse.pm
@@ -1,4 +1,4 @@
-# Copyright (c) 2006..2009 - OpenSLX GmbH
+# Copyright (c) 2006..2010 - OpenSLX GmbH
 #
 # This program is free software distributed under the GPL version 2.
 # See http://openslx.org/COPYING
@@ -75,7 +75,7 @@ sub GDMConfigHashForWorkstation
 
     my $configHash = $self->SUPER::GDMConfigHashForWorkstation();
     $configHash->{'daemon'}->{SessionDesktopDir} =
-        '/etc/X11/sessions/:/usr/share/xsessions/';
+        '/etc/X11/session/:/usr/share/xsessions/';
     $configHash->{'daemon'}->{DefaultSession} = 'default.desktop';
     $configHash->{'daemon'}->{Greeter} =
         '/usr/lib/gdm/gdmgreeter';
@@ -124,7 +124,7 @@ sub setupKDMScript
         sed -i "s/DISPLAYMANAGER=.*/DISPLAYMANAGER=\"kdm$kdmver\"/" \
             /mnt/etc/sysconfig/displaymanager
         [ $(grep -q DISPLAYMANAGER /mnt/etc/sysconfig/displaymanager) ] && \
-        echo "DISPLAYMANAGER=\"kdm$kdmver\"" >> /mnt/et/sysconfig/displaymanager
+        echo "DISPLAYMANAGER=\"kdm$kdmver\"" >>/mnt/etc/sysconfig/displaymanager
         sed -i "s/DEFAULT_WM=.*/DEFAULT_WM=\"$desktop_kind\"/" \
             /mnt/etc/sysconfig/windowmanager
     End-of-Here
diff --git a/os-plugins/plugins/desktop/OpenSLX/Distro/Suse_10_2.pm b/os-plugins/plugins/desktop/OpenSLX/Distro/Suse_10_2.pm
index c7f27d65..ac14b2a5 100644
--- a/os-plugins/plugins/desktop/OpenSLX/Distro/Suse_10_2.pm
+++ b/os-plugins/plugins/desktop/OpenSLX/Distro/Suse_10_2.pm
@@ -1,4 +1,4 @@
-# Copyright (c) 2006..2009 - OpenSLX GmbH
+# Copyright (c) 2006..2010 - OpenSLX GmbH
 #
 # This program is free software distributed under the GPL version 2.
 # See http://openslx.org/COPYING
@@ -44,7 +44,7 @@ sub GDMConfigHashForWorkstation
 
     my $configHash = $self->SUPER::GDMConfigHashForWorkstation();
     $configHash->{'daemon'}->{SessionDesktopDir} =
-        '/etc/X11/sessions/:/usr/share/xsessions/';
+        '/etc/X11/session/:/usr/share/xsessions/';
     $configHash->{'daemon'}->{Greeter} =
         '/opt/gnome/lib/gdm/gdmgreeter';
 
diff --git a/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm b/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm
index 6e69ee14..fa364b79 100644
--- a/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm
+++ b/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm
@@ -1,4 +1,4 @@
-# Copyright (c) 2006..2009 - OpenSLX GmbH
+# Copyright (c) 2006..2010 - OpenSLX GmbH
 #
 # This program is free software distributed under the GPL version 2.
 # See http://openslx.org/COPYING
@@ -115,7 +115,7 @@ sub GDMConfigHashForWorkstation
 
     my $configHash = $self->SUPER::GDMConfigHashForWorkstation();
     $configHash->{'daemon'}->{SessionDesktopDir} = 
-        '/etc/X11/sessions/:/usr/share/xsessions/:/usr/share/gdm/BuiltInSessions/';
+        '/etc/X11/session/:/usr/share/xsessions/:/usr/share/gdm/BuiltInSessions/';
 
     return $configHash;
 }
@@ -132,7 +132,7 @@ sub KDMConfigHashForWorkstation
     $configHash->{'X-:0-Core'}->{Session} = "/etc/kde$kdmVer/kdm/Xsession";
     $configHash->{'X-:0-Core'}->{Reset} = "/etc/kde$kdmVer/kdm/Xreset";
     $configHash->{'X-:0-Core'}->{SessionsDirs} = 
-        '/etc/X11/sessions,/usr/share/xsessions,/usr/share/apps/kdm/sessions';
+        '/etc/X11/session,/usr/share/xsessions,/usr/share/apps/kdm/sessions';
     $configHash->{'X-:0-Core'}->{ServerAttempts} = "2";   
 
     return $configHash;
diff --git a/os-plugins/plugins/vmchooser/OpenSLX/Distro/Base.pm b/os-plugins/plugins/vmchooser/OpenSLX/Distro/Base.pm
index ba8a32b0..43e4ea1f 100644
--- a/os-plugins/plugins/vmchooser/OpenSLX/Distro/Base.pm
+++ b/os-plugins/plugins/vmchooser/OpenSLX/Distro/Base.pm
@@ -54,11 +54,11 @@ sub copyDefaultSession
 	
 	# Take the default path of SuSE 
 	# (as we have the most experience with it)
-	if( -f "/etc/X11/sessions/default.desktop") {
-		rename("/etc/X11/sessions/default.desktop",
-		      "/etc/X11/sessions/default.desktop.back")
+	if( -f "/etc/X11/session/default.desktop") {
+		rename("/etc/X11/session/default.desktop",
+		      "/etc/X11/session/default.desktop.back")
 	}
-	copyFile("$pluginroot/default.desktop","/etc/X11/sessions");
+	copyFile("$pluginroot/default.desktop","/etc/X11/session");
 	
 	return 1;
 }
\ No newline at end of file
diff --git a/os-plugins/plugins/vmchooser/OpenSLX/Distro/Suse.pm b/os-plugins/plugins/vmchooser/OpenSLX/Distro/Suse.pm
index 9e0bf551..c93a066b 100644
--- a/os-plugins/plugins/vmchooser/OpenSLX/Distro/Suse.pm
+++ b/os-plugins/plugins/vmchooser/OpenSLX/Distro/Suse.pm
@@ -1,4 +1,4 @@
-# Copyright (c) 2008 - OpenSLX GmbH
+# Copyright (c) 2008..2010 - OpenSLX GmbH
 #
 # This program is free software distributed under the GPL version 2.
 # See http://openslx.org/COPYING
@@ -33,17 +33,15 @@ use OpenSLX::Utils;
 
 sub copyDefaultSession
 {
-	my $self 	= shift;
-	my $pluginroot = shift;
-	
-	
-	# Take the default path of SuSE 
-	# (as we have the most experience with it)
-	if( -f "/etc/X11/sessions/default.desktop") {
-        rename("/etc/X11/sessions/default.desktop",
-              "/etc/X11/sessions/default.desktop.back")
+    my $self 	= shift;
+    my $pluginroot = shift;
+
+    # Take the default path of SuSE 
+    # (as we have the most experience with it)
+    if( -f "/etc/X11/session/default.desktop") {
+        rename("/etc/X11/session/default.desktop",
+              "/etc/X11/session/default.desktop.back")
     }
-	copyFile("$pluginroot/default.desktop","/etc/X11/sessions");
-	
-	return 1;
+    copyFile("$pluginroot/default.desktop","/etc/X11/session");
+    return 1;
 }
\ No newline at end of file
diff --git a/os-plugins/plugins/vmchooser/XX_vmchooser.sh b/os-plugins/plugins/vmchooser/XX_vmchooser.sh
index d3ade116..35d17a2e 100644
--- a/os-plugins/plugins/vmchooser/XX_vmchooser.sh
+++ b/os-plugins/plugins/vmchooser/XX_vmchooser.sh
@@ -1,5 +1,5 @@
 # Copyright (c) 2008, 2009 - RZ Uni Freiburg
-# Copyright (c) 2008, 2009 - OpenSLX GmbH
+# Copyright (c) 2008..2010 - OpenSLX GmbH
 #
 # This program/file is free software distributed under the GPL version 2.
 # See http://openslx.org/COPYING