diff options
Diffstat (limited to 'os-plugins/plugins/xserver/files/ubuntu-8.10-gfx-install.sh')
-rwxr-xr-x | os-plugins/plugins/xserver/files/ubuntu-8.10-gfx-install.sh | 32 |
1 files changed, 20 insertions, 12 deletions
diff --git a/os-plugins/plugins/xserver/files/ubuntu-8.10-gfx-install.sh b/os-plugins/plugins/xserver/files/ubuntu-8.10-gfx-install.sh index 409b2160..f834bbac 100755 --- a/os-plugins/plugins/xserver/files/ubuntu-8.10-gfx-install.sh +++ b/os-plugins/plugins/xserver/files/ubuntu-8.10-gfx-install.sh @@ -95,12 +95,16 @@ case ${TARGET} in if [ $? -eq 0 ]; then echo "ok" else - echo "fail" - echo "------ dkms.log -----" - cat /tmp/dkms.log - echo "---------------------" - rm /tmp/dkms.log - exit 1 + if $(cat /tmp/dkms.log | grep -q "has already"); then + echo -n "--- fglrx module already built ---" + else + echo "fail" + echo "------ dkms.log -----" + cat /tmp/dkms.log + echo "---------------------" + rm /tmp/dkms.log + exit 1 + fi fi FGLRX_MODULE_PATH=$(find ${FGLRX_DKMS_DIR}/${KVER}/ -name fglrx.ko \ @@ -191,12 +195,16 @@ case ${TARGET} in if [ $? -eq 0 ]; then echo "ok" else - echo "fail" - echo "------ dkms.log -----" - cat /tmp/dkms.log - echo "---------------------" - rm /tmp/dkms.log - exit 1 + if $(cat /tmp/dkms.log | grep -q "has already"); then + echo -n "--- nvidia module already built ---" + else + echo "fail" + echo "------ dkms.log -----" + cat /tmp/dkms.log + echo "---------------------" + rm /tmp/dkms.log + exit 1 + fi fi NVIDIA_MODULE_PATH=$(find ${NVIDIA_DKMS_DIR}/${KVER}/ -name \ |