diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-03-15 13:07:19 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-03-15 13:07:19 -0400 |
| commit | d6c039c7b0995041b939e8e9d604f07a400165d2 (patch) | |
| tree | e29e5db6f9021093da0a413a391b78b93f7b4c7b | |
| parent | 086e49a6a18812011311dbda7b9086dc551ce1cf (diff) | |
| parent | 5189b8de23f07038fa97d165e140b004796078a9 (diff) | |
Merge branch 'master' into build64-par/master
| -rw-r--r-- | .config/systemd/user/xresources-dpi@.service | 3 | ||||
| -rw-r--r-- | .config/systemd/user/xresources@.service | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/.config/systemd/user/xresources-dpi@.service b/.config/systemd/user/xresources-dpi@.service index 0aa2c75..51bb1d5 100644 --- a/.config/systemd/user/xresources-dpi@.service +++ b/.config/systemd/user/xresources-dpi@.service @@ -3,13 +3,12 @@ Description=Set the X Resources DataBase DPI to match the display DPI on X displ Documentation=man:xrdb(1) Before=X11@%i.target Requisite=X11@%i.target -Conflicts=xresources@:i.service # don't run concurrently with another run of xrdb [Service] Environment=DISPLAY=%I Type=oneshot -ExecStart=/usr/bin/env xrdb-set-dpi +ExecStart=/usr/bin/env flock ${XDG_RUNTIME_DIR}/x11-xrdb@%I -c xrdb-set-dpi [Install] WantedBy=X11@%i.target diff --git a/.config/systemd/user/xresources@.service b/.config/systemd/user/xresources@.service index 760fd0f..3d723c6 100644 --- a/.config/systemd/user/xresources@.service +++ b/.config/systemd/user/xresources@.service @@ -8,7 +8,7 @@ Requisite=X11@%i.target Environment=DISPLAY=%I Type=oneshot -ExecStart=/usr/bin/env xrdb -merge ${XDG_CONFIG_HOME}/X11/resources +ExecStart=/usr/bin/env flock ${XDG_RUNTIME_DIR}/x11-xrdb@%I -c 'xrdb -merge ${XDG_CONFIG_HOME}/X11/resources' [Install] WantedBy=X11@%i.target |