diff options
| author | Dirk von Suchodoletz | 2008-09-05 23:28:59 +0200 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2008-09-05 23:28:59 +0200 |
| commit | 39c12716ef95938255fbe65630192f72351fed86 (patch) | |
| tree | 8ef7dc73ed1ed41c7dce3308bc6e79e18629ceed /os-plugins/plugins/xserver/XX_xserver.sh | |
| parent | * linkage.sh is working (almost) - with libGL.so.1 not linked properly (diff) | |
| download | core-39c12716ef95938255fbe65630192f72351fed86.tar.gz core-39c12716ef95938255fbe65630192f72351fed86.tar.xz core-39c12716ef95938255fbe65630192f72351fed86.zip | |
Check for admin provided xorg.conf file (see #275).
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2211 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'os-plugins/plugins/xserver/XX_xserver.sh')
| -rw-r--r-- | os-plugins/plugins/xserver/XX_xserver.sh | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/os-plugins/plugins/xserver/XX_xserver.sh b/os-plugins/plugins/xserver/XX_xserver.sh index 2638e7d5..4a8d0410 100644 --- a/os-plugins/plugins/xserver/XX_xserver.sh +++ b/os-plugins/plugins/xserver/XX_xserver.sh @@ -26,7 +26,10 @@ fi xfc="/mnt/etc/X11/xorg.conf" -if [ -e /initramfs/plugin-conf/xserver.conf ]; then +# check for the existance of plugin configuration and non-existance of an +# admin provided config file in ConfTGZ +if [ -e /initramfs/plugin-conf/xserver.conf -a \ + ! -f /rootfs/etc/X11/xorg.conf ]; then . /initramfs/plugin-conf/xserver.conf # keyboard setup localization "${country}" @@ -39,10 +42,9 @@ if [ -e /initramfs/plugin-conf/xserver.conf ]; then # proprietary ATI/NVidia modules listed a different way with hwinfo [ -z "$xmodule" ] || error "${hcfg_hwsetup}" nonfatal - -###################################################################### -# begin proprietary drivers section -###################################################################### + ###################################################################### + # begin proprietary drivers section + ###################################################################### set -x if [ $(grep -i -m 1 'Driver Activation Cmd: "modprobe fglrx"' \ @@ -86,9 +88,9 @@ ${PLUGIN_ROOTFS}/usr/X11R6/lib/modules/\," ${LINK_PATH}libGL.so.1.2 fi set +x -###################################################################### -# end proprietary drivers section -###################################################################### + ###################################################################### + # end proprietary drivers section + ###################################################################### echo -e "# $xfc\n# autogenerated X hardware configuration by the xserver \ |