diff options
| author | Dirk von Suchodoletz | 2009-01-11 13:09:00 +0100 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2009-01-11 13:09:00 +0100 |
| commit | 7c35b56f1acd67d7cdf33bc120dec9950f923146 (patch) | |
| tree | 6c9ad6d8bc1f01a0ce2b598af14d369fe40a330e /os-plugins/plugins/xserver/XX_xserver.sh | |
| parent | Test checkin for "ah", "fixing" #288 ... (diff) | |
| download | core-7c35b56f1acd67d7cdf33bc120dec9950f923146.tar.gz core-7c35b56f1acd67d7cdf33bc120dec9950f923146.tar.xz core-7c35b56f1acd67d7cdf33bc120dec9950f923146.zip | |
Fixes to x11vnc plugin, updated AUTHORS list.
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2461 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 | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/os-plugins/plugins/xserver/XX_xserver.sh b/os-plugins/plugins/xserver/XX_xserver.sh index 80b4cee6..ec4411bc 100644 --- a/os-plugins/plugins/xserver/XX_xserver.sh +++ b/os-plugins/plugins/xserver/XX_xserver.sh @@ -103,9 +103,9 @@ ${PLUGIN_ROOTFS}/usr/X11R6/lib/modules/\," ###################################################################### - echo -e "# $xfc\n# autogenerated X hardware configuration by the xserver \ -plugin in OpenSLX stage3\n# DO NOT EDIT THIS FILE BUT THE PLUGIN INSTEAD" \ - > $xfc + 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 echo ' Section "Files" ModulePath "/usr/lib/xorg/modules/" @@ -303,4 +303,7 @@ a\ \ InputDevice\ \ "Synaptics TP"\ \ \ \ \ \ "SendCoreEvents" [ -e /mnt/opt/openslx/plugin-repo/xserver/xserver.sh ] && \ . /mnt/opt/openslx/plugin-repo/xserver/xserver.sh fi +elif [ ! -e /initramfs/plugin-conf/xserver.conf ]; then + [ $DEBUGLEVEL -gt 2 ] && \ + echo "No configuration file found for xserver plugin." fi |