diff options
| author | stekloff@dyn9047022152.beaverton.ibm.com <stekloff@dyn9047022152.beaverton.ibm.com> | 2006-03-21 01:10:46 +0100 |
|---|---|---|
| committer | stekloff@dyn9047022152.beaverton.ibm.com <stekloff@dyn9047022152.beaverton.ibm.com> | 2006-03-21 01:10:46 +0100 |
| commit | f91ada1ab571beb3cefca20ecc5c236581e05e36 (patch) | |
| tree | 14fd07149d1b8a30d3dbb136dfa2d4bc746aa731 /tools/xm-test/ramdisk | |
| parent | 246684cebafc67bb61ac60c58df9e8d0f2bfdca0 (diff) | |
| download | xen-f91ada1ab571beb3cefca20ecc5c236581e05e36.tar.gz xen-f91ada1ab571beb3cefca20ecc5c236581e05e36.tar.bz2 xen-f91ada1ab571beb3cefca20ecc5c236581e05e36.zip | |
Add mounting /sys for 2.6 xm-test images.
Signed-off-by: Daniel Stekloff <dsteklof@us.ibm.com>
Diffstat (limited to 'tools/xm-test/ramdisk')
| -rw-r--r-- | tools/xm-test/ramdisk/Makefile.am | 5 | ||||
| -rw-r--r-- | tools/xm-test/ramdisk/skel/etc/init.d/rcS | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/tools/xm-test/ramdisk/Makefile.am b/tools/xm-test/ramdisk/Makefile.am index 0cdca83c80..2912f7579b 100644 --- a/tools/xm-test/ramdisk/Makefile.am +++ b/tools/xm-test/ramdisk/Makefile.am @@ -14,6 +14,8 @@ HVM_SCRIPT = bin/create_disk_image XMTEST_MAJ_VER = $(shell echo @PACKAGE_VERSION@ | perl -pe 's/(\d+)\.(\d+)\.\d+/\1.\2/') XMTEST_VER_IMG = initrd-$(XMTEST_MAJ_VER).img +EXTRA_ROOT_DIRS = sys + if HVM all: initrd.img disk.img else @@ -36,7 +38,8 @@ $(BR_IMG): $(BR_SRC) $(XMTEST_VER_IMG): $(BR_IMG) chmod a+x skel/etc/init.d/rcS - (cd skel; tar cf - .) | (cd $(BR_SRC)/$(BR_ROOT); tar xvf -) + (cd skel; mkdir -p $(EXTRA_ROOT_DIRS); tar cf - .) \ + | (cd $(BR_SRC)/$(BR_ROOT); tar xvf -) cd $(BR_SRC) && make cp $(BR_IMG) initrd-$(XMTEST_MAJ_VER).img diff --git a/tools/xm-test/ramdisk/skel/etc/init.d/rcS b/tools/xm-test/ramdisk/skel/etc/init.d/rcS index fd3113f0a7..b3a92109e9 100644 --- a/tools/xm-test/ramdisk/skel/etc/init.d/rcS +++ b/tools/xm-test/ramdisk/skel/etc/init.d/rcS @@ -2,3 +2,7 @@ mount -a +# If we're running 2.6, make sure /sys is mounted +if uname -r | grep -q '^2.6'; then + mount -t sysfs none /sys +fi |