From ed072758a72fe04de1afe547c15aabc5f4612f2d Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Wed, 24 Jun 2009 11:17:11 +0100 Subject: tools: remove hard coded paths in example config files Signed-off-by: Christoph Egger --- tools/examples/xeninfo.pl | 2 +- tools/examples/xmexample.hvm | 14 ++++---------- tools/examples/xmexample.hvm-stubdom | 7 ++++--- tools/examples/xmexample.pv-grub | 2 +- tools/examples/xmexample.vti | 2 +- 5 files changed, 11 insertions(+), 16 deletions(-) (limited to 'tools/examples') diff --git a/tools/examples/xeninfo.pl b/tools/examples/xeninfo.pl index 47431c6323..95a15d9595 100644 --- a/tools/examples/xeninfo.pl +++ b/tools/examples/xeninfo.pl @@ -210,7 +210,7 @@ sub get_vm_type # which is something like: # 'PV_kernel': '/boot/vmlinuz-2.6.18-xen', # or - # 'PV_kernel': '/usr/lib/xen/boot/hvmloader', + # 'PV_kernel': 'hvmloader', if ("$vm_pv_kernel_results->{'Value'}" =~ m/hvm/i) { $host_info{$host_name}{'vms'}{$vm_name_label}{'type'} = "HVM"; diff --git a/tools/examples/xmexample.hvm b/tools/examples/xmexample.hvm index 420e2b2763..5f43337007 100644 --- a/tools/examples/xmexample.hvm +++ b/tools/examples/xmexample.hvm @@ -6,16 +6,9 @@ # you can set the parameters for the domain on the xm command line. #============================================================================ -import os, re - -arch_libdir = 'lib' -arch = os.uname()[4] -if os.uname()[0] == 'Linux' and re.search('64', arch): - arch_libdir = 'lib64' - #---------------------------------------------------------------------------- # Kernel image file. -kernel = "/usr/lib/xen/boot/hvmloader" +kernel = "hvmloader" # The domain build function. HVM domain uses 'hvm'. builder='hvm' @@ -128,7 +121,7 @@ disk = [ 'file:/var/images/min-el3-i386.img,hda,w', ',hdc:cdrom,r' ] #============================================================================ # Device Model to be used -device_model = '/usr/' + arch_libdir + '/xen/bin/qemu-dm' +device_model = 'qemu-dm' #----------------------------------------------------------------------------- # boot on floppy (a), hard disk (c), Network (n) or CD-ROM (d) @@ -154,7 +147,8 @@ vnc=1 #---------------------------------------------------------------------------- # address that should be listened on for the VNC server if vnc is set. -# default is to use 'vnc-listen' setting from /etc/xen/xend-config.sxp +# default is to use 'vnc-listen' setting from +# auxbin.xen_configdir() + /xend-config.sxp #vnclisten="127.0.0.1" #---------------------------------------------------------------------------- diff --git a/tools/examples/xmexample.hvm-stubdom b/tools/examples/xmexample.hvm-stubdom index 5ca3904a99..a425e83e7c 100644 --- a/tools/examples/xmexample.hvm-stubdom +++ b/tools/examples/xmexample.hvm-stubdom @@ -11,7 +11,7 @@ #---------------------------------------------------------------------------- # Kernel image file. -kernel = "/usr/lib/xen/boot/hvmloader" +kernel = "hvmloader" # The domain build function. HVM domain uses 'hvm'. builder='hvm' @@ -118,7 +118,7 @@ disk = [ 'file:/var/images/min-el3-i386.img,hda,w', 'phy:/dev/cdrom,hdc:cdrom,r' # # STUBDOM: this is a script that creates the stub domain running the device # model -device_model = '/usr/lib/xen/bin/stubdom-dm' +device_model = 'stubdom-dm' #----------------------------------------------------------------------------- # boot on floppy (a), hard disk (c), Network (n) or CD-ROM (d) @@ -146,7 +146,8 @@ vnc=1 #---------------------------------------------------------------------------- # address that should be listened on for the VNC server if vnc is set. -# default is to use 'vnc-listen' setting from /etc/xen/xend-config.sxp +# default is to use 'vnc-listen' setting from +# auxbin.xen_configdir() + /xend-config.sxp #vnclisten="127.0.0.1" #---------------------------------------------------------------------------- diff --git a/tools/examples/xmexample.pv-grub b/tools/examples/xmexample.pv-grub index 1b687151b6..85f847c6e9 100644 --- a/tools/examples/xmexample.pv-grub +++ b/tools/examples/xmexample.pv-grub @@ -8,7 +8,7 @@ #---------------------------------------------------------------------------- # PV GRUB image file. -kernel = "/usr/lib/xen/boot/pv-grub.gz" +kernel = "pv-grub.gz" # Optional provided menu.lst. #ramdisk = "/boot/guests/menu.lst" diff --git a/tools/examples/xmexample.vti b/tools/examples/xmexample.vti index d93c6531ac..f97cbe9f83 100644 --- a/tools/examples/xmexample.vti +++ b/tools/examples/xmexample.vti @@ -12,7 +12,7 @@ arch = os.uname()[4] #---------------------------------------------------------------------------- # Kernel image file. -kernel = "/usr/lib/xen/boot/guest_firmware.bin" +kernel = "guest_firmware.bin" # The domain build function. VTI domain uses 'hvm'. builder='hvm' -- cgit v1.2.3