aboutsummaryrefslogtreecommitdiffstats
path: root/tools/xm-test/ramdisk
diff options
context:
space:
mode:
authorstekloff@elm3b216.beaverton.ibm.com <stekloff@elm3b216.beaverton.ibm.com>2005-12-16 11:51:06 +0000
committerstekloff@elm3b216.beaverton.ibm.com <stekloff@elm3b216.beaverton.ibm.com>2005-12-16 11:51:06 +0000
commit6bcfa6dc8023102dbb5e624c5839b83ff4d13852 (patch)
treebc28c3dbef2845a93c75adea9657ec38f93fdc54 /tools/xm-test/ramdisk
parent5ad4f375adb8ba6a8309cee15b073b965f41a21d (diff)
downloadxen-6bcfa6dc8023102dbb5e624c5839b83ff4d13852.tar.gz
xen-6bcfa6dc8023102dbb5e624c5839b83ff4d13852.tar.bz2
xen-6bcfa6dc8023102dbb5e624c5839b83ff4d13852.zip
Changed create_disk_image to default to making "disk.img", which is what
xm-test is looking for by default. Signed-off-by: Daniel Stekloff <dsteklof@us.ibm.com>
Diffstat (limited to 'tools/xm-test/ramdisk')
-rw-r--r--tools/xm-test/ramdisk/Makefile.am2
-rw-r--r--tools/xm-test/ramdisk/bin/create_disk_image2
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/xm-test/ramdisk/Makefile.am b/tools/xm-test/ramdisk/Makefile.am
index 75811dce78..7efeee2aed 100644
--- a/tools/xm-test/ramdisk/Makefile.am
+++ b/tools/xm-test/ramdisk/Makefile.am
@@ -45,7 +45,7 @@ initrd.img: $(XMTEST_VER_IMG)
disk.img: $(XMTEST_VER_IMG)
chmod a+x $(VMX_SCRIPT)
- $(VMX_SCRIPT) -r $(XMTEST_VER_IMG) -i disk.img
+ $(VMX_SCRIPT) -r $(XMTEST_VER_IMG)
existing:
@[ -f $(XMTEST_VER_IMG) ] && ln -sf $(XMTEST_VER_IMG) initrd.img || \
diff --git a/tools/xm-test/ramdisk/bin/create_disk_image b/tools/xm-test/ramdisk/bin/create_disk_image
index 0d6ba67791..dad6d2494b 100644
--- a/tools/xm-test/ramdisk/bin/create_disk_image
+++ b/tools/xm-test/ramdisk/bin/create_disk_image
@@ -77,7 +77,7 @@ function check_dependencies()
function initialize_globals()
{
PROGNAME="create_disk_image"
- IMAGE="hvm.img"
+ IMAGE="disk.img"
KERNEL=""
LCONF="lilo.conf"
LOOPD="" # Loop device for entire disk image