dmlb2000 pushed to torque (el5). "lets make the service names the old names since its been that (..more)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Tue May 19 19:41:33 UTC 2015
From b93ab416d78f556c42ffec360b2e385a1e242538 Mon Sep 17 00:00:00 2001
From: David Brown <dmlb2000 at gmail.com>
Date: Mon, 18 May 2015 20:31:12 -0700
Subject: lets make the service names the old names since its been that way for
ages
diff --git a/pbs-mom.service b/pbs-mom.service
deleted file mode 100644
index 269f5e8..0000000
--- a/pbs-mom.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=pbs-mom
-After=syslog.target network.target trqauthd.service
-
-[Service]
-Type=forking
-ExecStart=/usr/sbin/pbs_mom
-PIDFile=/var/lib/torque/mom_priv/mom.lock
-
-[Install]
-WantedBy=multi-user.target
diff --git a/pbs-sched.service b/pbs-sched.service
deleted file mode 100644
index 2f4f355..0000000
--- a/pbs-sched.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=pbs-sched
-After=syslog.target network.target trqauthd.service
-
-[Service]
-Type=forking
-ExecStart=/usr/sbin/pbs_sched
-PIDFile=/var/lib/torque/sched_priv/sched.lock
-
-[Install]
-WantedBy=multi-user.target
diff --git a/pbs-server.service b/pbs-server.service
deleted file mode 100644
index 5ce8e1b..0000000
--- a/pbs-server.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=pbs-server
-After=syslog.target network.target trqauthd.service
-
-[Service]
-Type=forking
-ExecStart=/usr/sbin/pbs_server
-PIDFile=/var/lib/torque/server_priv/server.lock
-
-[Install]
-WantedBy=multi-user.target
diff --git a/pbs_mom.service b/pbs_mom.service
new file mode 100644
index 0000000..269f5e8
--- /dev/null
+++ b/pbs_mom.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=pbs-mom
+After=syslog.target network.target trqauthd.service
+
+[Service]
+Type=forking
+ExecStart=/usr/sbin/pbs_mom
+PIDFile=/var/lib/torque/mom_priv/mom.lock
+
+[Install]
+WantedBy=multi-user.target
diff --git a/pbs_sched.service b/pbs_sched.service
new file mode 100644
index 0000000..2f4f355
--- /dev/null
+++ b/pbs_sched.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=pbs-sched
+After=syslog.target network.target trqauthd.service
+
+[Service]
+Type=forking
+ExecStart=/usr/sbin/pbs_sched
+PIDFile=/var/lib/torque/sched_priv/sched.lock
+
+[Install]
+WantedBy=multi-user.target
diff --git a/pbs_server.service b/pbs_server.service
new file mode 100644
index 0000000..5ce8e1b
--- /dev/null
+++ b/pbs_server.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=pbs-server
+After=syslog.target network.target trqauthd.service
+
+[Service]
+Type=forking
+ExecStart=/usr/sbin/pbs_server
+PIDFile=/var/lib/torque/server_priv/server.lock
+
+[Install]
+WantedBy=multi-user.target
diff --git a/torque.spec b/torque.spec
index 762fbfd..c80f92d 100644
--- a/torque.spec
+++ b/torque.spec
@@ -80,9 +80,9 @@ Source4: xpbs.png
Source5: xpbsmon.png
Source6: README.Fedora
Source8: config
-Source20: pbs-mom.service
-Source21: pbs-sched.service
-Source22: pbs-server.service
+Source20: pbs_mom.service
+Source21: pbs_sched.service
+Source22: pbs_server.service
Source23: trqauthd.service
# Feb 3rd 2011, I've sent a mail upstream to request the re-inclusion
# of the OpenPBS license file in distribution.
@@ -408,9 +408,9 @@ install -p -m 644 %{SOURCE23} %{buildroot}%{_unitdir}/
%else
# install initscripts
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_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_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_server %{buildroot}%{_initrddir}/pbs_server
install -p -m 755 contrib/init.d/trqauthd %{buildroot}%{_initrddir}/trqauthd
%endif
@@ -567,52 +567,52 @@ fi
%post mom
%if 0%{?rhel} >= 7 || 0%{?fedora} > 0
-%systemd_post pbs-mom.service
+%systemd_post pbs_mom.service
%else
-/sbin/chkconfig --add pbs-mom
+/sbin/chkconfig --add pbs_mom
%endif
%preun mom
%if 0%{?rhel} >= 7 || 0%{?fedora} > 0
-%systemd_preun pbs-mom.service
+%systemd_preun pbs_mom.service
%else
if [ $1 -eq 0 ]; then
- /sbin/service pbs-mom stop >/dev/null 2>&1
- /sbin/chkconfig --del pbs-mom
+ /sbin/service pbs_mom stop >/dev/null 2>&1
+ /sbin/chkconfig --del pbs_mom
fi
%endif
%post scheduler
%if 0%{?rhel} >= 7 || 0%{?fedora} > 0
-%systemd_post pbs-sched.service
+%systemd_post pbs_sched.service
%else
-/sbin/chkconfig --add pbs-sched
+/sbin/chkconfig --add pbs_sched
%endif
%preun scheduler
%if 0%{?rhel} >= 7 || 0%{?fedora} > 0
-%systemd_preun pbs-sched.service
+%systemd_preun pbs_sched.service
%else
if [ $1 -eq 0 ]; then
- /sbin/service pbs-sched stop >/dev/null 2>&1
- /sbin/chkconfig --del pbs-sched
+ /sbin/service pbs_sched stop >/dev/null 2>&1
+ /sbin/chkconfig --del pbs_sched
fi
%endif
%post server
%if 0%{?rhel} >= 7 || 0%{?fedora} > 0
-%systemd_post pbs-server.service
+%systemd_post pbs_server.service
%else
-/sbin/chkconfig --add pbs-server
+/sbin/chkconfig --add pbs_server
%endif
%preun server
%if 0%{?rhel} >= 7 || 0%{?fedora} > 0
-%systemd_preun pbs-server.service
+%systemd_preun pbs_server.service
%else
if [ $1 -eq 0 ]; then
- /sbin/service pbs-server stop >/dev/null 2>&1
- /sbin/chkconfig --del pbs-server
+ /sbin/service pbs_server stop >/dev/null 2>&1
+ /sbin/chkconfig --del pbs_server
fi
%endif
@@ -775,9 +775,9 @@ fi
%{_sbindir}/pbs_demux
%{_bindir}/pbs_track
%if 0%{?rhel} >= 7 || 0%{?fedora} > 0
-%{_unitdir}/pbs-mom.service
+%{_unitdir}/pbs_mom.service
%else
-%{_initrddir}/pbs-mom
+%{_initrddir}/pbs_mom
%endif
%if %{use_rcp}
%attr(4755, root, root) %{_sbindir}/pbs_rcp
@@ -801,9 +801,9 @@ fi
%attr(0755, root, root) %{_sbindir}/pbs_sched
%{_sbindir}/qschedd
%if 0%{?rhel} >= 7 || 0%{?fedora} > 0
-%{_unitdir}/pbs-sched.service
+%{_unitdir}/pbs_sched.service
%else
-%{_initrddir}/pbs-sched
+%{_initrddir}/pbs_sched
%endif
%dir %{torquehomedir}/sched_priv
%config(noreplace) %{torquehomedir}/sched_priv/*
@@ -826,10 +826,10 @@ fi
%attr(0755, root, root) %{_sbindir}/trqauthd
%{_sbindir}/qserverd
%if 0%{?rhel} >= 7 || 0%{?fedora} > 0
-%{_unitdir}/pbs-server.service
+%{_unitdir}/pbs_server.service
%{_unitdir}/trqauthd.service
%else
-%{_initrddir}/pbs-server
+%{_initrddir}/pbs_server
%{_initrddir}/trqauthd
%endif
%dir %{_var}/log/torque/server_logs
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/torque.git/commit/?h=el5&id=b93ab416d78f556c42ffec360b2e385a1e242538
More information about the scm-commits
mailing list