diff options
author | Keir Fraser <keir.fraser@citrix.com> | 2008-07-22 07:59:44 +0100 |
---|---|---|
committer | Keir Fraser <keir.fraser@citrix.com> | 2008-07-22 07:59:44 +0100 |
commit | a395f12adb374f1766c77b9f55ff79a3dd68c686 (patch) | |
tree | c96d43b594ffd3406b6d95e172159ed39d17af96 | |
parent | 5a932f3328d21908f76c682752c31556ad872df0 (diff) | |
download | xen-a395f12adb374f1766c77b9f55ff79a3dd68c686.tar.gz xen-a395f12adb374f1766c77b9f55ff79a3dd68c686.tar.bz2 xen-a395f12adb374f1766c77b9f55ff79a3dd68c686.zip |
x86 hvm: stubdom and hvmloader always live under /usr/lib, never /usr/lib64
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
-rw-r--r-- | tools/examples/stubdom-ExampleHVMDomain | 9 | ||||
-rw-r--r-- | tools/examples/xmexample.hvm | 2 | ||||
-rw-r--r-- | tools/examples/xmexample.hvm-stubdom | 11 |
3 files changed, 4 insertions, 18 deletions
diff --git a/tools/examples/stubdom-ExampleHVMDomain b/tools/examples/stubdom-ExampleHVMDomain index 2822f05ded..de1619ba32 100644 --- a/tools/examples/stubdom-ExampleHVMDomain +++ b/tools/examples/stubdom-ExampleHVMDomain @@ -1,14 +1,7 @@ # Not to be started directly, # See xmexample.hvm-stubdom and stubdom/README for more details -import os, re -arch = os.uname()[4] -if re.search('64', arch): - arch_libdir = 'lib64' -else: - arch_libdir = 'lib' - -kernel = "/usr/" + arch_libdir + "/xen/boot/ioemu-stubdom.gz" +kernel = "/usr/lib/xen/boot/ioemu-stubdom.gz" # Must be the same as in xmexample.hvm-stubdom, with a prepended vif for TCP/IP # networking in the stubdomain itself, here just '' diff --git a/tools/examples/xmexample.hvm b/tools/examples/xmexample.hvm index b681dcc67e..94a0fd160a 100644 --- a/tools/examples/xmexample.hvm +++ b/tools/examples/xmexample.hvm @@ -15,7 +15,7 @@ else: #---------------------------------------------------------------------------- # Kernel image file. -kernel = "/usr/" + arch_libdir + "/xen/boot/hvmloader" +kernel = "/usr/lib/xen/boot/hvmloader" # The domain build function. HVM domain uses 'hvm'. builder='hvm' diff --git a/tools/examples/xmexample.hvm-stubdom b/tools/examples/xmexample.hvm-stubdom index 06adbf7daf..117273c5e5 100644 --- a/tools/examples/xmexample.hvm-stubdom +++ b/tools/examples/xmexample.hvm-stubdom @@ -10,16 +10,9 @@ # stubdom-ExampleHVMDomain and stubdom/README for more details # The differences with xmexample.hvm are marked with "STUBDOM" -import os, re -arch = os.uname()[4] -if re.search('64', arch): - arch_libdir = 'lib64' -else: - arch_libdir = 'lib' - #---------------------------------------------------------------------------- # Kernel image file. -kernel = "/usr/" + arch_libdir + "/xen/boot/hvmloader" +kernel = "/usr/lib/xen/boot/hvmloader" # The domain build function. HVM domain uses 'hvm'. builder='hvm' @@ -129,7 +122,7 @@ vif = [ 'type=ioemu, bridge=xenbr0' ] # # STUBDOM: this is a script that creates the stub domain running the device # model -device_model = '/usr/' + arch_libdir + '/xen/bin/stubdom-dm' +device_model = '/usr/lib/xen/bin/stubdom-dm' #----------------------------------------------------------------------------- # boot on floppy (a), hard disk (c), Network (n) or CD-ROM (d) |