svn merge -r19967:19976 https://eris.llnl.gov/svn/slurm/branches/slurm-2.1

NEWS

@@ -186,6 +186,7 @@ documents those changes that are of interest to users and admins.
     space in the environment variables exported to the user application
     (everything after the equal sign to the end of the line is included without
     alteration).
+ -- Do not install /etc/init.d/slurm or /etc/init.d/slurmdbd on AIX systems.
 
 * Changes in SLURM 2.1.6-2
 ==========================

doc/man/man5/slurm.conf.5

@@ -1755,6 +1755,7 @@ variables and output for the user program.
 Will set environment variables for the task being spawned. 
 Everything after the equal sign to the end of the
 line will be used as the value for the environment variable.
+Exporting of functions is not currently supported.
 .TP
 \fBprint ...\fR
 Will cause that line (without the leading "print ")

etc/init.d.slurm

@@ -38,7 +38,10 @@ if [ -f /etc/rc.status ]; then
 
    rc_reset
 else
-   [ -f /etc/rc.d/init.d/functions ] || exit 0
+   if [ ! -f /etc/rc.d/init.d/functions ]; then
+      echo "Could not find /etc/rc.d/init.d/functions. Is some other daemon launch mechanism used?"
+      exit 1
+   fi
    . /etc/rc.d/init.d/functions
    SUSE=0
    STARTPROC=daemon
@@ -52,6 +55,11 @@ else
    RETVAL=0
 fi
 
+if [ ! -x $BINDIR/scontrol ]; then
+   echo "Could not find $BINDIR/scontrol. Bad path?"
+   exit 1
+fi
+
 # We can not use a starter program without losing environment
 # variables that are critical on Blue Gene systems
 if [ -d /bgl/BlueLight/ppcfloor ]; then
@@ -68,7 +76,10 @@ else
     SLURMD_OPTIONS=""
 fi
 
-[ -f $CONFDIR/slurm.conf ] || exit 1
+if [ ! -f $CONFDIR/slurm.conf ]; then
+   echo "Could not find $CONFDIR/slurm.conf. Bad path?"
+   exit 1
+fi
 
 # setup library paths for slurm and munge support
 export LD_LIBRARY_PATH="$LIBDIR:$LD_LIBRARY_PATH"

etc/init.d.slurmdbd

@@ -33,7 +33,10 @@ if [ -f /etc/rc.status ]; then
 
    rc_reset
 else
-   [ -f /etc/rc.d/init.d/functions ] || exit 0
+   if [ ! -f /etc/rc.d/init.d/functions ]; then
+      echo "Could not find /etc/rc.d/init.d/functions. Is some other daemon launch mechanism used?"
+      exit 1
+   fi
    . /etc/rc.d/init.d/functions
    SUSE=0
    STARTPROC=daemon
@@ -61,7 +64,10 @@ else
     SLURMDBD_OPTIONS=""
 fi
 
-[ -f $CONFDIR/slurmdbd.conf ] || exit 1
+if [ ! -f $CONFDIR/slurmdbd.conf ]; then
+   echo "Could not find $CONFDIR/slurmdbd.conf. Bad path?"
+   exit 1
+fi
 
 # setup library paths for slurm and munge support
 export LD_LIBRARY_PATH="$LIBDIR:$LD_LIBRARY_PATH"

slurm.spec

@@ -391,13 +391,13 @@ DESTDIR="$RPM_BUILD_ROOT" make install
 DESTDIR="$RPM_BUILD_ROOT" make install-contrib
 
 %ifos aix5.3
-mv ${RPM_BUILD_ROOT}%{_bindir}/srun ${RPM_BUILD_ROOT}%{_sbindir}
+   mv ${RPM_BUILD_ROOT}%{_bindir}/srun ${RPM_BUILD_ROOT}%{_sbindir}
+%else
+   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
+   fi
 %endif
-
-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
-fi
 install -D -m644 etc/cgroup.conf.example ${RPM_BUILD_ROOT}%{_sysconfdir}/cgroup.conf.example
 install -D -m755 etc/cgroup.release_agent ${RPM_BUILD_ROOT}%{_sysconfdir}/cgroup.release_agent
 install -D -m644 etc/slurm.conf.example ${RPM_BUILD_ROOT}%{_sysconfdir}/slurm.conf.example
@@ -432,9 +432,8 @@ rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/srun_cr* ${RPM_BUILD_ROOT}%{_bindir}/srun
 # Build conditional file list for main package
 LIST=./slurm.files
 touch $LIST
-if [ -d /etc/init.d ]; then
-   echo "/etc/init.d/slurm"    >> $LIST
-fi
+test -f $RPM_BUILD_ROOT/etc/init.d/slurm                       &&
+  echo /etc/init.d/slurm                               >> $LIST
 
 %if %{slurm_with aix}
 install -D -m644 etc/federation.conf.example ${RPM_BUILD_ROOT}%{_sysconfdir}/federation.conf.example
@@ -457,9 +456,8 @@ test -f $RPM_BUILD_ROOT/%{_libdir}/slurm/switch_federation.so  &&
 
 LIST=./slurmdbd.files
 touch $LIST
-if [ -d /etc/init.d ]; then
-   echo "/etc/init.d/slurmdbd" >> $LIST
-fi
+test -f $RPM_BUILD_ROOT/etc/init.d/slurm                       &&
+  echo /etc/init.d/slurmdbd                            >> $LIST
 
 LIST=./sql.files
 touch $LIST