From 98e9e014baba7ff6f7c26750ccf877209bccdd18 Mon Sep 17 00:00:00 2001
From: Dirk von Suchodoletz
Date: Mon, 28 Mar 2011 21:59:16 +0200
Subject: test - fix iceauth failure in ubuntu 10.10

---
 src/os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm      | 14 ++++++++++++++
 src/os-plugins/plugins/desktop/OpenSLX/OSPlugin/desktop.pm | 10 ++++++++--
 src/os-plugins/plugins/desktop/XX_desktop.sh               |  4 ++++
 3 files changed, 26 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm b/src/os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm
index 316448bb..d073704e 100644
--- a/src/os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm
+++ b/src/os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm
@@ -113,6 +113,20 @@ sub GDMPathInfo
     return $pathInfo;
 }
 
+sub setupICEauthProfileScript
+{
+    my $self = shift;
+    my $script = unshiftHereDoc(<<"    End-of-Here");
+        # written by OpenSLX-plugin 'desktop'
+        mkdir "/tmp/.ICE-\${USER}"
+        chmod 600 "/tmp/.ICE-\${USER}"
+        export ICEAUTHORITY="/tmp/.ICE-\${USER}/.ICEauthority"
+
+    End-of-Here
+    
+    return $script;
+}
+
 sub setupGDMScript
 {
     my $self     = shift;
diff --git a/src/os-plugins/plugins/desktop/OpenSLX/OSPlugin/desktop.pm b/src/os-plugins/plugins/desktop/OpenSLX/OSPlugin/desktop.pm
index 7d496483..2f04e124 100644
--- a/src/os-plugins/plugins/desktop/OpenSLX/OSPlugin/desktop.pm
+++ b/src/os-plugins/plugins/desktop/OpenSLX/OSPlugin/desktop.pm
@@ -566,10 +566,13 @@ sub _setupGDMScript
     my $self = shift;
     
     my $repoPath = $self->{pluginRepositoryPath};
-    my $script = $self->{distro}->setupGDMScript($repoPath);
 
+    my $script = $self->{distro}->setupGDMScript($repoPath);
     spitFile("$repoPath/gdm/desktop.sh", $script);
 
+    my $profileScript = $self->{distro}->setupICEauthProfileScript();
+    spitFile("$repoPath/fixICEauth.sh", $profileScript);
+
     return;
 }
 
@@ -603,10 +606,13 @@ sub _setupKDMScript
     my $self = shift;
     
     my $repoPath = $self->{pluginRepositoryPath};
-    my $script = $self->{distro}->setupKDMScript($repoPath);
 
+    my $script = $self->{distro}->setupKDMScript($repoPath);
     spitFile("$repoPath/kdm/desktop.sh", $script);
 
+    my $profileScript = $self->{distro}->setupICEauthProfileScript();
+    spitFile("$repoPath/fixICEauth.sh", $profileScript);
+
     return;
 }
 
diff --git a/src/os-plugins/plugins/desktop/XX_desktop.sh b/src/os-plugins/plugins/desktop/XX_desktop.sh
index a8cc71fc..112be10a 100644
--- a/src/os-plugins/plugins/desktop/XX_desktop.sh
+++ b/src/os-plugins/plugins/desktop/XX_desktop.sh
@@ -27,6 +27,10 @@ if [ -e /initramfs/plugin-conf/desktop.conf ]; then
 your system." fatal
     fi
 
+    if [ -e /mnt/opt/openslx/plugin-repo/desktop/fixICEauth.sh ]
+    then cp  /mnt/opt/openslx/plugin-repo/desktop/fixICEauth.sh /etc/profile.d/
+    fi
+
     [ $DEBUGLEVEL -gt 0 ] && echo "done with 'desktop' os-plugin ...";
 
   fi
-- 
cgit v1.2.3-55-g7522