diff --git a/README.SUSE b/README.SUSE index d2e9b55..551cbe6 100644 --- a/README.SUSE +++ b/README.SUSE @@ -24,7 +24,7 @@ are: 2. Enter |zypper install boinc-client boinc-manager| (be patient while the BOINC package downloads and installs). 3. Optional: after the installation is finished, enter - |/sbin/chkconfig boinc-client on| + |/usr/bin/systemctl enable boinc-client.service| to have Linux auto-start the boinc-client daemon at boot time. (See Stop or start BOINC daemon after boot page for helpful @@ -33,7 +33,7 @@ are: What the installer does - 1. Creates the daemon script at /etc/init.d/boinc-client. + 1. Creates a systemd configuration file for boinc-client.service. 2. Places the BOINC binaries (boinc-client, boinccmd, boinc-gui and boincmgr) in /usr/bin/. 3. Creates /var/lib/boinc/ for BOINC data files and the slots and @@ -50,7 +50,7 @@ are: step 3 in section Basic installation), logout and reboot Linux now and login under your normal user account. 2. If you elected to not have Linux start the daemon at boot time, - start the daemon manually with |/sbin/service boinc-client start| + start the daemon manually with |/usr/bin/systemctl start boinc-client.service | 3. Open a terminal and enter |ps aux | grep boinc| to print a partial list of running processes. You should see |boinc-client --dir ...| in that list, if not then something went wrong in the steps above. @@ -117,7 +117,7 @@ network connection comes up after the client has already started. This is a known BOINC bug, which is filed as #707. In the meantime, you can fix this by restarting boinc-client. On the -command line as root, do "/sbin/service boinc-client restart". +command line as root, do "/usr/bin/systemctl restart boinc-client.service". Alternatively, from the GNOME menu, you can choose System -> Administration -> Services and then stop and start the boinc-client service. diff --git a/boinc-client.changes b/boinc-client.changes index 72ed896..0651d9e 100644 --- a/boinc-client.changes +++ b/boinc-client.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Thu Jan 4 21:22:29 UTC 2024 - Aaron Puchert + +- Use systemd-sysusers to create service user and group. +- Add service user to "render" group to allow BOINC applications + to use GPU devices for accelerated computation. DRM render nodes + have been restricted in sr#1128161. +- Remove unused SysV init script. +- Update README.SUSE and the logrotate configuration file to use + systemctl instead of the no longer relevant init script. + ------------------------------------------------------------------- Sat Aug 12 09:08:43 UTC 2023 - Jan Engelhardt diff --git a/boinc-client.init b/boinc-client.init deleted file mode 100644 index db437e9..0000000 --- a/boinc-client.init +++ /dev/null @@ -1,216 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 2012 Scorpio IT, Deidesheim, Germany -# All rights reserved -# -# Author: Christian Wittmer -# -# /etc/init.d/boinc-client -# and its symbolic link -# /(usr/)sbin/rcboinc-client -# -### BEGIN INIT INFO -# Provides: boinc-client -# Required-Start: $syslog $network $remote_fs -# Should-Start: $time -# Required-Stop: $syslog $network $remote_fs -# Should-Stop: $time -# Default-Start: 3 5 -# Default-Stop: 0 1 2 6 -# Short-Description: BOINC daemon providing boinc-client -# Description: Start BOINC client -# For more information about BOINC (the Berkeley Open Infrastructure -# for Network Computing) see http://boinc.berkeley.edu -### END INIT INFO -# - -# Note on runlevels: -# 0 - halt/poweroff 6 - reboot -# 1 - single user 2 - multiuser without network exported -# 3 - multiuser w/ network (text mode) 5 - multiuser w/ network and X11 (xdm) -# -# Note on script names: -# http://www.linuxbase.org/spec/refspecs/LSB_1.3.0/gLSB/gLSB/scrptnames.html -# A registry has been set up to manage the init script namespace. -# http://www.lanana.org/ -# Please use the names already registered or register one or use a -# vendor prefix. - - -# Check for missing binaries (stale symlinks should not happen) -# Note: Special treatment of stop for LSB conformance -BOINC_BIN=/usr/bin/boinc-client -test -x $BOINC_BIN || { echo "$BOINC_BIN not installed"; - if [ "$1" = "stop" ]; then exit 0; - else exit 5; fi; } - -# Check for existence of needed config file and read it -BOINC_CONFIG=/etc/sysconfig/boinc-client -test -r $BOINC_CONFIG || { echo "$BOINC_CONFIG not existing"; - if [ "$1" = "stop" ]; then exit 0; - else exit 6; fi; } - -# Read config -. $BOINC_CONFIG - -# some other VARS -BOINC_SVC="BOINC Client" - -BOINCCMD_BIN="/usr/bin/boinccmd" -BOINC_LOG="/var/log/boinc-client.log" -BOINC_ERRLOG="/var/log/boinc-client.err.log" -BOINC_PIDFILE="/var/run/boinc-client.pid" -BOINC_LOCKFILE="/var/run/boinc-client.lock" - -BOINC_USR=${BOINC_BOINC_USR:="boinc"} -BOINC_GRP=${BOINC_BOINC_GRP:="boinc"} -BOINC_DIR=${BOINC_BOINC_DIR:="/var/lib/boinc"} -BOINC_OPTS=${BOINC_BOINC_OPTS:=""} - -# Source LSB init functions -# providing start_daemon, killproc, pidofproc, -# log_success_msg, log_failure_msg and log_warning_msg. -# This is currently not used by UnitedLinux based distributions and -# not needed for init scripts for UnitedLinux only. If it is used, -# the functions from rc.status should not be sourced or used. -#. /lib/lsb/init-functions - -# Shell functions sourced from /etc/rc.status: -# rc_check check and set local and overall rc status -# rc_status check and set local and overall rc status -# rc_status -v be verbose in local rc status and clear it afterwards -# rc_status -v -r ditto and clear both the local and overall rc status -# rc_status -s display "skipped" and exit with status 3 -# rc_status -u display "unused" and exit with status 3 -# rc_failed set local and overall rc status to failed -# rc_failed set local and overall rc status to -# rc_reset clear both the local and overall rc status -# rc_exit exit appropriate to overall rc status -# rc_active checks whether a service is activated by symlinks -. /etc/rc.status - -# Reset status of this service -rc_reset - -# Return values acc. to LSB for all commands but status: -# 0 - success -# 1 - generic or unspecified error -# 2 - invalid or excess argument(s) -# 3 - unimplemented feature (e.g. "reload") -# 4 - user had insufficient privileges -# 5 - program is not installed -# 6 - program is not configured -# 7 - program is not running -# 8--199 - reserved (8--99 LSB, 100--149 distrib, 150--199 appl) -# -# Note that starting an already running service, stopping -# or restarting a not-running service as well as the restart -# with force-reload (in case signaling is not supported) are -# considered a success. - -case "$1" in - start) - echo -n "Starting ${BOINC_SVC} " - ## Start daemon with startproc(8). If this fails - ## the return value is set appropriately by startproc. - /sbin/startproc -u $BOINC_USR -g $BOINC_GRP -l $BOINC_LOG -s $BOINC_BIN --dir $BOINC_DIR $BOINC_OPTS - - # Remember status and be verbose - rc_status -v - ;; - stop) - echo -n "Shutting down ${BOINC_SVC} " - ## Stop daemon with killproc(8) and if this fails - ## killproc sets the return value according to LSB. - - /sbin/killproc $BOINC_BIN - - # Remember status and be verbose - rc_status -v - ;; - try-restart|condrestart) - ## Do a restart only if the service was active before. - ## Note: try-restart is now part of LSB (as of 1.9). - ## RH has a similar command named condrestart. - if test "$1" = "condrestart"; then - echo "${attn} Use try-restart ${done}(LSB)${attn} rather than condrestart ${warn}(RH)${norm}" - fi - $0 status - if test $? = 0; then - $0 restart - else - rc_reset # Not running is not a failure. - fi - # Remember status and be quiet - rc_status - ;; - restart) - ## Stop the service and regardless of whether it was - ## running or not, start it again. - $0 stop - $0 start - - # Remember status and be quiet - rc_status - ;; - force-reload) - ## Signal the daemon to reload its config. Most daemons - ## do this on signal 1 (SIGHUP). - ## If it does not support it, restart the service if it - ## is running. - - echo -n "Reload service ${BOINC_SVC} " - ## if it supports it: - #/sbin/killproc -HUP $BOINC_BIN - #touch /var/run/$BOINC_PIDFILE - - # Remember status and be verbose - #rc_status -v - - ## Otherwise: - $0 try-restart - # Remember status and be quiet - rc_status - ;; - reload) - ## Like force-reload, but if daemon does not support - ## signaling, do nothing (!) - - # If it supports signaling: - echo -n "Reload service ${BOINC_SVC} " - #/sbin/killproc -HUP $BOINC_BIN - #touch /var/run/FOO.pid - # Remember status and be verbose - #rc_status -v - - - ## Otherwise if it does not support reload: - rc_failed 3 - # Remember status and be verbose - rc_status -v - ;; - status) - echo -n "Checking for service ${BOINC_SVC} " - ## Check status with checkproc(8), if process is running - ## checkproc will return with exit status 0. - - # Return value is slightly different for the status command: - # 0 - service up and running - # 1 - service dead, but /var/run/ pid file exists - # 2 - service dead, but /var/lock/ lock file exists - # 3 - service not running (unused) - # 4 - service status unknown :-( - # 5--199 reserved (5--99 LSB, 100--149 distro, 150--199 appl.) - - # NOTE: checkproc returns LSB compliant status values. - /sbin/checkproc $BOINC_BIN - # NOTE: rc_status knows that we called this init script with - # "status" option and adapts its messages accordingly. - rc_status -v - ;; - *) - echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload}" - exit 1 - ;; -esac -rc_exit diff --git a/boinc-client.spec b/boinc-client.spec index afea2cf..a6b8d4e 100644 --- a/boinc-client.spec +++ b/boinc-client.spec @@ -1,7 +1,7 @@ # # spec file for package boinc-client # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # Copyright (c) 2016 by Aaron Puchert # Copyright (c) 2011 by Sascha Manns # @@ -45,11 +45,11 @@ URL: https://boinc.berkeley.edu/ #Git-Clone: https://github.com/BOINC/boinc Source0: https://github.com/BOINC/boinc/archive/client_release/%{minor_version}/%{version}.tar.gz +Source2: boinc-sysusers Source3: README.SUSE Source4: sysconfig.%{name} Source5: boinc-logrotate Source6: boinc-manager -Source10: %{name}.init Source20: %{name}.service Source100: %{name}-rpmlintrc Patch2: boinc-docbook2x.patch @@ -246,6 +246,9 @@ sed -i \ # Remove {buildroot}/etc/sysconfig/boinc-client, it is added by %%fillup_and_insserv rm -f %{buildroot}%{_sysconfdir}/sysconfig/%{name} +# Install sysusers config +install -Dm0644 %{SOURCE2} %{buildroot}%{_sysusersdir}/%{name}.conf + # Install init and create symlink for rcboinc install -dm0755 %{buildroot}%{_sbindir} install -D -m0644 %{SOURCE20} %{buildroot}%{_unitdir}/%{name}.service @@ -283,11 +286,6 @@ find %{buildroot}/%{_datadir}/locale/ -name "BOINC-Manager.mo" -delete %fdupes -s %{buildroot} %pre -getent group boinc >/dev/null || %{_sbindir}/groupadd -r boinc -# add user -getent passwd boinc >/dev/null || \ -%{_sbindir}/useradd -c "BOINC Client" -d "%{_localstatedir}/lib/boinc" \ - -g boinc -r -s /sbin/nologin boinc # fix replacing old sysconfig file (r21) if [ -f %{_sysconfdir}/sysconfig/%{name} ]; then if ! grep -q "BOINC_BOINC_USR" %{_sysconfdir}/sysconfig/boinc-client; then @@ -302,7 +300,6 @@ fi %post %{fillup_only} %service_add_post %{name}.service -%{_sbindir}/usermod -c "BOINC Client" -s /sbin/nologin boinc 2>/dev/null || : %postun %service_del_postun %{name}.service @@ -335,6 +332,7 @@ fi %{_unitdir}/%{name}.service %{_sbindir}/rc%{name} %{_fillupdir}/sysconfig.%{name} +%{_sysusersdir}/%{name}.conf %attr(-,boinc,boinc) %{boinc_dir}/ %files -n %{name}-lang -f BOINC-Client.lang diff --git a/boinc-logrotate b/boinc-logrotate index ca8986c..d1ac1b2 100644 --- a/boinc-logrotate +++ b/boinc-logrotate @@ -8,7 +8,7 @@ missingok create 644 root root postrotate - /etc/init.d/boinc-client restart > /dev/null + /usr/bin/systemctl restart boinc-client.service endscript } @@ -22,6 +22,6 @@ # missingok # create 644 root root # postrotate -# /etc/init.d/boinc-client restart > /dev/null +# /usr/bin/systemctl restart boinc-client.service # endscript #} diff --git a/boinc-sysusers b/boinc-sysusers new file mode 100644 index 0000000..c4bfcc6 --- /dev/null +++ b/boinc-sysusers @@ -0,0 +1,4 @@ +g boinc - +u boinc -:boinc "BOINC Client" /var/lib/boinc +# Several BOINC applications want to use the GPU for computations. +m boinc render