diff options
| author | Dirk von Suchodoletz | 2011-03-28 21:59:16 +0200 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2011-03-28 21:59:16 +0200 |
| commit | 98e9e014baba7ff6f7c26750ccf877209bccdd18 (patch) | |
| tree | cd15c16fc61f80a8c3b967b1c7abd2d078c9ed5b /src | |
| parent | Fixing library problems when calling mkfs.* ... (diff) | |
| download | core-98e9e014baba7ff6f7c26750ccf877209bccdd18.tar.gz core-98e9e014baba7ff6f7c26750ccf877209bccdd18.tar.xz core-98e9e014baba7ff6f7c26750ccf877209bccdd18.zip | |
test - fix iceauth failure in ubuntu 10.10
Diffstat (limited to 'src')
| -rw-r--r-- | src/os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm | 14 | ||||
| -rw-r--r-- | src/os-plugins/plugins/desktop/OpenSLX/OSPlugin/desktop.pm | 10 | ||||
| -rw-r--r-- | src/os-plugins/plugins/desktop/XX_desktop.sh | 4 |
3 files changed, 26 insertions, 2 deletions
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 |