pool/slurm
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Create a separate logdir for slurm as well.

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/network:cluster/slurm?expand=0&rev=42
This commit is contained in:
Egbert Eich 2018-03-07 16:57:41 +00:00 committed by Git OBS Bridge
parent a59a0c2ced
commit 903545a8b9
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
slurm.changes
View File

@ -4,6 +4,7 @@ Wed Mar 7 14:20:06 UTC 2018 - eich@suse.com
- Fix user/group settings (boo#1084333) - Fix user/group settings (boo#1084333)
* Fix user/group for /var/run/slurm the PID file directory. * Fix user/group for /var/run/slurm the PID file directory.
* Fix user/group in systemd service files for process ownership. * Fix user/group in systemd service files for process ownership.
* Create a separate logdir for slurm as well.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jan 29 13:43:57 UTC 2018 - cgoll@suse.com Mon Jan 29 13:43:57 UTC 2018 - cgoll@suse.com

9
slurm.spec
View File

@ -187,7 +187,7 @@ Obsoletes: slurm-auth-munge < %{version}
Provides: slurm-auth-munge = %{version} Provides: slurm-auth-munge = %{version}
%description munge %description munge
This package contains the SLURM authentication module for Chris Dunlap's Munge. This package contains the SLURM authentication module for Chris Dunlap''s Munge.
%package sview %package sview
Summary: SLURM graphical interface Summary: SLURM graphical interface
@ -345,6 +345,10 @@ do
sed -i -e "s/User=.*/User=%slurm_u/" %{buildroot}%{_unitdir}/$i || \ sed -i -e "s/User=.*/User=%slurm_u/" %{buildroot}%{_unitdir}/$i || \
sed -i -e "/\[Service\]/aUser=%slurm_u" %{buildroot}%{_unitdir}/$i sed -i -e "/\[Service\]/aUser=%slurm_u" %{buildroot}%{_unitdir}/$i
done done
%if "%slurm_u" != "root"
%define slurmlogdir %{_localstatedir}/log/%{name}
install -d -m 755 %{buildroot}%{slurmlogdir}
%endif
ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rcslurmd ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rcslurmd
ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rcslurmdbd ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rcslurmdbd
@ -392,6 +396,8 @@ sed -i 's#\(StateSaveLocation=\).*#\1%_localstatedir/lib/slurm#' %{buildroot}/%
sed -i 's#^\(SlurmdPidFile=\).*$#\1%{_localstatedir}/run/slurm/slurmd.pid#' %{buildroot}/%{_sysconfdir}/%{name}/slurm.conf sed -i 's#^\(SlurmdPidFile=\).*$#\1%{_localstatedir}/run/slurm/slurmd.pid#' %{buildroot}/%{_sysconfdir}/%{name}/slurm.conf
sed -i 's#^\(SlurmctldPidFile=\).*$#\1%{_localstatedir}/run/slurm/slurmctld.pid#' %{buildroot}/%{_sysconfdir}/%{name}/slurm.conf sed -i 's#^\(SlurmctldPidFile=\).*$#\1%{_localstatedir}/run/slurm/slurmctld.pid#' %{buildroot}/%{_sysconfdir}/%{name}/slurm.conf
sed -i 's#^\(SlurmdSpoolDir=\)/.*#\1%{_localstatedir}/spool/slurm#' %{buildroot}/%{_sysconfdir}/%{name}/slurm.conf sed -i 's#^\(SlurmdSpoolDir=\)/.*#\1%{_localstatedir}/spool/slurm#' %{buildroot}/%{_sysconfdir}/%{name}/slurm.conf
%{?slurmlogdir:sed -i 's#^\(SlurmctldLogFile=\)/.*#\1%{slurmlogdir}#' %{buildroot}/%{_sysconfdir}/%{name}/slurm.conf}
%{?slurmlogdir:sed -i 's#^\(SlurmLogFile=\)/.*#\1%{slurmlogdir}#' %{buildroot}/%{_sysconfdir}/%{name}/slurm.conf}
cat >>%{buildroot}/%{_sysconfdir}/%{name}/slurm.conf <<EOF cat >>%{buildroot}/%{_sysconfdir}/%{name}/slurm.conf <<EOF
# SUSE default configuration # SUSE default configuration
PropagateResourceLimitsExcept=MEMLOCK PropagateResourceLimitsExcept=MEMLOCK
@ -857,6 +863,7 @@ exit 0
%config(noreplace) %{_sysconfdir}/%{name}/layouts.d/power_cpufreq.conf.example %config(noreplace) %{_sysconfdir}/%{name}/layouts.d/power_cpufreq.conf.example
%config(noreplace) %{_sysconfdir}/%{name}/layouts.d/unit.conf.example %config(noreplace) %{_sysconfdir}/%{name}/layouts.d/unit.conf.example
%{?OHPC_BUILD:%attr(0755, %slurm_u, %slurm_g) %_localstatedir/lib/slurm} %{?OHPC_BUILD:%attr(0755, %slurm_u, %slurm_g) %_localstatedir/lib/slurm}
%{?slurmlogdir:%dir %attr(-,%conman_u,%conman_g) %{slurmlogdir}}
%{?with_systemd:%{_tmpfilesdir}/%{name}.conf} %{?with_systemd:%{_tmpfilesdir}/%{name}.conf}
%dir %{_var}/spool/slurm %dir %{_var}/spool/slurm