diff options
| author | Dirk von Suchodoletz | 2010-08-06 22:54:16 +0200 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2010-08-06 22:54:16 +0200 |
| commit | b6eaab43911e5c1cb03ea98b188c75bcbfb28563 (patch) | |
| tree | fbc564ed276dae14b4ebf7b02f136f51fddb03dd /os-plugins/plugins/xserver/OpenSLX/Distro | |
| parent | Fixed typo in variable ... (diff) | |
| download | core-b6eaab43911e5c1cb03ea98b188c75bcbfb28563.tar.gz core-b6eaab43911e5c1cb03ea98b188c75bcbfb28563.tar.xz core-b6eaab43911e5c1cb03ea98b188c75bcbfb28563.zip | |
Some minor cleanups for the re-written Xserver plugin ... still to be
tested.
Diffstat (limited to 'os-plugins/plugins/xserver/OpenSLX/Distro')
| -rw-r--r-- | os-plugins/plugins/xserver/OpenSLX/Distro/Base.pm | 10 | ||||
| -rw-r--r-- | os-plugins/plugins/xserver/OpenSLX/Distro/Suse.pm | 1 | ||||
| -rw-r--r-- | os-plugins/plugins/xserver/OpenSLX/Distro/Ubuntu.pm | 12 |
3 files changed, 13 insertions, 10 deletions
diff --git a/os-plugins/plugins/xserver/OpenSLX/Distro/Base.pm b/os-plugins/plugins/xserver/OpenSLX/Distro/Base.pm index 879af5ea..51c1c60b 100644 --- a/os-plugins/plugins/xserver/OpenSLX/Distro/Base.pm +++ b/os-plugins/plugins/xserver/OpenSLX/Distro/Base.pm @@ -57,13 +57,15 @@ sub setupXserverScript # xserver.sh (base part) # written by OpenSLX-plugin 'xserver' (via xserver/Distro/Base.pm module) + # generating the base configuration file (might be split into several + # files for newer Xorg servers) 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} + 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} + 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} diff --git a/os-plugins/plugins/xserver/OpenSLX/Distro/Suse.pm b/os-plugins/plugins/xserver/OpenSLX/Distro/Suse.pm index 6ceb0e91..90fe5086 100644 --- a/os-plugins/plugins/xserver/OpenSLX/Distro/Suse.pm +++ b/os-plugins/plugins/xserver/OpenSLX/Distro/Suse.pm @@ -43,6 +43,7 @@ sub setupXserverScript # SuSE specific extension to stage3 xserver.sh # Xorg hardware is autodetected, so no module information provided sed -e "/Section \"Device\"/,/EndSection/d" -i ${xfc} + testmkd /mnt/etc/X11/xorg.conf.d testmkd /mnt/var/lib/xkb/compiled testmkd /mnt/var/lib/X11 testmkd /mnt/var/lib/xdm/authdir/authfiles 0700 diff --git a/os-plugins/plugins/xserver/OpenSLX/Distro/Ubuntu.pm b/os-plugins/plugins/xserver/OpenSLX/Distro/Ubuntu.pm index e4cf1905..f81d8e10 100644 --- a/os-plugins/plugins/xserver/OpenSLX/Distro/Ubuntu.pm +++ b/os-plugins/plugins/xserver/OpenSLX/Distro/Ubuntu.pm @@ -53,13 +53,13 @@ sub setupXserverScript # 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} + 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} - + 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}\n" >>${xfc} + echo "${x_srvlayout}" | sed "/ Screen /d" >>${xfc} + testmkd /mnt/etc/X11/xorg.conf.d testmkd /mnt/var/run/xauth testmkd /mnt/var/lib/xkb ln -sf /usr/bin/Xorg /mnt/etc/X11/X |