Hello community, here is the log from the commit of package slurm for openSUSE:Factory checked in at 2018-03-29 11:57:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/slurm (Old) and /work/SRC/openSUSE:Factory/.slurm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "slurm" Thu Mar 29 11:57:05 2018 rev:11 rq:591864 version:17.11.5 Changes: -------- --- /work/SRC/openSUSE:Factory/slurm/slurm.changes 2018-03-20 21:59:21.407849310 +0100 +++ /work/SRC/openSUSE:Factory/.slurm.new/slurm.changes 2018-03-29 11:57:06.875116776 +0200 @@ -1,0 +2,9 @@ +Fri Mar 23 13:50:14 UTC 2018 - cg...@suse.com + +- fixed wrong log file location in slurmdbd.conf and + fixed pid location for slurmdbd and made slurm-slurmdbd + depend on slurm config which provides the dir /var/run/slurm + (bsc#1086859) + + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ slurm.spec ++++++ --- /var/tmp/diff_new_pack.lfom8n/_old 2018-03-29 11:57:07.499094250 +0200 +++ /var/tmp/diff_new_pack.lfom8n/_new 2018-03-29 11:57:07.503094105 +0200 @@ -61,7 +61,7 @@ Summary: Simple Linux Utility for Resource Management License: SUSE-GPL-2.0-with-openssl-exception Group: Productivity/Clustering/Computing -Url: https://computing.llnl.gov/linux/slurm/ +Url: https://www.schedmd.com Source: https://download.schedmd.com/slurm/%{name}-%{ver}.tar.bz2 Source1: slurm-rpmlintrc Patch0: slurm-2.4.4-rpath.patch @@ -198,6 +198,7 @@ %package slurmdbd Summary: SLURM database daemon Group: Productivity/Clustering/Computing +Requires: slurm-config = %{version} Requires: slurm-plugins = %{version} %if 0%{?with_systemd} %{?systemd_requires} @@ -366,10 +367,7 @@ install -D -m755 contribs/sgather/sgather %{buildroot}%{_bindir}/sgather %if 0%{?OHPC_BUILD} -# 6/16/15 karl.w.sch...@intel.com - do not package Slurm's version of libpmi with OpenHPC. -## rm -f %%{buildroot}/%%{_libdir}/libpmi* -## rm -f %%{buildroot}/%%{_libdir}/mpi_pmi2* -# 9/8/14 karl.w.sch...@intel.com - provide starting config file +# change slurm.conf for our needs head -n -2 %{buildroot}/%{_sysconfdir}/%{name}/slurm.conf.example | grep -v ReturnToService > %{buildroot}/%{_sysconfdir}/%{name}/slurm.conf sed -i 's#\(StateSaveLocation=\).*#\1%_localstatedir/lib/slurm#' %{buildroot}/%{_sysconfdir}/%{name}/slurm.conf sed -i 's#^\(SlurmdPidFile=\).*$#\1%{_localstatedir}/run/slurm/slurmd.pid#' %{buildroot}/%{_sysconfdir}/%{name}/slurm.conf @@ -385,9 +383,14 @@ EOF # 9/17/14 karl.w.sch...@intel.com - Add option to drop VM cache during epilog sed -i '/^# No other SLURM jobs,/i \\n# Drop clean caches (OpenHPC)\necho 3 > /proc/sys/vm/drop_caches\n\n#' %{buildroot}/%{_sysconfdir}/%{name}/slurm.epilog.clean +# chnage slurmdbd.conf for our needs +sed -i 's@LogFile=/var/log/slurm/slurmdbd.log@LogFile=/var/log/slurmdbd.log@' %{buildroot}/%{_sysconfdir}/%{name}/slurmdbd.conf +sed -i -e "s@PidFile=.*@PidFile=%{_localstatedir}/run/slurm/slurmdbd.pid@" %{buildroot}/%{_sysconfdir}/%{name}/slurmdbd.conf +# manage local state dir mkdir -p %{buildroot}/%_localstatedir/lib/slurm sed -i -e "s@PIDFile=.*@PIDFile=%{_localstatedir}/run/slurm/slurmctld.pid@" %{buildroot}/%{_unitdir}/slurmctld.service sed -i -e "s@PIDFile=.*@PIDFile=%{_localstatedir}/run/slurm/slurmd.pid@" %{buildroot}/%{_unitdir}/slurmd.service +sed -i -e "s@PIDFile=.*@PIDFile=%{_localstatedir}/run/slurm/slurmdbd.pid@" %{buildroot}/%{_unitdir}/slurmdbd.service %endif # Delete unpackaged files:
