These small fixes are required to fix the build and tests on Debian (using the debootstrap/debirf appliance). There is currently another bug in the Debian tests which I'm looking into. hexdump always fails as follows: libguestfs: error: hexdump: hexdump: /test123: hexdump: /sysroot/test123: Bad file descriptor Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones New in Fedora 11: Fedora Windows cross-compiler. Compile Windows programs, test, and build Windows installers. Over 70 libraries supprt'd http://fedoraproject.org/wiki/MinGW http://www.annexia.org/fedora_mingw

>From 3e4bd83ce0d3f9c7af52adb1dbdf5a5718e81454 Mon Sep 17 00:00:00 2001 From: Richard Jones <rjones(a)debian5x64.home.annexia.org&gt; Date: Wed, 4 Nov 2009 14:30:13 +0000 Subject: [PATCH 1/3] debian: Ignore some generated debirf files. --- .gitignore | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index fbe7998..c365865 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,11 @@ *.a ABOUT-NLS aclocal.m4 +appliance/debian/.bootstrap.log +appliance/debian/.fakeroot-state.debirf-libguestfs +appliance/debian/debirf-libguestfs*.cgz +appliance/debian/root/ +appliance/debian/vmlinuz-* appliance/debian/debirf.conf appliance/initramfs.*.img appliance/initramfs.*.supermin.hostfiles -- 1.6.5.2

>From 644fccb4aeed3e39978d340b18821aa704adf1bd Mon Sep 17 00:00:00 2001 From: Richard Jones <rjones(a)debian5x64.home.annexia.org&gt; Date: Wed, 4 Nov 2009 14:30:41 +0000 Subject: [PATCH 2/3] Debian: Ignore Debian appliance root when looking for translatable files. --- Makefile.am | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/Makefile.am b/Makefile.am index a4f4b0b..87efb2d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -194,6 +194,7 @@ all-local: grep -v '^perl/examples/' | \ grep -v '/guestfs_protocol.c' | \ grep -v '/rc_protocol.c' | \ + grep -v 'appliance/debian/root' | \ LC_ALL=C sort | \ sed 's,^\./,,' > po/POTFILES.in -- 1.6.5.2

>From a3be3a3b877277c1e4b130e1676b9ad307cafa10 Mon Sep 17 00:00:00 2001 From: Richard Jones <rjones(a)debian5x64.home.annexia.org&gt; Date: Wed, 4 Nov 2009 14:31:06 +0000 Subject: [PATCH 3/3] Debian: Include ISOFS driver in the kernel. --- appliance/kmod.whitelist.in | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/appliance/kmod.whitelist.in b/appliance/kmod.whitelist.in index 533bda8..9a93413 100644 --- a/appliance/kmod.whitelist.in +++ b/appliance/kmod.whitelist.in @@ -43,6 +43,9 @@ nls_utf8.ko nls_cp437.ko nls_base.ko +isofs.ko +zlib_inflate.ko + dm-*.ko cramfs.ko -- 1.6.5.2

_______________________________________________ Libguestfs mailing list Libguestfs(a)redhat.com https://www.redhat.com/mailman/listinfo/libguestfs

Another fix revealed by testing this on Debian.

Subject: [PATCH] Debian: Use /bin/bash as the shell for regression test scripts. /bin/sh on Debian is a minimal shell called 'dash' which doesn't support some features we need such as the particular 'function' syntax used by regressions/test-stringlist.sh, and therefore this script was failing on Debian.

Change all of these scripts to use #!/bin/bash explicitly to avoid these sorts of problems. --- regressions/rhbz503169c10.sh | 2 +- regressions/rhbz503169c13.sh | 2 +- regressions/test-bootbootboot.sh | 2 +- .../test-cancellation-download-librarycancels.sh | 2 +- .../test-cancellation-upload-daemoncancels.sh | 2 +- regressions/test-find0.sh | 2 +- regressions/test-qemudie-killsub.sh | 2 +- regressions/test-qemudie-launchfail.sh | 2 +- regressions/test-qemudie-midcommand.sh | 2 +- regressions/test-qemudie-synch.sh | 2 +- regressions/test-read_file.sh | 2 +- regressions/test-remote.sh | 2 +- regressions/test-reopen.sh | 2 +- regressions/test-stringlist.sh | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/regressions/rhbz503169c10.sh b/regressions/rhbz503169c10.sh index 8813c05..91284e0 100755 --- a/regressions/rhbz503169c10.sh +++ b/regressions/rhbz503169c10.sh @@ -1,4 +1,4 @@ -#!/bin/sh - +#!/bin/bash -