summaryrefslogtreecommitdiff
path: root/.xinitrc
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2012-07-17 10:38:01 -0400
committerLuke Shumaker <LukeShu@sbcglobal.net>2012-07-17 10:38:01 -0400
commit8bd2649b6d7c07803c43820f656e781252fd3973 (patch)
tree0327685f42c64dd4d5bfa526f5b6655e7d4ca140 /.xinitrc
parentb6e326d3ca6038db9df8909285cada16652aa9c5 (diff)
parent6e82f1552b06514b4bd838c52683541dcd4b414a (diff)
Merge branch 'master' into work-fc17
Conflicts: .crontab
Diffstat (limited to '.xinitrc')
-rw-r--r--.xinitrc7
1 files changed, 5 insertions, 2 deletions
diff --git a/.xinitrc b/.xinitrc
index 2cf4ea2..203a5cb 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -5,10 +5,13 @@
# Executed by startx (run your window manager from here)
if [ -d /etc/X11/xinit/xinitrc.d ]; then
+ echo ' ==> Running scripts in Entering xinitrc.d/*'
for f in /etc/X11/xinit/xinitrc.d/*; do
- [ -x "$f" ] && . "$f"
+ echo " -> $f"
+ [ -x "$f" ] && "$f" &
done
unset f
+ echo ' -> done'
fi
usermodmap="$HOME/.xmodmap"
@@ -20,4 +23,4 @@ fi
# exec startkde
# exec startxfce4
# ...or the Window Manager of your choice
-exec wmii
+exec ck-launch-session wmii