Add the necessary 'vsys' script attribute to the default <site>_netflow slice.

[myplc.git] / db-config

diff --git a/db-config b/db-config
index 0b06a85..ebd5cde 100755 (executable)
--- a/db-config
+++ b/db-config
@@ -7,7 +7,7 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2006 The Trustees of Princeton University
 #
-# $Id: db-config 7454 2007-12-11 18:55:00Z faiyaza $
+# $Id$
 # $HeadURL$
 
 from plc_config import PLCConfiguration
@@ -537,7 +537,7 @@ def main():
             file = open(root + "/" + f, "ro")
             default_initscripts.append({"name": plc['slice_prefix'] + "_" + f,
                                         "enabled": True,
-                                        "script": file.read().replace("XXXSITEXXX", url).replace("XXXPREFIXXXX", plc['slice_prefix'])})
+                                        "script": file.read().replace("@SITE@", url).replace("@PREFIX@", plc['slice_prefix'])})
             file.close()
 
     # Get list of existing initscripts
@@ -554,13 +554,9 @@ def main():
          'name' : "ifname",
          'description': "Set interface name, instead of eth0 or the like",
          'min_role_id' : 40},
-        {'category' : "general",
-         'name' : "driver",
-         'description': "Use this to specify an alternate driver",
-         'min_role_id' : 40 },
-        {'category' : "general",
+        {'category' : "Multihome",
          'name' : "alias",
-         'description': "Allows to reuse an interface as eth0:alias",
+         'description': "Specifies that the network is used for multihoming",
          'min_role_id' : 40},
 
         {'category' : "hidden",
@@ -610,19 +606,20 @@ def main():
          'url': url,
          'instantiation': "plc-instantiated",
          # Renew forever (minus one day, work around date conversion weirdness)
-         'expires': sys.maxint - (60 * 60 * 24),
+         'expires': 0x7fffffff - (60 * 60 * 24),
          'attributes': [('system', "1"),
                         ('vref', "planetflow"),
                         ('proper_op', "open file=/etc/passwd, flags=r"),
                         ('proper_op', "create_socket"),
-                        ('proper_op', "bind_socket")]},
+                        ('proper_op', "bind_socket"),
+                                               ('vsys'     , "pfmount")]},
           # Sirius
         {'name': plc['slice_prefix'] + "_sirius",
          'description': 'The Sirius Calendar Service.\n\nSirius provides system-wide reservations of 25% CPU and 2Mb/s outgoing\nbandwidth.  Sign up for hour-long slots using the Web GUI at the\nPlanetLab website.\n\nThis slice should not generate traffic external to PlanetLab.\n',
          'url': url,
          'instantiation': "plc-instantiated",
          # Renew forever (minus one day, work around date conversion weirdness)
-         'expires': sys.maxint - (60 * 60 * 24),
+         'expires': 0x7fffffff - (60 * 60 * 24),
          'attributes': [('system', "1"),
                         ('net_min_rate', "2000"),
                         ('cpu_pct', "25"),