projects
/
grml-x.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bump Standard-Version to 3.7.3 (no further changes)
[grml-x.git]
/
grml-x
diff --git
a/grml-x
b/grml-x
index
3040a7f
..
62d2c5a
100755
(executable)
--- a/
grml-x
+++ b/
grml-x
@@
-294,7
+294,7
@@
mouse()
if grep -q 'Device:.*Synaptics' "$MOUSEINFO" ; then
if [[ "$SYNAPTICS" == "yes" ]] ; then # check for '-nosynaptics'-option
MOUSEDRIVER='synaptics'
if grep -q 'Device:.*Synaptics' "$MOUSEINFO" ; then
if [[ "$SYNAPTICS" == "yes" ]] ; then # check for '-nosynaptics'-option
MOUSEDRIVER='synaptics'
- SYNMOUSE='InputDevice "Synaptics" "AlwaysCore"'
+ SYNMOUSE='InputDevice "Synaptics"
#
"AlwaysCore"'
SYNMOUSEDETAIL="
Section \"InputDevice\"
Driver \"synaptics\"
SYNMOUSEDETAIL="
Section \"InputDevice\"
Driver \"synaptics\"
@@
-329,7
+329,7
@@
EndSection
if grep -q 'Device:.*ALPS' "$MOUSEINFO" ; then
if [[ "$SYNAPTICS" == "yes" ]] ; then # check for '-nosynaptics'-option
MOUSEDRIVER='synaptics'
if grep -q 'Device:.*ALPS' "$MOUSEINFO" ; then
if [[ "$SYNAPTICS" == "yes" ]] ; then # check for '-nosynaptics'-option
MOUSEDRIVER='synaptics'
- SYNMOUSE='
# InputDevice "Synaptics"
"AlwaysCore"'
+ SYNMOUSE='
InputDevice "Synaptics" #
"AlwaysCore"'
SYNMOUSEDETAIL="
Section \"InputDevice\"
Driver \"synaptics\"
SYNMOUSEDETAIL="
Section \"InputDevice\"
Driver \"synaptics\"
@@
-893,6
+893,11
@@
$fg[red]"
function runit
{
writeconfig
function runit
{
writeconfig
+ if [ "$(readlink /etc/X11/X)" = /bin/true ] ; then
+ print "$bold_color$fg[red]Fatal: /etc/X11/X is a symlink to /bin/true."
+ print "Fix it via running 'ln -sf /usr/bin/Xorg /etc/X11/X'"
+ exit 10
+ fi
if [ -z "$NOSTART" ] ; then
print "$reset_color"
if [ -x /etc/init.d/xorg-common ] ; then
if [ -z "$NOSTART" ] ; then
print "$reset_color"
if [ -x /etc/init.d/xorg-common ] ; then