Fixes and improvements of the new startup scripts:

- better upgrade from EMI-2 (changed pidfiles location)
- better upgrade from EMI-3 (changed startup scripts)
- shutdown old daemon in start action of proxy interlogger (process changed the name)
- moving pidfiles rather in postinstall scripts (deb, rpm)
- rpm:
  - proper /var/lock/subsys location in legacy script glite-lb-locallogger
  - use pidfiles to kill (there were problems with shutting down bkserver)
- deb:
 - better info messages when startup is disabled
- always use distro-specific startup scripts (package-less deployment)

diff --git a/org.glite.lb.harvester/Makefile b/org.glite.lb.harvester/Makefile
index 32c736d..a2fa674 100644 (file)
--- a/org.glite.lb.harvester/Makefile
+++ b/org.glite.lb.harvester/Makefile
@@ -102,12 +102,17 @@ install: compile
        ${INSTALL} -m 444 ${top_srcdir}/examples/test.sql ${DESTDIR}${PREFIX}${prefix}/share/glite/glite-lb-harvester-test-dbsetup.sql
        ${INSTALL} -m 444 ${top_srcdir}/doc/README ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version}
        ${INSTALL} -m 444 glite-lb-harvester.1 ${DESTDIR}${PREFIX}${prefix}/share/man/man1
+ifeq ($(os_type),redhat)
+       mkdir -p ${DESTDIR}${PREFIX}${sysconfdir}/rc.d/init.d
+       ${INSTALL} -m 755 ${top_srcdir}/config/startup.redhat.harvester ${DESTDIR}${PREFIX}${sysconfdir}/rc.d/init.d/glite-lb-harvester
+endif
 ifeq ($(os_type),fedora)
        mkdir -p ${DESTDIR}${PREFIX}${unitdir}
        ${INSTALL} -m 644 ${top_srcdir}/config/systemd.harvester ${DESTDIR}${PREFIX}${unitdir}/glite-lb-harvester.service
-else
+endif
+ifeq ($(os_type),debian)
        mkdir -p ${DESTDIR}${PREFIX}${sysconfdir}/init.d
-       ${INSTALL} -m 755 startup ${DESTDIR}${PREFIX}${sysconfdir}/init.d/glite-lb-harvester
+       ${INSTALL} -m 755 ${top_srcdir}/config/startup.debian.harvester ${DESTDIR}${PREFIX}${sysconfdir}/init.d/glite-lb-harvester
 endif
 
 clean:

diff --git a/org.glite.lb.harvester/config/startup b/org.glite.lb.harvester/config/startup
index 7dfa27b..9bbdb0d 100755 (executable)
--- a/org.glite.lb.harvester/config/startup
+++ b/org.glite.lb.harvester/config/startup
@@ -196,8 +196,8 @@ cleanup()
        fi
 }
 
-# upgrade from L&B <= 4.0.1
-if [ -f /var/glite/glite-lb-harvester.pid -a ! -f $pidfile ]; then mv /var/glite/glite-lb-harvester.pid /var/run/glite 2>/dev/null; fi
+# upgrade from lb.harvester <= 1.3.4 (L&B <= 4.0.1)
+if [ -f /var/glite/glite-lb-harvester.pid -a ! -f $pidfile ]; then cp -vp /var/glite/glite-lb-harvester.pid /var/run/glite; fi
 
 case x$1 in
        xstart) start;;

diff --git a/org.glite.lb.harvester/config/startup.redhat.harvester b/org.glite.lb.harvester/config/startup.redhat.harvester
index 939926c..5e41c80 100755 (executable)
--- a/org.glite.lb.harvester/config/startup.redhat.harvester
+++ b/org.glite.lb.harvester/config/startup.redhat.harvester
@@ -69,7 +69,7 @@ start() {
 
 stop() {
        echo -n "Shutting down $prog: "
-       killproc $prog
+       killproc -p /var/run/glite/glite-lb-harvester.pid $prog
        retval=$?
        echo
        [ $retval -eq 0 ] && rm -f $lockfile

diff --git a/org.glite.lb.harvester/project/debian.postinst b/org.glite.lb.harvester/project/debian.postinst
new file mode 100644 (file)
index 0000000..27eb5b0
--- /dev/null
+++ b/org.glite.lb.harvester/project/debian.postinst
@@ -0,0 +1,7 @@
+#!/bin/sh
+set -e
+
+# upgrade from L&B harvester <= 1.3.4 (L&B <= 4.0.1)
+[ -f /var/glite/glite-lb-harvester.pid -a ! -f /var/run/glite/glite-lb-harvester.pid ] && cp -pv /var/glite/glite-lb-harvester.pid /var/run/glite/ || :
+
+#DEBHELPER#

diff --git a/org.glite.lb.harvester/project/glite-lb-harvester.spec b/org.glite.lb.harvester/project/glite-lb-harvester.spec
index bfcbad4..e6695d2 100644 (file)
--- a/org.glite.lb.harvester/project/glite-lb-harvester.spec
+++ b/org.glite.lb.harvester/project/glite-lb-harvester.spec
@@ -60,10 +60,6 @@ mkdir -p ${RPM_BUILD_ROOT}%{_prefix}/lib/tmpfiles.d
 cat > ${RPM_BUILD_ROOT}%{_prefix}/lib/tmpfiles.d/glite-lb-harvester.conf <<EOF
 d %{_localstatedir}/run/glite 0755 glite glite -
 EOF
-%else
-rm -rf $RPM_BUILD_ROOT/etc/init.d
-mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
-install -m 0755 config/startup.redhat.harvester $RPM_BUILD_ROOT/etc/rc.d/init.d/glite-lb-harvester
 %endif
 find $RPM_BUILD_ROOT -name '*' -print | xargs -I {} -i bash -c "chrpath -d {} > /dev/null 2>&1" || echo 'Stripped RPATH'
 mkdir -p $RPM_BUILD_ROOT/var/lib/glite
@@ -92,6 +88,9 @@ fi
 if [ $1 -eq 1 ] ; then
        /sbin/chkconfig glite-lb-harvester off
 fi
+
+# upgrade from L&B harvester <= 1.3.4 (L&B <= 4.0.1)
+[ -f /var/glite/glite-lb-harvester.pid -a ! -f /var/run/glite/glite-lb-harvester.pid ] && cp -pv /var/glite/glite-lb-harvester.pid /var/run/glite/ || :
 %endif
 
 

diff --git a/org.glite.lb.logger/Makefile b/org.glite.lb.logger/Makefile
index 6ee36b6..df6ab6d 100644 (file)
--- a/org.glite.lb.logger/Makefile
+++ b/org.glite.lb.logger/Makefile
@@ -241,15 +241,25 @@ ifdef LB_PERF
 endif
        ( cd ${top_srcdir}/interface && ${INSTALL} -m 644 ${HDRS} ${DESTDIR}${PREFIX}${prefix}/include/${globalprefix}/${lbprefix} )
        ${INSTALL} -m 644 ${MAN_GZ} ${DESTDIR}${PREFIX}${prefix}/share/man/man8
+ifeq ($(os_type),redhat)
+       mkdir -p ${DESTDIR}${PREFIX}${sysconfdir}/rc.d/init.d
+       ${INSTALL} -m 755 startup ${DESTDIR}${PREFIX}${sysconfdir}/rc.d/init.d/glite-lb-locallogger
+       for d in logd interlogd notif-interlogd proxy-interlogd; do \
+               ${INSTALL} -m 755 ${top_srcdir}/config/startup.redhat.$$d ${DESTDIR}${PREFIX}${sysconfdir}/rc.d/init.d/glite-lb-$$d; \
+       done
+endif
 ifeq ($(os_type),fedora)
        mkdir -p ${DESTDIR}${PREFIX}${unitdir}
-       install -m 644 ${top_srcdir}/config/systemd.logd ${DESTDIR}${PREFIX}${unitdir}/glite-lb-logd.service
-       install -m 644 ${top_srcdir}/config/systemd.interlogd ${DESTDIR}${PREFIX}${unitdir}/glite-lb-interlogd.service
-       install -m 644 ${top_srcdir}/config/systemd.notif-interlogd ${DESTDIR}${PREFIX}${unitdir}/glite-lb-notif-interlogd.service
-       install -m 644 ${top_srcdir}/config/systemd.proxy-interlogd ${DESTDIR}${PREFIX}${unitdir}/glite-lb-proxy-interlogd.service
-else
-       -mkdir -p ${DESTDIR}${PREFIX}${sysconfdir}/init.d
+       for d in logd interlogd notif-interlogd proxy-interlogd; do \
+               install -m 644 ${top_srcdir}/config/systemd.$$d ${DESTDIR}${PREFIX}${unitdir}/glite-lb-$$d.service ; \
+       done
+endif
+ifeq ($(os_type),debian)
+       mkdir -p ${DESTDIR}${PREFIX}${sysconfdir}/init.d
        ${INSTALL} -m 755 startup ${DESTDIR}${PREFIX}${sysconfdir}/init.d/glite-lb-locallogger
+       for d in logd interlogd notif-interlogd proxy-interlogd; do \
+               ${INSTALL} -m 755 ${top_srcdir}/config/startup.debian.$$d ${DESTDIR}${PREFIX}${sysconfdir}/init.d/glite-lb-$$d ; \
+       done
 endif
 
 ${INTERLOG_NOTIF_OBJS}: %.notif.lo: %.c

diff --git a/org.glite.lb.logger/config/startup b/org.glite.lb.logger/config/startup
index 55ac860..d53b541 100755 (executable)
--- a/org.glite.lb.logger/config/startup
+++ b/org.glite.lb.logger/config/startup
@@ -197,9 +197,9 @@ status()
        return $retval
 }
 
-# upgrade from L&B <= 4.0.1
-if [ -f /var/glite/glite-lb-logd.pid -a ! -f $LL_PIDFILE ]; then mv /var/glite/glite-lb-logd.pid /var/run/glite 2>/dev/null; fi
-if [ -f /var/glite/glite-lb-interlogd.pid -a ! -f $IL_PIDFILE ]; then mv /var/glite/glite-lb-interlogd.pid /var/run/glite 2>/dev/null; fi
+# upgrade from lb.logger <= 2.4.10 (L&B <= 4.0.1)
+if [ -f /var/glite/glite-lb-logd.pid -a ! -f $LL_PIDFILE ]; then cp -vp /var/glite/glite-lb-logd.pid /var/run/glite; fi
+if [ -f /var/glite/glite-lb-interlogd.pid -a ! -f $IL_PIDFILE ]; then cp -vp /var/glite/glite-lb-interlogd.pid /var/run/glite; fi
 
 case x$1 in
        xstart) start;;

diff --git a/org.glite.lb.logger/config/startup.debian.interlogd b/org.glite.lb.logger/config/startup.debian.interlogd
index 7ecde98..2e9b254 100755 (executable)
--- a/org.glite.lb.logger/config/startup.debian.interlogd
+++ b/org.glite.lb.logger/config/startup.debian.interlogd
@@ -41,7 +41,7 @@ if [ "x$RUN_IL" != "xyes" ]; then
        echo "$DESC disabled."
        echo "For automatic configuration, please run glite-lb-setup script."
        echo "When configuring L&B manually, please also set RUN_IL to 'yes' in"
-       echo "/etc/default/glite-lb."
+       echo "/etc/default/glite-lb or /etc/default/glite-lb-interlogd."
        exit 0
 fi
 
@@ -79,9 +79,6 @@ do_stop()
        return "$RETVAL"
 }
 
-# upgrade from L&B <= 4.0.1
-[ -f /var/glite/glite-lb-interlogd.pid -a ! -f $PIDFILE ] && mv -v /var/glite/glite-lb-interlogd.pid /var/run/glite
-
 case "$1" in
   start)
        [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"

diff --git a/org.glite.lb.logger/config/startup.debian.logd b/org.glite.lb.logger/config/startup.debian.logd
index e7917fa..8114a6e 100755 (executable)
--- a/org.glite.lb.logger/config/startup.debian.logd
+++ b/org.glite.lb.logger/config/startup.debian.logd
@@ -76,9 +76,6 @@ do_stop()
        return "$RETVAL"
 }
 
-# upgrade from L&B <= 4.0.1
-[ -f /var/glite/glite-lb-logd.pid -a ! -f $PIDFILE ] && mv -v /var/glite/glite-lb-logd.pid /var/run/glite
-
 case "$1" in
   start)
        [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"

diff --git a/org.glite.lb.logger/config/startup.debian.notif-interlogd b/org.glite.lb.logger/config/startup.debian.notif-interlogd
index 4337616..f81620a 100755 (executable)
--- a/org.glite.lb.logger/config/startup.debian.notif-interlogd
+++ b/org.glite.lb.logger/config/startup.debian.notif-interlogd
@@ -76,9 +76,6 @@ do_stop()
        return "$RETVAL"
 }
 
-# upgrade from L&B <= 4.0.1
-[ -f /var/glite/glite-lb-notif-interlogd.pid -a ! -f $PIDFILE ] && mv -v /var/glite/glite-lb-notif-interlogd.pid /var/run/glite
-
 case "$1" in
   start)
        [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"

diff --git a/org.glite.lb.logger/config/startup.debian.proxy-interlogd b/org.glite.lb.logger/config/startup.debian.proxy-interlogd
index 6d81e1b..6e0a3ad 100755 (executable)
--- a/org.glite.lb.logger/config/startup.debian.proxy-interlogd
+++ b/org.glite.lb.logger/config/startup.debian.proxy-interlogd
@@ -56,6 +56,14 @@ do_start()
                echo "$0: WARNING: No credentials specified." >&2
        fi
 
+       # upgrade from L&B <= 4.0.1 (renamed process name)
+       oldpidfile=/var/glite/glite-lb-proxy-interlogd.pid
+       oldprog=glite-lb-interlogd
+       if [ -f $oldpidfile ]; then
+               log_daemon_msg "Shutting down old $DESC" "$oldprog"
+               killproc -p $oldpidfile $oldprog
+       fi
+
        start-stop-daemon --start --quiet --pidfile $PIDFILE \
                --chuid $GLITE_USER --exec $DAEMON --test > /dev/null \
                || return 1
@@ -76,9 +84,6 @@ do_stop()
        return "$RETVAL"
 }
 
-# upgrade from L&B <= 4.0.1
-[ -f /var/glite/glite-lb-proxy-interlogd.pid -a ! -f $PIDFILE ] && mv -v /var/glite/glite-lb-proxy-interlogd.pid /var/run/glite
-
 case "$1" in
   start)
        [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"

diff --git a/org.glite.lb.logger/config/startup.redhat.interlogd b/org.glite.lb.logger/config/startup.redhat.interlogd
index e0dd46a..a1b478f 100755 (executable)
--- a/org.glite.lb.logger/config/startup.redhat.interlogd
+++ b/org.glite.lb.logger/config/startup.redhat.interlogd
@@ -65,16 +65,13 @@ start() {
 
 stop() {
        echo -n "Shutting down $prog: "
-       killproc $prog
+       killproc -p /var/run/glite/glite-lb-interlogd.pid $prog
        retval=$?
        echo
        [ $retval -eq 0 ] && rm -f $lockfile
        return $retval
 }
 
-# upgrade from L&B <= 4.0.1
-[ -f /var/glite/glite-lb-interlogd.pid -a ! -f /var/run/glite/glite-lb-interlogd.pid ] && mv -v /var/glite/glite-lb-interlogd.pid /var/run/glite
-
 case "$1" in
     start)
        status $prog >/dev/null 2>&1 && exit 0

diff --git a/org.glite.lb.logger/config/startup.redhat.logd b/org.glite.lb.logger/config/startup.redhat.logd
index d00eda0..61f0ba4 100755 (executable)
--- a/org.glite.lb.logger/config/startup.redhat.logd
+++ b/org.glite.lb.logger/config/startup.redhat.logd
@@ -65,16 +65,13 @@ start() {
 
 stop() {
        echo -n "Shutting down $prog: "
-       killproc $prog
+       killproc -p /var/run/glite/glite-lb-logd.pid $prog
        retval=$?
        echo
        [ $retval -eq 0 ] && rm -f $lockfile
        return $retval
 }
 
-# upgrade from L&B <= 4.0.1
-[ -f /var/glite/glite-lb-logd.pid -a ! -f /var/run/glite/glite-lb-logd.pid ] && mv -v /var/glite/glite-lb-logd.pid /var/run/glite
-
 case "$1" in
     start)
        status $prog >/dev/null 2>&1 && exit 0

diff --git a/org.glite.lb.logger/config/startup.redhat.notif-interlogd b/org.glite.lb.logger/config/startup.redhat.notif-interlogd
index 2f6dd3f..44d1329 100755 (executable)
--- a/org.glite.lb.logger/config/startup.redhat.notif-interlogd
+++ b/org.glite.lb.logger/config/startup.redhat.notif-interlogd
@@ -65,16 +65,13 @@ start() {
 
 stop() {
        echo -n "Shutting down $prog: "
-       killproc $prog
+       killproc -p /var/run/glite/glite-lb-notif-interlogd.pid $prog
        retval=$?
        echo
        [ $retval -eq 0 ] && rm -f $lockfile
        return $retval
 }
 
-# upgrade from L&B <= 4.0.1
-[ -f /var/glite/glite-lb-notif-interlogd.pid -a ! -f /var/run/glite/glite-lb-notif-interlogd.pid ] && mv -v /var/glite/glite-lb-notif-interlogd.pid /var/run/glite
-
 case "$1" in
     start)
        status $prog >/dev/null 2>&1 && exit 0

diff --git a/org.glite.lb.logger/config/startup.redhat.proxy-interlogd b/org.glite.lb.logger/config/startup.redhat.proxy-interlogd
index 41103df..c449c15 100755 (executable)
--- a/org.glite.lb.logger/config/startup.redhat.proxy-interlogd
+++ b/org.glite.lb.logger/config/startup.redhat.proxy-interlogd
@@ -55,6 +55,14 @@ start() {
                echo "$0: WARNING: No credentials specified." >&2
        fi
 
+       # upgrade from L&B <= 4.0.1 (renamed process name)
+       oldpidfile=/var/glite/glite-lb-proxy-interlogd.pid
+       oldprog=glite-lb-interlogd
+       if [ -f $oldpidfile ]; then
+               echo -n "Shutting down $oldprog for proxy: "
+               killproc -p $oldpidfile $oldprog
+       fi
+
        echo -n "Starting $prog: "
        daemon --user $GLITE_USER $env $exec $GLITE_LB_PROXY_IL_OPTIONS
        retval=$?
@@ -65,16 +73,13 @@ start() {
 
 stop() {
        echo -n "Shutting down $prog: "
-       killproc $prog
+       killproc -p /var/run/glite/glite-lb-proxy-interlogd.pid $prog
        retval=$?
        echo
        [ $retval -eq 0 ] && rm -f $lockfile
        return $retval
 }
 
-# upgrade from L&B <= 4.0.1
-[ -f /var/glite/glite-lb-proxy-interlogd.pid -a ! -f /var/run/glite/glite-lb-proxy-interlogd.pid ] && mv -v /var/glite/glite-lb-proxy-interlogd.pid /var/run/glite
-
 case "$1" in
     start)
        status $prog >/dev/null 2>&1 && exit 0

diff --git a/org.glite.lb.logger/project/debian.postinst b/org.glite.lb.logger/project/debian.postinst
new file mode 100644 (file)
index 0000000..d3768d6
--- /dev/null
+++ b/org.glite.lb.logger/project/debian.postinst
@@ -0,0 +1,10 @@
+#!/bin/sh
+set -e
+
+# upgrade from L&B <= 4.0.1
+for i in logd interlogd notif-interlogd proxy-interlogd; do
+  [ -f /var/glite/glite-lb-$i.pid -a ! -f /var/run/glite/glite-lb-$i.pid ] && cp -pv /var/glite/glite-lb-$i.pid /var/run/glite/
+done
+:
+
+#DEBHELPER#

diff --git a/org.glite.lb.logger/project/debian.rules b/org.glite.lb.logger/project/debian.rules
index 9793be4..243755b 100644 (file)
--- a/org.glite.lb.logger/project/debian.rules
+++ b/org.glite.lb.logger/project/debian.rules
@@ -45,10 +45,10 @@ install: build-stamp
        mkdir -p debian/$(p_dev)/usr/share/doc
        ln -s $(p_base) debian/$(p_dbg)/usr/share/doc/$(p_dbg)
        ln -s $(p_base) debian/$(p_dev)/usr/share/doc/$(p_dev)
-       cp -p config/startup.debian.logd debian/glite-lb-logd.init
-       cp -p config/startup.debian.interlogd debian/glite-lb-interlogd.init
-       cp -p config/startup.debian.notif-interlogd debian/glite-lb-notif-interlogd.init
-       cp -p config/startup.debian.proxy-interlogd debian/glite-lb-proxy-interlogd.init
+       for d in logd interlogd notif-interlogd proxy-interlogd; do \
+               rm debian/tmp/etc/init.d/glite-lb-$$d; \
+               cp -p config/startup.debian.$$d debian/glite-lb-$$d.init; \
+       done
 
 binary-indep:
 

diff --git a/org.glite.lb.logger/project/glite-lb-logger.spec b/org.glite.lb.logger/project/glite-lb-logger.spec
index e50ce1c..7d930b9 100644 (file)
--- a/org.glite.lb.logger/project/glite-lb-logger.spec
+++ b/org.glite.lb.logger/project/glite-lb-logger.spec
@@ -69,11 +69,7 @@ cat > ${RPM_BUILD_ROOT}%{_prefix}/lib/tmpfiles.d/glite-lb-logger.conf <<EOF
 d %{_localstatedir}/run/glite 0755 glite glite -
 EOF
 %else
-mkdir $RPM_BUILD_ROOT/etc/rc.d
-mv $RPM_BUILD_ROOT/etc/init.d $RPM_BUILD_ROOT/etc/rc.d
-for i in logd interlogd notif-interlogd proxy-interlogd; do
-       install -m 0755 config/startup.redhat.$i $RPM_BUILD_ROOT/etc/rc.d/init.d/glite-lb-$i
-done
+sed -i 's,\(lockfile=/var/lock\),\1/subsys,' $RPM_BUILD_ROOT/etc/rc.d/init.d/glite-lb-locallogger
 %endif
 find $RPM_BUILD_ROOT -name '*' -print | xargs -I {} -i bash -c "chrpath -d {} > /dev/null 2>&1" || echo 'Stripped RPATH'
 mkdir -p $RPM_BUILD_ROOT/var/lib/glite
@@ -108,12 +104,23 @@ fi
 /sbin/chkconfig --add glite-lb-interlogd
 /sbin/chkconfig --add glite-lb-notif-interlogd
 /sbin/chkconfig --add glite-lb-proxy-interlogd
+
 if [ $1 -eq 1 ] ; then
-       /sbin/chkconfig glite-lb-logd off
-       /sbin/chkconfig glite-lb-interlogd off
-       /sbin/chkconfig glite-lb-notif-interlogd off
-       /sbin/chkconfig glite-lb-proxy-interlogd off
+  /sbin/chkconfig glite-lb-logd off
+  /sbin/chkconfig glite-lb-interlogd off
+  /sbin/chkconfig glite-lb-notif-interlogd off
+  /sbin/chkconfig glite-lb-proxy-interlogd off
 fi
+
+# upgrade from lb.logger <= 2.4.10 (L&B <= 4.0.1)
+for i in logd interlogd notif-interlogd proxy-interlogd; do
+  [ -f /var/glite/glite-lb-$i.pid -a ! -f /var/run/glite/glite-lb-$i.pid ] && cp -pv /var/glite/glite-lb-$i.pid /var/run/glite/ || :
+done
+
+# upgrade from lb.logger <= 2.4.15 (L&B <= 4.0.4)
+/sbin/chkconfig --del glite-lb-locallogger
+# notif and proxy interlogd deamons won't be restarted when upgrading from
+# L&B 4.0.4 (startup moved from lb.server to lb.logger)
 %endif
 
 
@@ -168,9 +175,6 @@ if [ "$1" -ge "1" ] ; then
     /sbin/service glite-lb-interlogd condrestart >/dev/null 2>&1 || :
     /sbin/service glite-lb-notif-interlogd condrestart >/dev/null 2>&1 || :
     /sbin/service glite-lb-proxy-interlogd condrestart >/dev/null 2>&1 || :
-
-    # upgrade from lb.logger <= 2.4.15 (L&B <= 4.0.4)
-    /sbin/chkconfig --del glite-lb-locallogger
 fi
 %endif
 

diff --git a/org.glite.lb.server/Makefile b/org.glite.lb.server/Makefile
index ba9fdf8..c6dff8a 100644 (file)
--- a/org.glite.lb.server/Makefile
+++ b/org.glite.lb.server/Makefile
@@ -470,12 +470,17 @@ install:
 ifdef LB_PERF
        ${INSTALL} -m 755 ${top_srcdir}/src/perftest_proxy.sh ${DESTDIR}${PREFIX}${prefix}/sbin
 endif
+ifeq ($(os_type),redhat)
+       mkdir -p ${DESTDIR}${PREFIX}${sysconfdir}/rc.d/init.d
+       ${INSTALL} -m 755 ${top_srcdir}/config/startup.redhat.bkserverd ${DESTDIR}${PREFIX}${sysconfdir}/rc.d/init.d/glite-lb-bkserverd
+endif
 ifeq ($(os_type),fedora)
        mkdir -p ${DESTDIR}${PREFIX}${unitdir}
        install -m 644 ${top_srcdir}/config/systemd.bkserverd ${DESTDIR}${PREFIX}${unitdir}/glite-lb-bkserverd.service
-else
+endif
+ifeq ($(os_type),debian)
        mkdir -p ${DESTDIR}${PREFIX}${sysconfdir}/init.d
-       ${INSTALL} -m 755 startup ${DESTDIR}${PREFIX}${sysconfdir}/init.d/glite-lb-bkserverd
+       ${INSTALL} -m 755 ${top_srcdir}/config/startup.debian.bkserverd ${DESTDIR}${PREFIX}${sysconfdir}/init.d/glite-lb-bkserverd
 endif
 
 clean:

diff --git a/org.glite.lb.server/config/startup b/org.glite.lb.server/config/startup
index b41835d..501b581 100755 (executable)
--- a/org.glite.lb.server/config/startup
+++ b/org.glite.lb.server/config/startup
@@ -324,10 +324,10 @@ status()
        return $retval
 }
 
-# upgrade from L&B <= 4.0.1
-if [ -f /var/glite/glite-lb-bkserverd.pid -a ! -f $BK_PIDFILE ]; then mv /var/glite/glite-lb-bkserverd.pid /var/run/glite 2>/dev/null; fi
-if [ -f /var/glite/glite-lb-notif-interlogd.pid -a ! -f $NOTIF_IL_PIDFILE ]; then mv /var/glite/glite-lb-notif-interlogd.pid /var/run/glite 2>/dev/null; fi
-if [ -f /var/glite/glite-lb-proxy-interlogd.pid -a ! -f $PROXY_IL_PIDFILE ]; then mv /var/glite/glite-lb-proxy-interlogd.pid /var/run/glite 2>/dev/null; fi
+# upgrade from lb.server <= 3.0.1 (L&B <= 4.0.1)
+if [ -f /var/glite/glite-lb-bkserverd.pid -a ! -f $BK_PIDFILE ]; then cp -vp /var/glite/glite-lb-bkserverd.pid /var/run/glite; fi
+if [ -f /var/glite/glite-lb-notif-interlogd.pid -a ! -f $NOTIF_IL_PIDFILE ]; then cp -vp /var/glite/glite-lb-notif-interlogd.pid /var/run/glite; fi
+if [ -f /var/glite/glite-lb-proxy-interlogd.pid -a ! -f $PROXY_IL_PIDFILE ]; then cp -vp /var/glite/glite-lb-proxy-interlogd.pid /var/run/glite; fi
 
 case x$1 in
        xstart) start;;

diff --git a/org.glite.lb.server/config/startup.debian.bkserverd b/org.glite.lb.server/config/startup.debian.bkserverd
index aaf96a2..796598c 100755 (executable)
--- a/org.glite.lb.server/config/startup.debian.bkserverd
+++ b/org.glite.lb.server/config/startup.debian.bkserverd
@@ -41,7 +41,7 @@ if [ "x$RUN_SERVER" != "xyes" ]; then
        echo "$DESC disabled."
        echo "For automatic configuration, please run glite-lb-setup script."
        echo "When configuring L&B manually, please also set RUN_SERVER to 'yes' in"
-       echo "/etc/default/glite-lb."
+       echo "/etc/default/glite-lb or /etc/default/glite-lb-bkserverd."
        exit 0
 fi
 
@@ -93,9 +93,6 @@ do_stop()
        return "$RETVAL"
 }
 
-# upgrade from L&B <= 4.0.1
-[ -f /var/glite/glite-lb-bkserverd.pid -a ! -f $PIDFILE ] && mv -v /var/glite/glite-lb-bkserverd.pid /var/run/glite
-
 case "$1" in
   start)
        [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"

diff --git a/org.glite.lb.server/config/startup.redhat.bkserverd b/org.glite.lb.server/config/startup.redhat.bkserverd
index e9a55f5..6cf1a4b 100755 (executable)
--- a/org.glite.lb.server/config/startup.redhat.bkserverd
+++ b/org.glite.lb.server/config/startup.redhat.bkserverd
@@ -77,12 +77,9 @@ start() {
        return $retval
 }
 
-# upgrade from L&B <= 4.0.1
-[ -f /var/glite/glite-lb-bkserverd.pid -a ! -f /var/run/glite/glite-lb-bkserverd.pid ] && mv -v /var/glite/glite-lb-bkserverd.pid /var/run/glite
-
 stop() {
        echo -n "Shutting down $prog: "
-       killproc $prog
+       killproc -p /var/run/glite/glite-lb-bkserverd.pid $prog
        retval=$?
        echo
        [ $retval -eq 0 ] && rm -f $lockfile

diff --git a/org.glite.lb.server/project/debian.postinst b/org.glite.lb.server/project/debian.postinst
new file mode 100644 (file)
index 0000000..d27c540
--- /dev/null
+++ b/org.glite.lb.server/project/debian.postinst
@@ -0,0 +1,7 @@
+#!/bin/sh
+set -e
+
+# upgrade from L&B server <= 3.0.1 (L&B <= 4.0.1)
+[ -f /var/glite/glite-lb-bkserverd.pid -a ! -f /var/run/glite/glite-lb-bkserverd.pid ] && cp -pv /var/glite/glite-lb-bkserverd.pid /var/run/glite/ || :
+
+#DEBHELPER#

diff --git a/org.glite.lb.server/project/debian.rules b/org.glite.lb.server/project/debian.rules
index 5d2844e..14af127 100644 (file)
--- a/org.glite.lb.server/project/debian.rules
+++ b/org.glite.lb.server/project/debian.rules
@@ -46,7 +46,7 @@ install: build-stamp
        mv debian/tmp/usr/share/doc/glite-lb-server-@MAJOR@.@MINOR@.@REVISION@ debian/$(p_base)/usr/share/doc/$(p_base)
        mkdir -p debian/$(p_dbg)/usr/share/doc
        ln -s $(p_base) debian/$(p_dbg)/usr/share/doc/$(p_dbg)
-       rm debian/tmp/etc/init.d/glite-lb-bkserverd
+       rm -rf debian/tmp/etc/init.d
        cp -p config/startup.debian.bkserverd debian/glite-lb-bkserverd.init
 
 binary-indep:

diff --git a/org.glite.lb.server/project/glite-lb-server.spec b/org.glite.lb.server/project/glite-lb-server.spec
index d3bd814..7053d4b 100644 (file)
--- a/org.glite.lb.server/project/glite-lb-server.spec
+++ b/org.glite.lb.server/project/glite-lb-server.spec
@@ -85,10 +85,6 @@ mkdir -p ${RPM_BUILD_ROOT}%{_prefix}/lib/tmpfiles.d
 cat > ${RPM_BUILD_ROOT}%{_prefix}/lib/tmpfiles.d/glite-lb-server.conf <<EOF
 d %{_localstatedir}/run/glite 0755 glite glite -
 EOF
-%else
-rm -rf $RPM_BUILD_ROOT/etc/init.d
-mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
-install -m 0755 config/startup.redhat.bkserverd $RPM_BUILD_ROOT/etc/rc.d/init.d/glite-lb-bkserverd
 %endif
 install -m 0644 LICENSE project/ChangeLog $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -rf {} \;
@@ -125,6 +121,9 @@ fi
 if [ $1 -eq 1 ] ; then
        /sbin/chkconfig glite-lb-bkserverd off
 fi
+
+# upgrade from lb.server <= 3.0.1 (L&B <= 4.0.1)
+[ -f /var/glite/glite-lb-bkserverd.pid -a ! -f /var/run/glite/glite-lb-bkserverd.pid ] && cp -pv /var/glite/glite-lb-bkserverd.pid /var/run/glite/ || :
 %endif