From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Tue, 10 Oct 2006 19:17:23 +0000 (+0000)
Subject: - merge revision 1.31
X-Git-Tag: planetlab-3_3-rc2~11
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=4933b26353edd30167536a25e7b7ea0e1299796c;p=mom.git

- merge revision 1.31
date: 2006/10/10 19:16:36;  author: mlhuang;  state: Exp;  lines: +2 -1
- install and add nm_mom.py to spec
---

diff --git a/pl_mom.spec b/pl_mom.spec
index dca3c1e..94697c4 100644
--- a/pl_mom.spec
+++ b/pl_mom.spec
@@ -56,7 +56,7 @@ install -D -m 755 swapmon.init $RPM_BUILD_ROOT/%{_initrddir}/swapmon
 install -D -m 755 pl_mop.sh $RPM_BUILD_ROOT/usr/local/planetlab/bin/pl_mop.sh
 
 # Tests and restarts NM
-install -D -m 755 nm_mop.sh $RPM_BUILD_ROOT/usr/local/planetlab/bin/nm_mop.sh
+install -D -m 755 nm_mom.py $RPM_BUILD_ROOT/usr/local/planetlab/bin/nm_mom.py
 
 # Runs pl_mop and bwmon periodically
 install -D -m 644 pl_mom.cron $RPM_BUILD_ROOT/%{_sysconfdir}/cron.d/pl_mom
@@ -100,6 +100,7 @@ exit 0
 %files
 %defattr(-, root, root, -)
 %{_datadir}/%{name}/pl_mom.py
+%{_datadir}/%{name}/nm_mom.py
 %{_datadir}/%{name}/bwmon.py
 %{_datadir}/%{name}/swapmon.py
 %{_initrddir}/swapmon