I don't like _ in my service names...

This commit is contained in:
David Brown 2015-05-17 18:43:58 -07:00
parent b5c34b553d
commit 7915603b74

View File

@ -408,9 +408,9 @@ install -p -m 644 %{SOURCE23} %{buildroot}%{_unitdir}/
%else %else
# install initscripts # install initscripts
mkdir -p %{buildroot}%{_initrddir} mkdir -p %{buildroot}%{_initrddir}
install -p -m 755 contrib/init.d/pbs_mom %{buildroot}%{_initrddir}/pbs_mom install -p -m 755 contrib/init.d/pbs_mom %{buildroot}%{_initrddir}/pbs-mom
install -p -m 755 contrib/init.d/pbs_sched %{buildroot}%{_initrddir}/pbs_sched install -p -m 755 contrib/init.d/pbs_sched %{buildroot}%{_initrddir}/pbs-sched
install -p -m 755 contrib/init.d/pbs_server %{buildroot}%{_initrddir}/pbs_server install -p -m 755 contrib/init.d/pbs_server %{buildroot}%{_initrddir}/pbs-server
install -p -m 755 contrib/init.d/trqauthd %{buildroot}%{_initrddir}/trqauthd install -p -m 755 contrib/init.d/trqauthd %{buildroot}%{_initrddir}/trqauthd
%endif %endif
@ -569,7 +569,7 @@ fi
%if 0%{?rhel} >= 7 || 0%{?fedora} > 0 %if 0%{?rhel} >= 7 || 0%{?fedora} > 0
%systemd_post pbs-mom.service %systemd_post pbs-mom.service
%else %else
/sbin/chkconfig --add pbs_mom /sbin/chkconfig --add pbs-mom
%endif %endif
%preun mom %preun mom
@ -577,8 +577,8 @@ fi
%systemd_preun pbs-mom.service %systemd_preun pbs-mom.service
%else %else
if [ $1 -eq 0 ]; then if [ $1 -eq 0 ]; then
/sbin/service pbs_mom stop >/dev/null 2>&1 /sbin/service pbs-mom stop >/dev/null 2>&1
/sbin/chkconfig --del pbs_mom /sbin/chkconfig --del pbs-mom
fi fi
%endif %endif
@ -586,7 +586,7 @@ fi
%if 0%{?rhel} >= 7 || 0%{?fedora} > 0 %if 0%{?rhel} >= 7 || 0%{?fedora} > 0
%systemd_post pbs-sched.service %systemd_post pbs-sched.service
%else %else
/sbin/chkconfig --add pbs_sched /sbin/chkconfig --add pbs-sched
%endif %endif
%preun scheduler %preun scheduler
@ -594,8 +594,8 @@ fi
%systemd_preun pbs-sched.service %systemd_preun pbs-sched.service
%else %else
if [ $1 -eq 0 ]; then if [ $1 -eq 0 ]; then
/sbin/service pbs_sched stop >/dev/null 2>&1 /sbin/service pbs-sched stop >/dev/null 2>&1
/sbin/chkconfig --del pbs_sched /sbin/chkconfig --del pbs-sched
fi fi
%endif %endif
@ -603,7 +603,7 @@ fi
%if 0%{?rhel} >= 7 || 0%{?fedora} > 0 %if 0%{?rhel} >= 7 || 0%{?fedora} > 0
%systemd_post pbs-server.service %systemd_post pbs-server.service
%else %else
/sbin/chkconfig --add pbs_server /sbin/chkconfig --add pbs-server
%endif %endif
%preun server %preun server
@ -611,8 +611,8 @@ fi
%systemd_preun pbs-server.service %systemd_preun pbs-server.service
%else %else
if [ $1 -eq 0 ]; then if [ $1 -eq 0 ]; then
/sbin/service pbs_server stop >/dev/null 2>&1 /sbin/service pbs-server stop >/dev/null 2>&1
/sbin/chkconfig --del pbs_server /sbin/chkconfig --del pbs-server
fi fi
%endif %endif
@ -775,7 +775,7 @@ fi
%if 0%{?rhel} >= 7 || 0%{?fedora} > 0 %if 0%{?rhel} >= 7 || 0%{?fedora} > 0
%{_unitdir}/pbs-mom.service %{_unitdir}/pbs-mom.service
%else %else
%{_initrddir}/pbs_mom %{_initrddir}/pbs-mom
%endif %endif
%if %{use_rcp} %if %{use_rcp}
%attr(4755, root, root) %{_sbindir}/pbs_rcp %attr(4755, root, root) %{_sbindir}/pbs_rcp
@ -801,7 +801,7 @@ fi
%if 0%{?rhel} >= 7 || 0%{?fedora} > 0 %if 0%{?rhel} >= 7 || 0%{?fedora} > 0
%{_unitdir}/pbs-sched.service %{_unitdir}/pbs-sched.service
%else %else
%{_initrddir}/pbs_sched %{_initrddir}/pbs-sched
%endif %endif
%dir %{torquehomedir}/sched_priv %dir %{torquehomedir}/sched_priv
%config(noreplace) %{torquehomedir}/sched_priv/* %config(noreplace) %{torquehomedir}/sched_priv/*
@ -827,7 +827,7 @@ fi
%{_unitdir}/pbs-server.service %{_unitdir}/pbs-server.service
%{_unitdir}/trqauthd.service %{_unitdir}/trqauthd.service
%else %else
%{_initrddir}/pbs_server %{_initrddir}/pbs-server
%{_initrddir}/trqauthd %{_initrddir}/trqauthd
%endif %endif
%dir %{_var}/log/torque/server_logs %dir %{_var}/log/torque/server_logs