commit c7413aecf85150c43523df8b52ad429d682e2ce2 Author: František Dvořák Date: Sat Dec 7 22:26:13 2013 +0100 Move daemons from bin to sbin. diff --git a/org.glite.lb.logger/Makefile b/org.glite.lb.logger/Makefile index 6b125de..3b33067 100644 --- a/org.glite.lb.logger/Makefile +++ b/org.glite.lb.logger/Makefile @@ -225,17 +225,17 @@ check.il: ${INTERLOG_TEST_OBJS} ${LINKXX} -o $@ ${COMMON_LIB}${default_thrflavour} ${CPPUNIT_LIBS} ${GLITE_GSS_LIB} -lglite_jobid -lpthread ${DL_LIBS} $+ install: - -mkdir -p ${DESTDIR}${PREFIX}${prefix}/bin + -mkdir -p ${DESTDIR}${PREFIX}${prefix}/sbin -mkdir -p ${DESTDIR}${PREFIX}${prefix}/share/man/man8 -mkdir -p ${DESTDIR}${PREFIX}${prefix}/include/glite/lb -mkdir -p ${DESTDIR}${PREFIX}${prefix}/share/glite-lb-logger -mkdir -p -m 0775 ${DESTDIR}${PREFIX}/var/spool/glite/lb-locallogger -mkdir -p -m 0755 ${DESTDIR}${PREFIX}/var/spool/glite/lb-notif -mkdir -p -m 0755 ${DESTDIR}${PREFIX}/var/spool/glite/lb-proxy - ${INSTALL} -m 755 ${LOGD} ${DESTDIR}${PREFIX}${prefix}/bin - ${INSTALL} -m 755 ${INTERLOGD} ${DESTDIR}${PREFIX}${prefix}/bin - ${INSTALL} -m 755 ${NOTIF_INTERLOGD} ${DESTDIR}${PREFIX}${prefix}/bin - ${INSTALL} -m 755 ${INTERLOGD} ${DESTDIR}${PREFIX}${prefix}/bin/glite-lb-proxy-interlogd + ${INSTALL} -m 755 ${LOGD} ${DESTDIR}${PREFIX}${prefix}/sbin + ${INSTALL} -m 755 ${INTERLOGD} ${DESTDIR}${PREFIX}${prefix}/sbin + ${INSTALL} -m 755 ${NOTIF_INTERLOGD} ${DESTDIR}${PREFIX}${prefix}/sbin + ${INSTALL} -m 755 ${INTERLOGD} ${DESTDIR}${PREFIX}${prefix}/sbin/glite-lb-proxy-interlogd ${INSTALL} -m 755 ${top_srcdir}/src/lb_krb_ticket.sh ${DESTDIR}${PREFIX}${prefix}/share/glite-lb-logger ifdef LB_PERF -mkdir -p ${DESTDIR}${PREFIX}${prefix}/sbin diff --git a/org.glite.lb.logger/config/startup b/org.glite.lb.logger/config/startup index 030eb6d..261c086 100755 --- a/org.glite.lb.logger/config/startup +++ b/org.glite.lb.logger/config/startup @@ -148,10 +148,10 @@ start() [ -n "$GLITE_LB_IL_FPREFIX" ] && fprefix="--file-prefix $GLITE_LB_IL_FPREFIX" (cd /tmp && ls -f /tmp |grep ^dglogd_sock_ |xargs rm -f) - start_daemon "glite-lb-logd" "$LL_PIDFILE" "$GLITE_LOCATION/bin/glite-lb-logd \ + start_daemon "glite-lb-logd" "$LL_PIDFILE" "$GLITE_LOCATION/sbin/glite-lb-logd \ -i $LL_PIDFILE $port $sock $fprefix" - start_daemon "glite-lb-interlogd" "$IL_PIDFILE" "$GLITE_LOCATION/bin/glite-lb-interlogd \ + start_daemon "glite-lb-interlogd" "$IL_PIDFILE" "$GLITE_LOCATION/sbin/glite-lb-interlogd \ -i $IL_PIDFILE $sock $fprefix" "${GLITE_LB_IL_SOCK:-$IL_SOCKFILE}" } diff --git a/org.glite.lb.logger/config/startup.redhat.interlogd b/org.glite.lb.logger/config/startup.redhat.interlogd index 4e2d74d..5ec0825 100755 --- a/org.glite.lb.logger/config/startup.redhat.interlogd +++ b/org.glite.lb.logger/config/startup.redhat.interlogd @@ -23,7 +23,7 @@ . /etc/init.d/functions prog=glite-lb-interlogd -exec=/usr/bin/$prog +exec=/usr/sbin/$prog lockfile=/var/lock/subsys/$prog GLITE_USER='glite' diff --git a/org.glite.lb.logger/config/startup.redhat.logd b/org.glite.lb.logger/config/startup.redhat.logd index 61f0ba4..8059e54 100755 --- a/org.glite.lb.logger/config/startup.redhat.logd +++ b/org.glite.lb.logger/config/startup.redhat.logd @@ -23,7 +23,7 @@ . /etc/init.d/functions prog=glite-lb-logd -exec=/usr/bin/$prog +exec=/usr/sbin/$prog lockfile=/var/lock/subsys/$prog GLITE_USER='glite' diff --git a/org.glite.lb.logger/config/startup.redhat.notif-interlogd b/org.glite.lb.logger/config/startup.redhat.notif-interlogd index 09bb7a2..9267180 100755 --- a/org.glite.lb.logger/config/startup.redhat.notif-interlogd +++ b/org.glite.lb.logger/config/startup.redhat.notif-interlogd @@ -23,7 +23,7 @@ . /etc/init.d/functions prog=glite-lb-notif-interlogd -exec=/usr/bin/$prog +exec=/usr/sbin/$prog lockfile=/var/lock/subsys/$prog GLITE_USER='glite' diff --git a/org.glite.lb.logger/config/startup.redhat.proxy-interlogd b/org.glite.lb.logger/config/startup.redhat.proxy-interlogd index 8e52a11..f1edc93 100755 --- a/org.glite.lb.logger/config/startup.redhat.proxy-interlogd +++ b/org.glite.lb.logger/config/startup.redhat.proxy-interlogd @@ -23,7 +23,7 @@ . /etc/init.d/functions prog=glite-lb-proxy-interlogd -exec=/usr/bin/$prog +exec=/usr/sbin/$prog lockfile=/var/lock/subsys/$prog GLITE_USER='glite' diff --git a/org.glite.lb.logger/config/systemd.interlogd b/org.glite.lb.logger/config/systemd.interlogd index ca10f52..eeae11e 100644 --- a/org.glite.lb.logger/config/systemd.interlogd +++ b/org.glite.lb.logger/config/systemd.interlogd @@ -15,7 +15,7 @@ EnvironmentFile=-/etc/profile.d/grid-env.sh EnvironmentFile=-/etc/sysconfig/glite-lb EnvironmentFile=-/etc/sysconfig/glite-lb-interlogd PIDFile=/var/run/glite/glite-lb-interlogd.pid -ExecStart=/usr/bin/glite-lb-interlogd $GLITE_LB_IL_OPTIONS +ExecStart=/usr/sbin/glite-lb-interlogd $GLITE_LB_IL_OPTIONS [Install] WantedBy=multi-user.target diff --git a/org.glite.lb.logger/config/systemd.logd b/org.glite.lb.logger/config/systemd.logd index 5ac76fd..26bf55d 100644 --- a/org.glite.lb.logger/config/systemd.logd +++ b/org.glite.lb.logger/config/systemd.logd @@ -16,7 +16,7 @@ EnvironmentFile=-/etc/profile.d/grid-env.sh EnvironmentFile=-/etc/sysconfig/glite-lb EnvironmentFile=-/etc/sysconfig/glite-lb-logd PIDFile=/var/run/glite/glite-lb-logd.pid -ExecStart=/usr/bin/glite-lb-logd $GLITE_LB_LOGD_OPTIONS +ExecStart=/usr/sbin/glite-lb-logd $GLITE_LB_LOGD_OPTIONS [Install] WantedBy=multi-user.target diff --git a/org.glite.lb.logger/config/systemd.notif-interlogd b/org.glite.lb.logger/config/systemd.notif-interlogd index b617593..d060ab2 100644 --- a/org.glite.lb.logger/config/systemd.notif-interlogd +++ b/org.glite.lb.logger/config/systemd.notif-interlogd @@ -15,7 +15,7 @@ EnvironmentFile=-/etc/profile.d/grid-env.sh EnvironmentFile=-/etc/sysconfig/glite-lb EnvironmentFile=-/etc/sysconfig/glite-lb-notif-interlogd PIDFile=/var/run/glite/glite-lb-notif-interlogd.pid -ExecStart=/usr/bin/glite-lb-notif-interlogd -M 10485760 --conf /etc/glite-lb/msg.conf $GLITE_LB_NOTIF_IL_OPTIONS +ExecStart=/usr/sbin/glite-lb-notif-interlogd -M 10485760 --conf /etc/glite-lb/msg.conf $GLITE_LB_NOTIF_IL_OPTIONS [Install] WantedBy=multi-user.target diff --git a/org.glite.lb.logger/config/systemd.proxy-interlogd b/org.glite.lb.logger/config/systemd.proxy-interlogd index c0c8679..d09cc6e 100644 --- a/org.glite.lb.logger/config/systemd.proxy-interlogd +++ b/org.glite.lb.logger/config/systemd.proxy-interlogd @@ -15,7 +15,7 @@ EnvironmentFile=-/etc/profile.d/grid-env.sh EnvironmentFile=-/etc/sysconfig/glite-lb EnvironmentFile=-/etc/sysconfig/glite-lb-proxy-interlogd PIDFile=/var/run/glite/glite-lb-proxy-interlogd.pid -ExecStart=/usr/bin/glite-lb-proxy-interlogd $GLITE_LB_PROXY_IL_OPTIONS +ExecStart=/usr/sbin/glite-lb-proxy-interlogd $GLITE_LB_PROXY_IL_OPTIONS [Install] WantedBy=multi-user.target