# HG changeset patch
# User stekloff@dyn9047022152.beaverton.ibm.com
# Date 1142899846 -3600
# Node ID 8fda66ee616b11e28ad1c7227f80d2ee7527ecb1
# Parent  a6f1b3d653a9bed58b0d2ed92adaf342cda133b3
Add mounting /sys for 2.6 xm-test images.

Signed-off-by: Daniel Stekloff <dsteklof@us.ibm.com>



diff -r a6f1b3d653a9 -r 8fda66ee616b tools/xm-test/ramdisk/Makefile.am
--- a/tools/xm-test/ramdisk/Makefile.am	Tue Mar 21 01:08:59 2006 +0100
+++ b/tools/xm-test/ramdisk/Makefile.am	Tue Mar 21 01:10:46 2006 +0100
@@ -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 @@ endif
 
 $(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 -r a6f1b3d653a9 -r 8fda66ee616b tools/xm-test/ramdisk/skel/etc/init.d/rcS
--- a/tools/xm-test/ramdisk/skel/etc/init.d/rcS	Tue Mar 21 01:08:59 2006 +0100
+++ b/tools/xm-test/ramdisk/skel/etc/init.d/rcS	Tue Mar 21 01:10:46 2006 +0100
@@ -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