summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@lukeshu.com>2018-01-29 15:10:01 -0500
committerLuke Shumaker <lukeshu@lukeshu.com>2018-01-29 15:10:01 -0500
commit4d3aa1d354c4e2f2c1a0751054f78d9dbcd35c8b (patch)
tree8c1b1fe5b0b27fb82bd369ad2c7f6177b3a657c4
parentecc95534d52ac51a52b7938abd1192e47581061f (diff)
Only use the holo-files plugin
-rwxr-xr-xdrain8
1 files changed, 4 insertions, 4 deletions
diff --git a/drain b/drain
index d4a6ac9..e35ccd7 100755
--- a/drain
+++ b/drain
@@ -10,7 +10,7 @@ declare -r workdir=/var/lib/pristine-etc
watchdirs=(
/etc
- /usr/share/holo
+ /usr/share/holo/files
/usr/lib/sysusers.d
)
readonly watchdirs
@@ -77,9 +77,9 @@ commit() (
if type systemd-sysusers &>/dev/null; then
systemd-sysusers --root=.
fi
- if type holo &>/dev/null; then
- mkdir -p -- run usr/lib
- ln -sT /usr/lib/holo usr/lib/holo
+ if type holo &>/dev/null && test -d /usr/lib/holo/files; then
+ mkdir -p -- run usr/lib/holo
+ ln -sT /usr/lib/holo/files usr/lib/holo/files
if [ -f /etc/os-release ]; then
ln -sT /etc/os-release usr/lib/os-release
else