diff options
| author | Dirk von Suchodoletz | 2010-02-28 17:52:02 +0100 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2010-02-28 17:52:02 +0100 |
| commit | 93b96836f5bfd34ebfed8c9d004b679b5ba96506 (patch) | |
| tree | e7b44e845398d664697976e5b530ce172954fe99 /os-plugins/plugins/vmchooser | |
| parent | Add slx binary path (var/opt/openslx/bin), fix console-kit-daemon issue (diff) | |
| download | core-93b96836f5bfd34ebfed8c9d004b679b5ba96506.tar.gz core-93b96836f5bfd34ebfed8c9d004b679b5ba96506.tar.xz core-93b96836f5bfd34ebfed8c9d004b679b5ba96506.zip | |
Changing directory 'X11/sessions' to 'X11/session' as this one seems to
be the proper one ...
Diffstat (limited to 'os-plugins/plugins/vmchooser')
| -rw-r--r-- | os-plugins/plugins/vmchooser/OpenSLX/Distro/Base.pm | 8 | ||||
| -rw-r--r-- | os-plugins/plugins/vmchooser/OpenSLX/Distro/Suse.pm | 24 | ||||
| -rw-r--r-- | os-plugins/plugins/vmchooser/XX_vmchooser.sh | 2 |
3 files changed, 16 insertions, 18 deletions
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 |