diff options
Diffstat (limited to 'os-plugins/plugins/xserver/OpenSLX/Distro/Ubuntu.pm')
| -rw-r--r-- | os-plugins/plugins/xserver/OpenSLX/Distro/Ubuntu.pm | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/os-plugins/plugins/xserver/OpenSLX/Distro/Ubuntu.pm b/os-plugins/plugins/xserver/OpenSLX/Distro/Ubuntu.pm index 728e6a03..e4cf1905 100644 --- a/os-plugins/plugins/xserver/OpenSLX/Distro/Ubuntu.pm +++ b/os-plugins/plugins/xserver/OpenSLX/Distro/Ubuntu.pm @@ -48,16 +48,21 @@ sub setupXserverScript my $script = $self->SUPER::setupXserverScript($repoPath); - $script .= unshiftHereDoc(<<' End-of-Here'); + # overwriting script part from Base.pm + $script = unshiftHereDoc(<<' End-of-Here'); # Ubuntu specific extension to stage3 xserver.sh + 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 "${x_keyboard}" | sed "s/kbd/evdev/" >> ${xfc} + echo -e "${x_mouse}\n${x_monitor}\n${x_screen}" >> ${xfc} + echo "\n${x_srvlayout}" | sed "/ Screen /d" >> ${xfc} + testmkd /mnt/var/run/xauth testmkd /mnt/var/lib/xkb ln -sf /usr/bin/Xorg /mnt/etc/X11/X - # newer Xorgs do not need predefined configuration file, not needed if - # XserverPathInfo gets implemented ... - sed -e "1i# xorg.conf not needed in most cases for Xorg 1.7+" \ - /mnt/etc/X11/xorg.conf >/etc/X11/xorg.openslx 2>/dev/null - rm /mnt/etc/X11/xorg.conf 2>/dev/null End-of-Here return $script; |