summaryrefslogtreecommitdiff
path: root/startx.cpp
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@bluenote.herrb.com>2007-09-28 22:26:26 +0200
committerMatthieu Herrb <matthieu@bluenote.herrb.com>2007-09-28 22:26:26 +0200
commite2963ff8acb7e20aab1f8e31a656f4553dda208a (patch)
tree16444880c7328d1d3ec60450d3d71dda807f93a5 /startx.cpp
parenta7fda62fcb5600dc65f84148923f5a0a70181e7e (diff)
parent051633650c7b7a7eb9ef494a48a6a79fa2e06080 (diff)
Merge branch 'master' of ssh://herrb@git.freedesktop.org/git/xorg/app/xinit
Diffstat (limited to 'startx.cpp')
-rw-r--r--startx.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/startx.cpp b/startx.cpp
index a9b4199..81e776f 100644
--- a/startx.cpp
+++ b/startx.cpp
@@ -198,7 +198,7 @@ dummy=0
XCOMM create a file with auth information for the server. ':0' is a dummy.
xserverauthfile=$HOME/.serverauth.$$
-trap "rm -f $xserverauthfile" ERR HUP INT QUIT ILL TRAP KILL BUS TERM
+trap "rm -f $xserverauthfile" HUP INT QUIT ILL TRAP KILL BUS TERM
xauth -q -f $xserverauthfile << EOF
add :$dummy . $mcookie
EOF