git.annexia.org
/
libguestfs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
fe6820c
)
Add test-boot-realistic target.
author
Richard Jones
<rjones@redhat.com>
Wed, 1 Apr 2009 15:08:23 +0000
(16:08 +0100)
committer
Richard Jones
<rjones@redhat.com>
Wed, 1 Apr 2009 15:08:23 +0000
(16:08 +0100)
Makefile.am
patch
|
blob
|
history
configure.ac
patch
|
blob
|
history
diff --git
a/Makefile.am
b/Makefile.am
index
154347f
..
7054ea8
100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-44,19
+44,35
@@
initramfs.timestamp: make-initramfs.sh.in daemon/guestfsd
# Make clean.
# Make clean.
-CLEANFILES = $(fs_DATA) initramfs.timestamp
+CLEANFILES = $(fs_DATA) initramfs.timestamp
emptydisk
clean-local:
rm -rf initramfs
# Test-boot the image.
clean-local:
rm -rf initramfs
# Test-boot the image.
-test-boot-image:
+test-boot: emptydisk
+ qemu-system-$(host_cpu) \
+ -m 384 \
+ -kernel $(VMLINUZ) -initrd $(INITRAMFSIMG) \
+ -hda emptydisk
+
+emptydisk:
rm -f emptydisk
dd if=/dev/zero of=emptydisk bs=1024 count=1440
rm -f emptydisk
dd if=/dev/zero of=emptydisk bs=1024 count=1440
- echo 0, | sfdisk -C 80 -H 2 -S 18 emptydisk
+ echo 0, | sfdisk -q -C 80 -H 2 -S 18 emptydisk > /dev/null
+
+# This is a more realistic test boot command line which better
+# reflects what the library does.
+
+test-boot-realistic: emptydisk
qemu-system-$(host_cpu) \
-m 384 \
-kernel $(VMLINUZ) -initrd $(INITRAMFSIMG) \
qemu-system-$(host_cpu) \
-m 384 \
-kernel $(VMLINUZ) -initrd $(INITRAMFSIMG) \
- -hda emptydisk -boot c
- rm -f emptydisk
+ -hda emptydisk \
+ -append "console=ttyS0 guestfs=10.0.2.4:6666" \
+ -nographic \
+ -serial stdio \
+ -net channel,6666:unix:/tmp/sock,server,nowait \
+ -net user,vlan=0 \
+ -net nic,vlan=0
diff --git
a/configure.ac
b/configure.ac
index
4e71dde
..
03bdb9e
100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-55,6
+55,10
@@
AC_CHECK_PROG([FEBOOTSTRAP],
[febootstrap],[febootstrap],[no])
test "x$FEBOOTSTRAP" = "xno" && \
AC_MSG_ERROR([febootstrap must be installed])
[febootstrap],[febootstrap],[no])
test "x$FEBOOTSTRAP" = "xno" && \
AC_MSG_ERROR([febootstrap must be installed])
+AC_CHECK_PROG([FEBOOTSTRAP_RUN],
+ [febootstrap-run],[febootstrap-run],[no])
+test "x$FEBOOTSTRAP_RUN" = "xno" && \
+ AC_MSG_ERROR([febootstrap-run must be installed])
AC_CHECK_PROG([FEBOOTSTRAP_MINIMIZE],
[febootstrap-minimize],[febootstrap-minimize],[no])
test "x$FEBOOTSTRAP_MINIMIZE" = "xno" && \
AC_CHECK_PROG([FEBOOTSTRAP_MINIMIZE],
[febootstrap-minimize],[febootstrap-minimize],[no])
test "x$FEBOOTSTRAP_MINIMIZE" = "xno" && \