Skip to content

Commit

Permalink
Use exec when starting process via the shell. (#1518)
Browse files Browse the repository at this point in the history
* Use exec when starting process via the shell.

This fixes the signal handling issue with systemctl reported in #1515,
but still allows shell substitution of environment variables.

* Use jamulus.io instead of fischvolk.de

Uses anygenre3.jamulus.io as an example, because that server is less used.
  • Loading branch information
softins authored Apr 19, 2021
1 parent 3df60d6 commit 6d662e3
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion distributions/debian/jamulus-headless.service
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ IOSchedulingPriority=0

#### Change this to publish this server, set genre, location and other parameters.
#### See https://jamulus.io/wiki/Command-Line-Options ####
ExecStart=/bin/sh -c '/usr/bin/jamulus-headless -s -n'
ExecStart=/bin/sh -c 'exec /usr/bin/jamulus-headless -s -n'


Restart=on-failure
Expand Down
2 changes: 1 addition & 1 deletion distributions/jamulus-server.service
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Type=simple
Restart=always
RestartSec=1
User=jamulus
ExecStart=/bin/sh -c '/usr/bin/jamulus -s -n -l /var/log/jamulus -e jamulus.fischvolk.de -g -o "$(uname -n);;"'
ExecStart=/bin/sh -c 'exec /usr/bin/jamulus -s -n -l /var/log/jamulus -e anygenre3.jamulus.io -g -o "$(uname -n);;"'

[Install]
WantedBy=multi-user.target
2 changes: 1 addition & 1 deletion distributions/raspijamulus.sh
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ fi
# start Jack2 and Jamulus in headless mode
export LD_LIBRARY_PATH="distributions/${OPUS}/.libs:distributions/jack2/build:distributions/jack2/build/common"
distributions/jack2/build/jackd -R -T --silent -P70 -p16 -t2000 -d alsa -dhw:${ADEVICE} -p 128 -n 3 -r 48000 -s &
./Jamulus -n -i ${JAMULUSINIFILE} -c jamulus.fischvolk.de &
./Jamulus -n -i ${JAMULUSINIFILE} -c anygenre3.jamulus.io &

echo "###---------- PRESS ANY KEY TO TERMINATE THE JAMULUS SESSION ---------###"
read -n 1 -s -r -p ""
Expand Down

0 comments on commit 6d662e3

Please sign in to comment.