diff options
| author | iap10@freefall.cl.cam.ac.uk <iap10@freefall.cl.cam.ac.uk> | 2005-08-14 21:45:26 +0000 |
|---|---|---|
| committer | iap10@freefall.cl.cam.ac.uk <iap10@freefall.cl.cam.ac.uk> | 2005-08-14 21:45:26 +0000 |
| commit | 3ffc2735e326c88c563a6696456e71632b1f9873 (patch) | |
| tree | 193993bdb63721490e82f540559dd62c83e360ff | |
| parent | 608870b061f3acf505baea43e16f80bb00186983 (diff) | |
| download | xen-3ffc2735e326c88c563a6696456e71632b1f9873.tar.gz xen-3ffc2735e326c88c563a6696456e71632b1f9873.tar.bz2 xen-3ffc2735e326c88c563a6696456e71632b1f9873.zip | |
Make the default network-script to be '' i.e. don't run a network script. Fix Makefile to actually install network-bridge script.
Signed-off-by: ian@xensource.com
| -rw-r--r-- | tools/examples/Makefile | 2 | ||||
| -rw-r--r-- | tools/python/xen/xend/XendRoot.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/examples/Makefile b/tools/examples/Makefile index 54ad20fd94..c0b7fffc95 100644 --- a/tools/examples/Makefile +++ b/tools/examples/Makefile @@ -16,7 +16,7 @@ XEN_CONFIGS += xmexample.vmx # Xen script dir and scripts to go there. XEN_SCRIPT_DIR = /etc/xen/scripts -XEN_SCRIPTS = network vif-bridge +XEN_SCRIPTS = network-bridge vif-bridge XEN_SCRIPTS += network-route vif-route XEN_SCRIPTS += block-file XEN_SCRIPTS += block-enbd diff --git a/tools/python/xen/xend/XendRoot.py b/tools/python/xen/xend/XendRoot.py index b12b0268b7..279dd14622 100644 --- a/tools/python/xen/xend/XendRoot.py +++ b/tools/python/xen/xend/XendRoot.py @@ -315,7 +315,7 @@ class XendRoot: return self.get_config_value('block-%s' % type, '') def get_network_script(self): - return self.get_config_value('network-script', 'network') + return self.get_config_value('network-script', '') def get_enable_dump(self): return self.get_config_bool('enable-dump', 'no') |