diff options
| author | Bastian Wissler | 2008-10-16 16:00:04 +0200 |
|---|---|---|
| committer | Bastian Wissler | 2008-10-16 16:00:04 +0200 |
| commit | 5c4d30c3213980c50f9abda451ae2ba0ad9dde2e (patch) | |
| tree | 52de32e57e124564bf74c1147eeffd0eb0eb2b2b /os-plugins | |
| parent | * fix broken 2.0 vmpl installation (diff) | |
| download | core-5c4d30c3213980c50f9abda451ae2ba0ad9dde2e.tar.gz core-5c4d30c3213980c50f9abda451ae2ba0ad9dde2e.tar.xz core-5c4d30c3213980c50f9abda451ae2ba0ad9dde2e.zip | |
xserver fix: * linkage.sh does not run with ubuntu dash shell.
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2333 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'os-plugins')
| -rw-r--r-- | os-plugins/plugins/xserver/OpenSLX/OSPlugin/xserver.pm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/os-plugins/plugins/xserver/OpenSLX/OSPlugin/xserver.pm b/os-plugins/plugins/xserver/OpenSLX/OSPlugin/xserver.pm index 1a8de27f..8bf6b8e3 100644 --- a/os-plugins/plugins/xserver/OpenSLX/OSPlugin/xserver.pm +++ b/os-plugins/plugins/xserver/OpenSLX/OSPlugin/xserver.pm @@ -228,18 +228,18 @@ sub installationPhase copyFile("$pluginFilesPath/ubuntu-gfx-install.sh", "$installationPath"); copyFile("$pluginFilesPath/suse-gfx-install.sh", "$installationPath"); copyFile("$pluginFilesPath/linkage.sh", "$installationPath"); - # be on the safe side - system("/bin/sh /opt/openslx/plugin-repo/$self->{'name'}/linkage.sh clean"); + # be on the safe side (BASH) - Ubuntu sets some crazy stupid 'dash' shell otherwise + system("/bin/bash /opt/openslx/plugin-repo/$self->{'name'}/linkage.sh clean"); } if ($attrs->{'xserver::ati'} == 1) { copyFile("$pluginFilesPath/ati-install.sh", "$installationPath"); - system("/bin/sh /opt/openslx/plugin-repo/$self->{'name'}/ati-install.sh"); - system("/bin/sh /opt/openslx/plugin-repo/$self->{'name'}/linkage.sh ati"); + system("/bin/bash /opt/openslx/plugin-repo/$self->{'name'}/ati-install.sh"); + system("/bin/bash /opt/openslx/plugin-repo/$self->{'name'}/linkage.sh ati"); } if ($attrs->{'xserver::nvidia'} == 1) { copyFile("$pluginFilesPath/nvidia-install.sh", "$installationPath"); - system("/bin/sh /opt/openslx/plugin-repo/$self->{'name'}/nvidia-install.sh"); - system("/bin/sh /opt/openslx/plugin-repo/$self->{'name'}/linkage.sh nvidia"); + system("/bin/bash /opt/openslx/plugin-repo/$self->{'name'}/nvidia-install.sh"); + system("/bin/bash /opt/openslx/plugin-repo/$self->{'name'}/linkage.sh nvidia"); } # Some plugins have to copy files from their plugin folder into the |