Switch back to system services from user services
This commit is contained in:
11
installJRMC
11
installJRMC
@@ -690,26 +690,28 @@ EOF"
|
||||
systemctl daemon-reload
|
||||
systemctl enable --now "$1"
|
||||
else
|
||||
systemctl --user daemon-reload
|
||||
systemctl --user enable --now "$1"
|
||||
sudo systemctl daemon-reload
|
||||
sudo systemctl enable --now "$1"
|
||||
fi
|
||||
}
|
||||
|
||||
|
||||
_generateServiceVars () {
|
||||
|
||||
unset _service_fname _service_name _timer_fname _timer_name _systemd_user
|
||||
unset _service_fname _service_name _timer_fname _timer_name _user_specifier
|
||||
|
||||
if [[ "$_user" == "root" ]]; then
|
||||
_service_fname="/usr/lib/systemd/system/$1.service"
|
||||
_timer_fname="/usr/lib/systemd/system/$1.timer"
|
||||
_service_name="$1.service"
|
||||
_timer_name="$1.timer"
|
||||
_user_specifier=""
|
||||
else
|
||||
_service_fname="/usr/lib/systemd/system/$1@.service"
|
||||
_timer_fname="/usr/lib/systemd/system/$1@.timer"
|
||||
_service_name="$1@$_user.service"
|
||||
_timer_name="$1@$_user.timer"
|
||||
_user_specifier="User=%I"
|
||||
fi
|
||||
}
|
||||
|
||||
@@ -724,6 +726,7 @@ Description=JRiver Media Center $_mversion Media Server
|
||||
After=graphical.target
|
||||
|
||||
[Service]
|
||||
$_user_specifier
|
||||
Type=simple
|
||||
Environment=DISPLAY=$_display
|
||||
ExecStart=/usr/bin/mediacenter$_mversion /MediaServer
|
||||
@@ -758,6 +761,7 @@ Description=x11vnc
|
||||
After=display-manager.service
|
||||
|
||||
[Service]
|
||||
$_user_specifier
|
||||
Type=forking
|
||||
Environment=DISPLAY=$_display
|
||||
ExecStart=$_exec_start_cmd
|
||||
@@ -780,6 +784,7 @@ EOF"
|
||||
Description=Builds JRiver Media Center RPM file, moves it to the repo dir, and runs createrepo
|
||||
|
||||
[Service]
|
||||
$_user_specifier
|
||||
ExecStart=$_basedir/installJRMC --buildpath=$_outputdir --createrepo --createrepo-webroot $_createrepo_webroot --createrepo-user $_createrepo_user
|
||||
|
||||
[Install]
|
||||
|
||||
Reference in New Issue
Block a user