diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-07-16 23:55:23 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-07-16 23:55:23 -0400 |
| commit | 4dcf99a241f8591b21ce3e8b2dd385cbeb99bbf6 (patch) | |
| tree | b275d7a21d46c421d9487dcd1d5043ba8a9bfe5d /.xinitrc | |
| parent | 3b8d4575218ab6d8e1155a81c45d81a8631aff25 (diff) | |
| parent | 3c7c6090cd2e385651f6ef79391c42a65ac06344 (diff) | |
Merge branch 'hp-dv6426us-par'
Conflicts:
.crontab.local
.git.info.exclude
.wmii/wmiirc_local
Diffstat (limited to '.xinitrc')
| -rw-r--r-- | .xinitrc | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -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 |