diff options
Diffstat (limited to 'os-plugins/plugins/xserver/OpenSLX/Distro/Base.pm')
| -rw-r--r-- | os-plugins/plugins/xserver/OpenSLX/Distro/Base.pm | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/os-plugins/plugins/xserver/OpenSLX/Distro/Base.pm b/os-plugins/plugins/xserver/OpenSLX/Distro/Base.pm index b0fc67e3..879af5ea 100644 --- a/os-plugins/plugins/xserver/OpenSLX/Distro/Base.pm +++ b/os-plugins/plugins/xserver/OpenSLX/Distro/Base.pm @@ -1,4 +1,4 @@ -# Copyright (c) 2008 - OpenSLX GmbH +# Copyright (c) 2008..2010 - OpenSLX GmbH # # This program is free software distributed under the GPL version 2. # See http://openslx.org/COPYING @@ -53,9 +53,27 @@ sub setupXserverScript my $pathInfo = $self->XserverPathInfo(); my $configFile = $pathInfo->{config}; - my $script = unshiftHereDoc(<<" End-of-Here"); + my $script = unshiftHereDoc(<<' End-of-Here'); # xserver.sh (base part) - # written by OpenSLX-plugin 'xserver', repoPath is $repoPath + # written by OpenSLX-plugin 'xserver' (via xserver/Distro/Base.pm module) + + echo -e "# ${xfc#/mnt*}\n# autogenerated X hardware configuration by \ + the xserver plugin in OpenSLX stage3\n# DO NOT EDIT THIS FILE BUT THE PLUGIN \ + INSTEAD" > ${xfc} + # using variables defined in XX_xserver.sh + echo -e "${x_modpath}\n${x_srvflags}\n${x_modules}" >> ${xfc} + echo -e "${x_keyboard}\n${x_mouse}\n${x_videocard}" >> ${xfc} + echo -e "${x_monitor}\n${x_screen}\n${x_srvlayout}\n${x_dri}" >> ${xfc} + # if no module was detected, stick to vesa module + if [ -n "$xmodule" ] ; then + sed "s/vesa/$xmodule/;s/\"us\"/\"${XKEYBOARD}\"/" -i ${xfc} + else + sed "s/\"us\"/\"${XKEYBOARD}\"/" -i ${xfc} + fi + if [ -n "${BUSID}" ]; then + sed -e "s,^#.*BusID .*, BusID \"${BUSID}\",g" -i ${xfc} + fi + # end of base xorg.conf generation End-of-Here |