andreacavalli
/
scylla-jmx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

install.sh: stop using symlinks for systemd units on nonroot mode 

On some environment, systemctl enable <service> fails when we use symlink.
So just directly copy systemd units to ~/.config/systemd/user, instead of
creating symlink.

See scylladb/scylla#7288
This commit is contained in:
Takuya ASADA 2020-09-28 17:21:59 +09:00 committed by Avi Kivity
parent 45e4f28766
commit 25bcd76017
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
install.sh
View File

@ -105,7 +105,7 @@ if ! $nonroot; then
else
retc="$rprefix/etc"
rsysconfdir="$rprefix/$sysconfdir"
rsystemd="$retc/systemd"
rsystemd="$HOME/.config/systemd/user"
fi
install -d -m755 "$rsysconfdir"
@ -124,8 +124,8 @@ EnvironmentFile=$sysconfdir/scylla-jmx
EOS
fi
else
install -d -m755 "$retc"/systemd/system/scylla-jmx.service.d
cat << EOS > "$retc"/systemd/system/scylla-jmx.service.d/nonroot.conf
install -d -m755 "$rsystemd"/scylla-jmx.service.d
cat << EOS > "$rsystemd"/scylla-jmx.service.d/nonroot.conf
[Service]
EnvironmentFile=
EnvironmentFile=$retc/sysconfig/scylla-jmx
@ -135,11 +135,6 @@ User=
Group=
WorkingDirectory=
EOS
if [ ! -d ~/.config/systemd/user/scylla-jmx.service.d ]; then
mkdir -p ~/.config/systemd/user/scylla-jmx.service.d
fi
ln -srf $rsystemd/scylla-jmx.service ~/.config/systemd/user/
ln -srf "$retc"/systemd/system/scylla-jmx.service.d/nonroot.conf ~/.config/systemd/user/scylla-jmx.service.d
fi
install -m644 scylla-jmx-1.0.jar "$rprefix/jmx"