From 3788334d9bd085b7048635fe7e7a1b397c2f2ef1 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Tue, 1 Mar 2016 10:13:54 -0500 Subject: use flock to avoid xrdb's writing over eachother --- .config/systemd/user/xresources-dpi@.service | 3 +-- .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 -- cgit v1.2.3