Attachment #2367 for ticket #2092

Lines 5-11 ConditionPathExists=@sysconfdir@/slurm.c Link Here

(-)slurm-15.08.2/etc/slurmctld.service.in.systemdtweaks (-1 / +3 lines)
5		5
6	[Service]	6	[Service]
7	Type=forking	7	Type=forking
8	ExecStart=@sbindir@/slurmctld	8	EnvironmentFile=-/etc/sysconfig/slurmctld
		9	ExecStart=@sbindir@/slurmctld $SLURMCTLD_OPTIONS
		10	ExecReload=/bin/kill -HUP $MAINPID
9	PIDFile=/var/run/slurmctld.pid	11	PIDFile=/var/run/slurmctld.pid
10		12
11	[Install]	13	[Install]

Lines 5-12 ConditionPathExists=@sysconfdir@/slurm.c Link Here

(-)slurm-15.08.2/etc/slurmd.service.in.systemdtweaks (-1 / +6 lines)
5		5
6	[Service]	6	[Service]
7	Type=forking	7	Type=forking
8	ExecStart=@sbindir@/slurmd	8	EnvironmentFile=-/etc/sysconfig/slurmd
		9	ExecStart=@sbindir@/slurmd $SLURMD_OPTIONS
		10	ExecReload=/bin/kill -HUP $MAINPID
9	PIDFile=/var/run/slurmd.pid	11	PIDFile=/var/run/slurmd.pid
		12	LimitNOFILE=51200
		13	LimitMEMLOCK=infinity
		14	LimitSTACK=infinity
10		15
11	[Install]	16	[Install]
12	WantedBy=multi-user.target	17	WantedBy=multi-user.target

Lines 5-11 ConditionPathExists=@sysconfdir@/slurmdb Link Here

(-)slurm-15.08.2/etc/slurmdbd.service.in.systemdtweaks (-1 / +3 lines)
5		5
6	[Service]	6	[Service]
7	Type=forking	7	Type=forking
8	ExecStart=@sbindir@/slurmdbd	8	EnvironmentFile=-/etc/sysconfig/slurmdbd
		9	ExecStart=@sbindir@/slurmdbd $SLURMDBD_OPTIONS
		10	ExecReload=/bin/kill -HUP $MAINPID
9	PIDFile=/var/run/slurmdbd.pid	11	PIDFile=/var/run/slurmdbd.pid
10		12
11	[Install]	13	[Install]





License: GPL
Group: System Environment/Base
Source: slurm-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}
URL: http://slurm.schedmd.com/

Requires: slurm-plugins = %{version}-%{release}

%ifos linux
BuildRequires: python
BuildRequires: libibmad-devel libibverbs-devel librdmacm-devel
BuildRequires: hwloc-devel rrdtool-devel freeipmi-devel
BuildRequires: gtk2-devel glib2-devel man
BuildRequires: numactl-devel hdf5-devel
BuildRequires: json-c-devel libcurl-devel
%if 0%{?rhel} >= 7
BuildRequires: systemd
Requires(post): systemd
Requires(preun): systemd
Requires(postun): systemd
%else
Requires(post): chkconfig
Requires(preun): chkconfig
Requires(postun): initscripts
%endif
%endif

%ifos solaris

%package perlapi
Summary: Perl API to Slurm
Group: Development/System
Requires: slurm = %{version}-%{release}
%description perlapi
Perl API package for Slurm.  This package includes the perl API to provide a
helpful interface to Slurm through Perl

%package devel
Summary: Development package for Slurm
Group: Development/System
Requires: slurm = %{version}-%{release}
%description devel
Development package for Slurm.  This package includes the header files
and static libraries for the Slurm API

%package auth-none
Summary: Slurm auth NULL implementation (no authentication)
Group: System Environment/Base
Requires: slurm = %{version}-%{release}
%description auth-none
Slurm NULL authentication module
%endif

%package auth-authd
Summary: Slurm auth implementation using Brent Chun's authd
Group: System Environment/Base
Requires: slurm = %{version}-%{release}, authd
%description auth-authd
Slurm authentication module for Brent Chun's authd. Used to
authenticate user originating an RPC

%package munge
Summary: Slurm authentication and crypto implementation using Munge
Group: System Environment/Base
Requires: slurm = %{version}-%{release}, munge
BuildRequires: munge-devel munge-libs
Obsoletes: slurm-auth-munge
%description munge

%package bluegene
Summary: Slurm interfaces to IBM Blue Gene system
Group: System Environment/Base
Requires: slurm = %{version}-%{release}
%description bluegene
Slurm plugin interfaces to IBM Blue Gene system
%endif

%package slurmdbd
Summary: Slurm database daemon
Group: System Environment/Base
Requires: slurm-plugins = %{version}-%{release}, slurm-sql = %{version}-%{release}
%description slurmdbd
Slurm database daemon. Used to accept and process database RPCs and upload
database changes to slurmctld daemons on each cluster

%package torque
Summary: Torque/PBS wrappers for transitition from Torque/PBS to Slurm
Group: Development/System
Requires: slurm-perlapi = %{version}-%{release}
%description torque
Torque wrapper scripts used for helping migrate from Torque/PBS to Slurm

%package sjobexit
Summary: Slurm job exit code management tools
Group: Development/System
Requires: slurm-perlapi = %{version}-%{release}
%description sjobexit
Slurm job exit code management tools. Enables users to alter job exit code
information for completed jobs

%package slurmdb-direct
Summary: Wrappers to write directly to the slurmdb
Group: Development/System
Requires: slurm-perlapi = %{version}-%{release}
%description slurmdb-direct
Wrappers to write directly to the slurmdb


%package aix
Summary: Slurm interfaces to IBM AIX
Group: System Environment/Base
Requires: slurm = %{version}-%{release}
BuildRequires: proctrack >= 3
Obsoletes: slurm-aix-federation
%description aix

%package percs
Summary: Slurm plugins to run on an IBM PERCS system
Group: System Environment/Base
Requires: slurm = %{version}-%{release}, nrt
BuildRequires: nrt
%description percs
Slurm plugins to run on an IBM PERCS system, POE interface and NRT switch plugin

%package proctrack-sgi-job
Summary: Slurm process tracking plugin for SGI job containers
Group: System Environment/Base
Requires: slurm = %{version}-%{release}
BuildRequires: job
%description proctrack-sgi-job
Slurm process tracking plugin for SGI job containers

%package lua
Summary: Slurm lua bindings
Group: System Environment/Base
Requires: slurm = %{version}-%{release}, lua
BuildRequires: lua-devel
%description lua
Slurm lua bindings

%package sjstat
Summary: Perl tool to print Slurm job state information
Group: Development/System
Requires: slurm = %{version}-%{release}
%description sjstat
Perl tool to print Slurm job state information. The output is designed to give
information on the resource usage and availablilty, as well as information

%package pam_slurm
Summary: PAM module for restricting access to compute nodes via Slurm
Group: System Environment/Base
Requires: slurm = %{version}-%{release}
BuildRequires: pam-devel
Obsoletes: pam_slurm
%description pam_slurm

%package blcr
Summary: Allows Slurm to use Berkeley Lab Checkpoint/Restart
Group: System Environment/Base
Requires: slurm = %{version}-%{release}
%description blcr
Gives the ability for Slurm to use Berkeley Lab Checkpoint/Restart
%endif

#############################################################################

%prep
%setup -n slurm-%{version}

%build
%configure \

%ifos aix5.3
   mv ${RPM_BUILD_ROOT}%{_bindir}/srun ${RPM_BUILD_ROOT}%{_sbindir}
%else
%if 0%{?rhel} < 7 
   if [ -d /etc/init.d ]; then
      install -D -m755 etc/init.d.slurm    $RPM_BUILD_ROOT/etc/init.d/slurm
      install -D -m755 etc/init.d.slurmdbd $RPM_BUILD_ROOT/etc/init.d/slurmdbd

      ln -s ../../etc/init.d/slurm    $RPM_BUILD_ROOT/usr/sbin/rcslurm
      ln -s ../../etc/init.d/slurmdbd $RPM_BUILD_ROOT/usr/sbin/rcslurmdbd
   fi
%else
   if [ -d /usr/lib/systemd/system ]; then
      install -D -m644 etc/slurmctld.service $RPM_BUILD_ROOT/usr/lib/systemd/system/slurmctld.service
      install -D -m644 etc/slurmd.service    $RPM_BUILD_ROOT/usr/lib/systemd/system/slurmd.service
      install -D -m644 etc/slurmdbd.service  $RPM_BUILD_ROOT/usr/lib/systemd/system/slurmdbd.service
   fi
%endif
%endif

# Do not package Slurm's version of libpmi on Cray systems.
# Cray's version of libpmi should be used.

Libs: -L\${libdir} -lslurm
Description: Slurm API
Name: slurm
Version: %{version}
EOF

%if %{slurm_with bluegene}

%endif
#############################################################################

mkdir -p $RPM_BUILD_ROOT/var/spool/{slurmd,slurmctld}
mkdir -p $RPM_BUILD_ROOT/var/log/slurm
mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d
%if 0%{?rhel} < 7
cat >$RPM_BUILD_ROOT/etc/logrotate.d/slurm <<ENDLOGROTATE
/var/log/slurm/*log {
    compress
    missingok
    nocopytruncate
    nocreate
    delaycompress
    nomail
    notifempty
    noolddir
    rotate 10
    sharedscripts
    size=5M
    create 640 slurm root
    postrotate
    /etc/init.d/slurm reconfig
    endscript
}
ENDLOGROTATE
%else
for s in slurmd slurmctld slurmdbd; do
cat >$RPM_BUILD_ROOT/etc/logrotate.d/$s <<ENDINDIVIDUALROTATE
/var/log/slurm/${s}*log {
    compress
    missingok 
    nocopytruncate
    nocreate
    delaycompress
    nomail
    notifempty
    noolddir
    rotate 10
    sharedscripts
    size=5M
    create 640 slurm root
    postrotate
    /usr/bin/systemctl reload ${s}.service
    endscript
}
ENDINDIVIDUALROTATE
done
%endif
%clean
rm -rf $RPM_BUILD_ROOT
#############################################################################

%exclude %{_mandir}/man1/srun_cr*
%exclude %{_bindir}/srun_cr
%endif
%attr(700,root,root) /var/spool/slurmd
%attr(700,slurm,slurm) /var/spool/slurmctld
%attr(770,root,slurm) /var/log/slurm
%if 0%{?rhel} < 7
/etc/logrotate.d/slurm
%else
/etc/logrotate.d/slurmd
/etc/logrotate.d/slurmctld
%endif
#############################################################################

%files -f devel.files devel

%{_mandir}/man5/slurmdbd.*
%{_mandir}/man8/slurmdbd.*
%config %{_sysconfdir}/slurmdbd.conf.example
%if 0%{?rhel} >= 7
/etc/logrotate.d/slurmdbd
%endif
#############################################################################

%files -f sql.files sql

#############################################################################

%pre
/usr/sbin/groupadd -g 123 slurm > /dev/null 2>&1 || :
/usr/sbin/useradd -M -o -u 123 -g slurm -d /var/spool/slurm -s /sbin/nologin -c "SLURM User" slurm > /dev/null 2>&1 || :
#if [ -x /etc/init.d/slurm ]; then
#    if /etc/init.d/slurm status | grep -q running; then
#        /etc/init.d/slurm stop

#fi

%post
[ -x /sbin/ldconfig ] && /sbin/ldconfig %{_libdir}
%if 0%{?rhel} >= 7
    %systemd_post slurmd.service slurmctld.service
%else
if [ $1 = 1 ]; then
    [ -x /sbin/chkconfig ] && /sbin/chkconfig --add slurm
fi
%endif

%if %{slurm_with bluegene}
%post bluegene

%endif

%preun
%if 0%{?rhel} >= 7
    %systemd_preun slurmd.service slurmctld.service
%else
if [ "$1" -eq 0 ]; then
    if [ -x /etc/init.d/slurm ]; then
	[ -x /sbin/chkconfig ] && /sbin/chkconfig --del slurm

	fi
    fi
fi
%endif

%preun slurmdbd
%if 0%{?rhel} >= 7
    %systemd_preun slurmdbd.service
%else
if [ "$1" -eq 0 ]; then
    if [ -x /etc/init.d/slurmdbd ]; then
	[ -x /sbin/chkconfig ] && /sbin/chkconfig --del slurmdbd

	fi
    fi
fi
%endif

%postun
%if 0%{?rhel} >= 7
    %systemd_postun_with_restart slurmd.service slurmctld.service
%else
if [ "$1" -gt 1 ]; then
    /etc/init.d/slurm condrestart
elif [ "$1" -eq 0 ]; then

	/sbin/ldconfig %{_libdir}
    fi
fi
%endif
%if %{?insserv_cleanup:1}0
%insserv_cleanup
%endif

%postun slurmdbd
%if 0%{?rhel} >= 7
%systemd_postun_with_restart slurmdbd.service
%else
if [ "$1" -gt 1 ]; then
    /etc/init.d/slurmdbd condrestart
fi
%endif

#############################################################################


Return to ticket 2092

Lines 93-106 Summary: Slurm Workload Manager Link Here

(-)slurm-15.08.2/slurm.spec.systemdtweaks (-26 / +122 lines)
93		93
94	License: GPL	94	License: GPL
95	Group: System Environment/Base	95	Group: System Environment/Base
96	Source: slurm-15.08.2.tar.bz2	96	Source: slurm-%{version}.tar.bz2
97	BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}	97	BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}
98	URL: http://slurm.schedmd.com/	98	URL: http://slurm.schedmd.com/
99		99
100	Requires: slurm-plugins	100	Requires: slurm-plugins = %{version}-%{release}
101		101
102	%ifos linux	102	%ifos linux
103	BuildRequires: python	103	BuildRequires: python
		104	BuildRequires: libibmad-devel libibverbs-devel librdmacm-devel
		105	BuildRequires: hwloc-devel rrdtool-devel freeipmi-devel
		106	BuildRequires: gtk2-devel glib2-devel man
		107	BuildRequires: numactl-devel hdf5-devel
		108	BuildRequires: json-c-devel libcurl-devel
		109	%if 0%{?rhel} >= 7
		110	BuildRequires: systemd
		111	Requires(post): systemd
		112	Requires(preun): systemd
		113	Requires(postun): systemd
		114	%else
		115	Requires(post): chkconfig
		116	Requires(preun): chkconfig
		117	Requires(postun): initscripts
		118	%endif
104	%endif	119	%endif
105		120
106	%ifos solaris	121	%ifos solaris
Lines 244-250 scheduling and accounting modules Link Here
244	%package perlapi	259	%package perlapi
245	Summary: Perl API to Slurm	260	Summary: Perl API to Slurm
246	Group: Development/System	261	Group: Development/System
247	Requires: slurm	262	Requires: slurm = %{version}-%{release}
248	%description perlapi	263	%description perlapi
249	Perl API package for Slurm. This package includes the perl API to provide a	264	Perl API package for Slurm. This package includes the perl API to provide a
250	helpful interface to Slurm through Perl	265	helpful interface to Slurm through Perl
Lines 252-258 helpful interface to Slurm through Perl Link Here
252	%package devel	267	%package devel
253	Summary: Development package for Slurm	268	Summary: Development package for Slurm
254	Group: Development/System	269	Group: Development/System
255	Requires: slurm	270	Requires: slurm = %{version}-%{release}
256	%description devel	271	%description devel
257	Development package for Slurm. This package includes the header files	272	Development package for Slurm. This package includes the header files
258	and static libraries for the Slurm API	273	and static libraries for the Slurm API
Lines 261-267 and static libraries for the Slurm API Link Here
261	%package auth-none	276	%package auth-none
262	Summary: Slurm auth NULL implementation (no authentication)	277	Summary: Slurm auth NULL implementation (no authentication)
263	Group: System Environment/Base	278	Group: System Environment/Base
264	Requires: slurm	279	Requires: slurm = %{version}-%{release}
265	%description auth-none	280	%description auth-none
266	Slurm NULL authentication module	281	Slurm NULL authentication module
267	%endif	282	%endif
Lines 270-276 Slurm NULL authentication module Link Here
270	%package auth-authd	285	%package auth-authd
271	Summary: Slurm auth implementation using Brent Chun's authd	286	Summary: Slurm auth implementation using Brent Chun's authd
272	Group: System Environment/Base	287	Group: System Environment/Base
273	Requires: slurm authd	288	Requires: slurm = %{version}-%{release}, authd
274	%description auth-authd	289	%description auth-authd
275	Slurm authentication module for Brent Chun's authd. Used to	290	Slurm authentication module for Brent Chun's authd. Used to
276	authenticate user originating an RPC	291	authenticate user originating an RPC
Lines 282-288 authenticate user originating an RPC Link Here
282	%package munge	297	%package munge
283	Summary: Slurm authentication and crypto implementation using Munge	298	Summary: Slurm authentication and crypto implementation using Munge
284	Group: System Environment/Base	299	Group: System Environment/Base
285	Requires: slurm munge	300	Requires: slurm = %{version}-%{release}, munge
286	BuildRequires: munge-devel munge-libs	301	BuildRequires: munge-devel munge-libs
287	Obsoletes: slurm-auth-munge	302	Obsoletes: slurm-auth-munge
288	%description munge	303	%description munge
Lines 294-300 authenticate user originating an RPC, di Link Here
294	%package bluegene	309	%package bluegene
295	Summary: Slurm interfaces to IBM Blue Gene system	310	Summary: Slurm interfaces to IBM Blue Gene system
296	Group: System Environment/Base	311	Group: System Environment/Base
297	Requires: slurm	312	Requires: slurm = %{version}-%{release}
298	%description bluegene	313	%description bluegene
299	Slurm plugin interfaces to IBM Blue Gene system	314	Slurm plugin interfaces to IBM Blue Gene system
300	%endif	315	%endif
Lines 302-308 Slurm plugin interfaces to IBM Blue Gene Link Here
302	%package slurmdbd	317	%package slurmdbd
303	Summary: Slurm database daemon	318	Summary: Slurm database daemon
304	Group: System Environment/Base	319	Group: System Environment/Base
305	Requires: slurm-plugins slurm-sql	320	Requires: slurm-plugins = %{version}-%{release}, slurm-sql = %{version}-%{release}
306	%description slurmdbd	321	%description slurmdbd
307	Slurm database daemon. Used to accept and process database RPCs and upload	322	Slurm database daemon. Used to accept and process database RPCs and upload
308	database changes to slurmctld daemons on each cluster	323	database changes to slurmctld daemons on each cluster
Lines 325-338 are in other packages Link Here
325	%package torque	340	%package torque
326	Summary: Torque/PBS wrappers for transitition from Torque/PBS to Slurm	341	Summary: Torque/PBS wrappers for transitition from Torque/PBS to Slurm
327	Group: Development/System	342	Group: Development/System
328	Requires: slurm-perlapi	343	Requires: slurm-perlapi = %{version}-%{release}
329	%description torque	344	%description torque
330	Torque wrapper scripts used for helping migrate from Torque/PBS to Slurm	345	Torque wrapper scripts used for helping migrate from Torque/PBS to Slurm
331		346
332	%package sjobexit	347	%package sjobexit
333	Summary: Slurm job exit code management tools	348	Summary: Slurm job exit code management tools
334	Group: Development/System	349	Group: Development/System
335	Requires: slurm-perlapi	350	Requires: slurm-perlapi = %{version}-%{release}
336	%description sjobexit	351	%description sjobexit
337	Slurm job exit code management tools. Enables users to alter job exit code	352	Slurm job exit code management tools. Enables users to alter job exit code
338	information for completed jobs	353	information for completed jobs
Lines 340-346 information for completed jobs Link Here
340	%package slurmdb-direct	355	%package slurmdb-direct
341	Summary: Wrappers to write directly to the slurmdb	356	Summary: Wrappers to write directly to the slurmdb
342	Group: Development/System	357	Group: Development/System
343	Requires: slurm-perlapi	358	Requires: slurm-perlapi = %{version}-%{release}
344	%description slurmdb-direct	359	%description slurmdb-direct
345	Wrappers to write directly to the slurmdb	360	Wrappers to write directly to the slurmdb
346		361
Lines 348-354 Wrappers to write directly to the slurmd Link Here
348	%package aix	363	%package aix
349	Summary: Slurm interfaces to IBM AIX	364	Summary: Slurm interfaces to IBM AIX
350	Group: System Environment/Base	365	Group: System Environment/Base
351	Requires: slurm	366	Requires: slurm = %{version}-%{release}
352	BuildRequires: proctrack >= 3	367	BuildRequires: proctrack >= 3
353	Obsoletes: slurm-aix-federation	368	Obsoletes: slurm-aix-federation
354	%description aix	369	%description aix
Lines 359-365 Slurm interfaces for IBM AIX systems Link Here
359	%package percs	374	%package percs
360	Summary: Slurm plugins to run on an IBM PERCS system	375	Summary: Slurm plugins to run on an IBM PERCS system
361	Group: System Environment/Base	376	Group: System Environment/Base
362	Requires: slurm nrt	377	Requires: slurm = %{version}-%{release}, nrt
363	BuildRequires: nrt	378	BuildRequires: nrt
364	%description percs	379	%description percs
365	Slurm plugins to run on an IBM PERCS system, POE interface and NRT switch plugin	380	Slurm plugins to run on an IBM PERCS system, POE interface and NRT switch plugin
Lines 370-376 Slurm plugins to run on an IBM PERCS sys Link Here
370	%package proctrack-sgi-job	385	%package proctrack-sgi-job
371	Summary: Slurm process tracking plugin for SGI job containers	386	Summary: Slurm process tracking plugin for SGI job containers
372	Group: System Environment/Base	387	Group: System Environment/Base
373	Requires: slurm	388	Requires: slurm = %{version}-%{release}
374	BuildRequires: job	389	BuildRequires: job
375	%description proctrack-sgi-job	390	%description proctrack-sgi-job
376	Slurm process tracking plugin for SGI job containers	391	Slurm process tracking plugin for SGI job containers
Lines 381-387 Slurm process tracking plugin for SGI jo Link Here
381	%package lua	396	%package lua
382	Summary: Slurm lua bindings	397	Summary: Slurm lua bindings
383	Group: System Environment/Base	398	Group: System Environment/Base
384	Requires: slurm lua	399	Requires: slurm = %{version}-%{release}, lua
385	BuildRequires: lua-devel	400	BuildRequires: lua-devel
386	%description lua	401	%description lua
387	Slurm lua bindings	402	Slurm lua bindings
Lines 391-397 Includes the Slurm proctrack/lua and job Link Here
391	%package sjstat	406	%package sjstat
392	Summary: Perl tool to print Slurm job state information	407	Summary: Perl tool to print Slurm job state information
393	Group: Development/System	408	Group: Development/System
394	Requires: slurm	409	Requires: slurm = %{version}-%{release}
395	%description sjstat	410	%description sjstat
396	Perl tool to print Slurm job state information. The output is designed to give	411	Perl tool to print Slurm job state information. The output is designed to give
397	information on the resource usage and availablilty, as well as information	412	information on the resource usage and availablilty, as well as information
Lines 403-409 utilites will provide more information a Link Here
403	%package pam_slurm	418	%package pam_slurm
404	Summary: PAM module for restricting access to compute nodes via Slurm	419	Summary: PAM module for restricting access to compute nodes via Slurm
405	Group: System Environment/Base	420	Group: System Environment/Base
406	Requires: slurm	421	Requires: slurm = %{version}-%{release}
407	BuildRequires: pam-devel	422	BuildRequires: pam-devel
408	Obsoletes: pam_slurm	423	Obsoletes: pam_slurm
409	%description pam_slurm	424	%description pam_slurm
Lines 417-423 according to the Slurm Link Here
417	%package blcr	432	%package blcr
418	Summary: Allows Slurm to use Berkeley Lab Checkpoint/Restart	433	Summary: Allows Slurm to use Berkeley Lab Checkpoint/Restart
419	Group: System Environment/Base	434	Group: System Environment/Base
420	Requires: slurm	435	Requires: slurm = %{version}-%{release}
421	%description blcr	436	%description blcr
422	Gives the ability for Slurm to use Berkeley Lab Checkpoint/Restart	437	Gives the ability for Slurm to use Berkeley Lab Checkpoint/Restart
423	%endif	438	%endif
Lines 425-431 Gives the ability for Slurm to use Berke Link Here
425	#############################################################################	440	#############################################################################
426		441
427	%prep	442	%prep
428	%setup -n slurm-15.08.2	443	%setup -n slurm-%{version}
429		444
430	%build	445	%build
431	%configure \	446	%configure \
Lines 459-464 DESTDIR="$RPM_BUILD_ROOT" %__make instal Link Here
459	%ifos aix5.3	474	%ifos aix5.3
460	mv ${RPM_BUILD_ROOT}%{_bindir}/srun ${RPM_BUILD_ROOT}%{_sbindir}	475	mv ${RPM_BUILD_ROOT}%{_bindir}/srun ${RPM_BUILD_ROOT}%{_sbindir}
461	%else	476	%else
		477	%if 0%{?rhel} < 7
462	if [ -d /etc/init.d ]; then	478	if [ -d /etc/init.d ]; then
463	install -D -m755 etc/init.d.slurm $RPM_BUILD_ROOT/etc/init.d/slurm	479	install -D -m755 etc/init.d.slurm $RPM_BUILD_ROOT/etc/init.d/slurm
464	install -D -m755 etc/init.d.slurmdbd $RPM_BUILD_ROOT/etc/init.d/slurmdbd	480	install -D -m755 etc/init.d.slurmdbd $RPM_BUILD_ROOT/etc/init.d/slurmdbd
Lines 466-477 DESTDIR="$RPM_BUILD_ROOT" %__make instal Link Here
466	ln -s ../../etc/init.d/slurm $RPM_BUILD_ROOT/usr/sbin/rcslurm	482	ln -s ../../etc/init.d/slurm $RPM_BUILD_ROOT/usr/sbin/rcslurm
467	ln -s ../../etc/init.d/slurmdbd $RPM_BUILD_ROOT/usr/sbin/rcslurmdbd	483	ln -s ../../etc/init.d/slurmdbd $RPM_BUILD_ROOT/usr/sbin/rcslurmdbd
468	fi	484	fi
		485	%else
469	if [ -d /usr/lib/systemd/system ]; then	486	if [ -d /usr/lib/systemd/system ]; then
470	install -D -m644 etc/slurmctld.service $RPM_BUILD_ROOT/usr/lib/systemd/system/slurmctld.service	487	install -D -m644 etc/slurmctld.service $RPM_BUILD_ROOT/usr/lib/systemd/system/slurmctld.service
471	install -D -m644 etc/slurmd.service $RPM_BUILD_ROOT/usr/lib/systemd/system/slurmd.service	488	install -D -m644 etc/slurmd.service $RPM_BUILD_ROOT/usr/lib/systemd/system/slurmd.service
472	install -D -m644 etc/slurmdbd.service $RPM_BUILD_ROOT/usr/lib/systemd/system/slurmdbd.service	489	install -D -m644 etc/slurmdbd.service $RPM_BUILD_ROOT/usr/lib/systemd/system/slurmdbd.service
473	fi	490	fi
474	%endif	491	%endif
		492	%endif
475		493
476	# Do not package Slurm's version of libpmi on Cray systems.	494	# Do not package Slurm's version of libpmi on Cray systems.
477	# Cray's version of libpmi should be used.	495	# Cray's version of libpmi should be used.
Lines 634-640 Cflags: -I\${includedir} Link Here
634	Libs: -L\${libdir} -lslurm	652	Libs: -L\${libdir} -lslurm
635	Description: Slurm API	653	Description: Slurm API
636	Name: slurm	654	Name: slurm
637	Version: 15.08.2	655	Version: %{version}
638	EOF	656	EOF
639		657
640	%if %{slurm_with bluegene}	658	%if %{slurm_with bluegene}
Lines 768-773 touch $LIST Link Here
768	%endif	786	%endif
769	#############################################################################	787	#############################################################################
770		788
		789	mkdir -p $RPM_BUILD_ROOT/var/spool/{slurmd,slurmctld}
		790	mkdir -p $RPM_BUILD_ROOT/var/log/slurm
		791	mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d
		792	%if 0%{?rhel} < 7
		793	cat >$RPM_BUILD_ROOT/etc/logrotate.d/slurm <<ENDLOGROTATE
		794	/var/log/slurm/*log {
		795	compress
		796	missingok
		797	nocopytruncate
		798	nocreate
		799	delaycompress
		800	nomail
		801	notifempty
		802	noolddir
		803	rotate 10
		804	sharedscripts
		805	size=5M
		806	create 640 slurm root
		807	postrotate
		808	/etc/init.d/slurm reconfig
		809	endscript
		810	}
		811	ENDLOGROTATE
		812	%else
		813	for s in slurmd slurmctld slurmdbd; do
		814	cat >$RPM_BUILD_ROOT/etc/logrotate.d/$s <<ENDINDIVIDUALROTATE
		815	/var/log/slurm/${s}*log {
		816	compress
		817	missingok
		818	nocopytruncate
		819	nocreate
		820	delaycompress
		821	nomail
		822	notifempty
		823	noolddir
		824	rotate 10
		825	sharedscripts
		826	size=5M
		827	create 640 slurm root
		828	postrotate
		829	/usr/bin/systemctl reload ${s}.service
		830	endscript
		831	}
		832	ENDINDIVIDUALROTATE
		833	done
		834	%endif
771	%clean	835	%clean
772	rm -rf $RPM_BUILD_ROOT	836	rm -rf $RPM_BUILD_ROOT
773	#############################################################################	837	#############################################################################
Lines 829-834 rm -rf $RPM_BUILD_ROOT Link Here
829	%exclude %{_mandir}/man1/srun_cr*	893	%exclude %{_mandir}/man1/srun_cr*
830	%exclude %{_bindir}/srun_cr	894	%exclude %{_bindir}/srun_cr
831	%endif	895	%endif
		896	%attr(700,root,root) /var/spool/slurmd
		897	%attr(700,slurm,slurm) /var/spool/slurmctld
		898	%attr(770,root,slurm) /var/log/slurm
		899	%if 0%{?rhel} < 7
		900	/etc/logrotate.d/slurm
		901	%else
		902	/etc/logrotate.d/slurmd
		903	/etc/logrotate.d/slurmctld
		904	%endif
832	#############################################################################	905	#############################################################################
833		906
834	%files -f devel.files devel	907	%files -f devel.files devel
Lines 899-904 rm -rf $RPM_BUILD_ROOT Link Here
899	%{_mandir}/man5/slurmdbd.*	972	%{_mandir}/man5/slurmdbd.*
900	%{_mandir}/man8/slurmdbd.*	973	%{_mandir}/man8/slurmdbd.*
901	%config %{_sysconfdir}/slurmdbd.conf.example	974	%config %{_sysconfdir}/slurmdbd.conf.example
		975	%if 0%{?rhel} >= 7
		976	/etc/logrotate.d/slurmdbd
		977	%endif
902	#############################################################################	978	#############################################################################
903		979
904	%files -f sql.files sql	980	%files -f sql.files sql
Lines 1064-1069 rm -rf $RPM_BUILD_ROOT Link Here
1064	#############################################################################	1140	#############################################################################
1065		1141
1066	%pre	1142	%pre
		1143	/usr/sbin/groupadd -g 123 slurm > /dev/null 2>&1 \|\| :
		1144	/usr/sbin/useradd -M -o -u 123 -g slurm -d /var/spool/slurm -s /sbin/nologin -c "SLURM User" slurm > /dev/null 2>&1 \|\| :
1067	#if [ -x /etc/init.d/slurm ]; then	1145	#if [ -x /etc/init.d/slurm ]; then
1068	# if /etc/init.d/slurm status \| grep -q running; then	1146	# if /etc/init.d/slurm status \| grep -q running; then
1069	# /etc/init.d/slurm stop	1147	# /etc/init.d/slurm stop
Lines 1076-1087 rm -rf $RPM_BUILD_ROOT Link Here
1076	#fi	1154	#fi
1077		1155
1078	%post	1156	%post
1079	if [ -x /sbin/ldconfig ]; then	1157	[ -x /sbin/ldconfig ] && /sbin/ldconfig %{_libdir}
1080	/sbin/ldconfig %{_libdir}	1158	%if 0%{?rhel} >= 7
1081	if [ $1 = 1 ]; then	1159	%systemd_post slurmd.service slurmctld.service
1082	[ -x /sbin/chkconfig ] && /sbin/chkconfig --add slurm	1160	%else
1083	fi	1161	if [ $1 = 1 ]; then
		1162	[ -x /sbin/chkconfig ] && /sbin/chkconfig --add slurm
1084	fi	1163	fi
		1164	%endif
1085		1165
1086	%if %{slurm_with bluegene}	1166	%if %{slurm_with bluegene}
1087	%post bluegene	1167	%post bluegene
Lines 1091-1096 fi Link Here
1091	%endif	1171	%endif
1092		1172
1093	%preun	1173	%preun
		1174	%if 0%{?rhel} >= 7
		1175	%systemd_preun slurmd.service slurmctld.service
		1176	%else
1094	if [ "$1" -eq 0 ]; then	1177	if [ "$1" -eq 0 ]; then
1095	if [ -x /etc/init.d/slurm ]; then	1178	if [ -x /etc/init.d/slurm ]; then
1096	[ -x /sbin/chkconfig ] && /sbin/chkconfig --del slurm	1179	[ -x /sbin/chkconfig ] && /sbin/chkconfig --del slurm
Lines 1099-1106 if [ "$1" -eq 0 ]; then Link Here
1099	fi	1182	fi
1100	fi	1183	fi
1101	fi	1184	fi
		1185	%endif
1102		1186
1103	%preun slurmdbd	1187	%preun slurmdbd
		1188	%if 0%{?rhel} >= 7
		1189	%systemd_preun slurmdbd.service
		1190	%else
1104	if [ "$1" -eq 0 ]; then	1191	if [ "$1" -eq 0 ]; then
1105	if [ -x /etc/init.d/slurmdbd ]; then	1192	if [ -x /etc/init.d/slurmdbd ]; then
1106	[ -x /sbin/chkconfig ] && /sbin/chkconfig --del slurmdbd	1193	[ -x /sbin/chkconfig ] && /sbin/chkconfig --del slurmdbd
Lines 1109-1116 if [ "$1" -eq 0 ]; then Link Here
1109	fi	1196	fi
1110	fi	1197	fi
1111	fi	1198	fi
		1199	%endif
1112		1200
1113	%postun	1201	%postun
		1202	%if 0%{?rhel} >= 7
		1203	%systemd_postun_with_restart slurmd.service slurmctld.service
		1204	%else
1114	if [ "$1" -gt 1 ]; then	1205	if [ "$1" -gt 1 ]; then
1115	/etc/init.d/slurm condrestart	1206	/etc/init.d/slurm condrestart
1116	elif [ "$1" -eq 0 ]; then	1207	elif [ "$1" -eq 0 ]; then
Lines 1118-1131 elif [ "$1" -eq 0 ]; then Link Here
1118	/sbin/ldconfig %{_libdir}	1209	/sbin/ldconfig %{_libdir}
1119	fi	1210	fi
1120	fi	1211	fi
		1212	%endif
1121	%if %{?insserv_cleanup:1}0	1213	%if %{?insserv_cleanup:1}0
1122	%insserv_cleanup	1214	%insserv_cleanup
1123	%endif	1215	%endif
1124		1216
1125	%postun slurmdbd	1217	%postun slurmdbd
		1218	%if 0%{?rhel} >= 7
		1219	%systemd_postun_with_restart slurmdbd.service
		1220	%else
1126	if [ "$1" -gt 1 ]; then	1221	if [ "$1" -gt 1 ]; then
1127	/etc/init.d/slurmdbd condrestart	1222	/etc/init.d/slurmdbd condrestart
1128	fi	1223	fi
		1224	%endif
1129		1225
1130	#############################################################################	1226	#############################################################################
1131		1227