[Xen-changelog] Make the default network-script to be '' i.e. don't run a network script. Fix Makefile to actually install network-bridge script.

[Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User iap10@xxxxxxxxxxxxxxxxxxxxx
# Node ID 972917cee2fd06569a19d2ffffe8c70d6fdc01b4
# Parent  0daaf1e5ca363f1c23fac69210dc992800b889a4

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@xxxxxxxxxxxxx

diff -r 0daaf1e5ca36 -r 972917cee2fd tools/examples/Makefile
--- a/tools/examples/Makefile   Sun Aug 14 18:58:25 2005
+++ b/tools/examples/Makefile   Sun Aug 14 21:45:26 2005
@@ -16,7 +16,7 @@
 
 # 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 -r 0daaf1e5ca36 -r 972917cee2fd tools/python/xen/xend/XendRoot.py
--- a/tools/python/xen/xend/XendRoot.py Sun Aug 14 18:58:25 2005
+++ b/tools/python/xen/xend/XendRoot.py Sun Aug 14 21:45:26 2005
@@ -315,7 +315,7 @@
         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')

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog