From 771cc4656ed566237951b70e43238e92e6b40aad Mon Sep 17 00:00:00 2001
From: Andy Bavier <acb@cs.princeton.edu>
Date: Wed, 3 Dec 2008 19:41:04 +0000
Subject: [PATCH] Trellis branch

---
 NodeManager.spec | 4 ++--
 nm.py            | 2 +-
 setup.py         | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/NodeManager.spec b/NodeManager.spec
index 185db5c..8d000b7 100644
--- a/NodeManager.spec
+++ b/NodeManager.spec
@@ -7,7 +7,7 @@
 
 %define name NodeManager
 %define version 1.7
-%define taglevel 37
+%define taglevel 37.1.trellis
 
 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 
@@ -29,7 +29,7 @@ URL: %(echo %{url} | cut -d ' ' -f 2)
 Obsoletes: sidewinder, sidewinder-common
 
 # vuseradd, vuserdel
-Requires: vserver-%{slicefamily}
+# Requires: vserver-%{slicefamily}
 Requires: util-vserver >= 0.30.208-17
 
 # vserver.py
diff --git a/nm.py b/nm.py
index bb0a2ab..b700250 100755
--- a/nm.py
+++ b/nm.py
@@ -29,7 +29,7 @@ import net
 id="$Id$"
 savedargv = sys.argv[:]
 
-known_modules=['conf_files', 'sm', 'bwmon', 'vsys', 'codemux']
+known_modules=['conf_files', 'sm', 'bwmon', 'vsys', 'codemux', 'trellis']
 
 parser = optparse.OptionParser()
 parser.add_option('-d', '--daemon', action='store_true', dest='daemon', default=False, help='run daemonized')
diff --git a/setup.py b/setup.py
index 63c6c80..ec6e842 100644
--- a/setup.py
+++ b/setup.py
@@ -37,6 +37,7 @@ setup(
     'bwmon',
     'codemux',
     'iptables',
+    'trellis',
     ],
     scripts = [
     'forward_api_calls',
-- 
2.47.0