| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
|
|
|
|
|
|
|
|
|
|
| |
Replace:
cp tests/guests/fedora.img test.img
with the longer but possibly more space-efficient equivalent:
qemu-img create -F raw -b tests/guests/fedora.img -f qcow2 test.qcow2
(cherry picked from commit 339f3647f889424af2a2256c4fcad0b44982c275)
|
|
|
|
|
|
| |
If the partition name we're about to return doesn't really exist,
then don't perform the mapping.
(cherry picked from commit ea8421c5d297698856a87c2cfe4a6b42796175a8)
|
|
|
|
|
|
|
|
|
| |
See https://bugzilla.redhat.com/show_bug.cgi?id=836573#c3
for an explanation.
Useful function 'is_partition' shows how to tell if a device name
represents a partition.
(cherry picked from commit 7eaa99994ebd354f4b078d4068695984989a907f)
|
|
|
|
|
|
|
|
| |
This returns the number of whole block devices added. It is usually
simpler to call this than to list the devices and count them, which
is what we do in some places in the current codebase.
(cherry picked from commit 152b179a19e43fcb0baec65ea65d394ee1dba891)
|
|
|
|
|
|
|
|
| |
This returns the index of the device, eg. /dev/sdb => 1.
Or you can think of it as the order that the device was
added, or the index of the device in guestfs_list_devices.
(cherry picked from commit a9d7d044f552855a7ef78d953c0c2672e35bfc80)
|
|
|
|
|
|
|
| |
This is mostly code motion, although it also fixes a memory leak in an
extremely rare failure case, and it generally tidies up the existing
code.
(cherry picked from commit 47b8225b05a7e35411f954f61f3eb3115c5a9f45)
|
|
|
|
|
|
|
|
|
|
| |
On Debian, the Ruby C extensions library isn't '-lruby', it's
something like '-lruby1.8' or '-lruby-1.9.1' and these can even be
parallel-installed.
Fix detection so we use Ruby's own rbconfig.rb file to find the right
library to use.
(cherry picked from commit cba49169094f04dead9b165b6b5991afa92132ff)
|
|
|
|
|
| |
No functional change.
(cherry picked from commit b07d0968823d008776345a1c724713d2320e1571)
|
|
|
|
| |
(cherry picked from commit b9f858e5eefa0d2abae5ff0a61a39b0d34334bc1)
|
|
|
|
|
|
| |
No functional change.
(cherry picked from commit 2d56e5af900662ea0a13e9e8ea4a802609214ecc)
|
| |
|
|
|
|
| |
(cherry picked from commit 1d17a6e9d8f434f952f3c171b5a81ca6b916fa1f)
|
|
|
|
|
|
|
|
| |
On RHEL 5, because _GNU_SOURCE was not defined, open_memstream was not
being declared, resulting in miscompilation and a segfault in the
trace code whenever open_memstream returned a pointer >= 0x80000000
(which would be truncated to a 32 bit int and then sign-extended).
(cherry picked from commit 6777425636d1c04494e52c61dc44f523458d12d3)
|
|
|
|
|
|
|
|
|
|
| |
When libguestfs calls 'error (g, "error")', gjs in F17 throws
error.message == "Error invoking Guestfs.test0rinterr: error"
In F18, error.message is simply the string "error".
Fix the test so it works for both cases.
(cherry picked from commit 6afb7336e33dc28c4fd1a4545a8298ee36c10723)
|
|
|
|
| |
(cherry picked from commit bbb7d75c91450ab029edb794b0486eeb8220e4fd)
|
|
|
|
|
| |
FUSE is not very reliable on RHEL 5.
(cherry picked from commit 0977c8408a1119c0582e3d2ab6edef23a1f1f22e)
|
|
|
|
| |
(cherry picked from commit 8d88b06277c1d6d7a26b9434cc69a7bae9ada7fc)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The stdin and stdout of the qemu process are aliased to g->fd:
g->fd[0] = wfd[1];
g->fd[1] = rfd[0];
However if the child exits early, then child_cleanup closes g->fd[0],
g->fd[1], AND the code at the cleanup1 label closes wfd[1], rfd[0],
resulting in a double-close.
Avoid this case by setting wfd[1], rfd[0] to -1. In the cleanup1
label, only close wfd[1], rfd[0] if they are not -1, and add the same
for g->fd[0], g->fd[1].
(cherry picked from commit c87956837e962072fff61edef5b18e55ad42d730)
|
|
|
|
| |
(cherry picked from commit 9e221e55b61e9f1cd0caf292ca609a4ca26f1d4d)
|
|
|
|
|
| |
This fixes commit ef5c02c6ee72eb8e127115923951777a2c2b8480.
(cherry picked from commit 11317b5d1243f3afc35f7abe8edc646f75813e36)
|
|
|
|
| |
(cherry picked from commit ef5c02c6ee72eb8e127115923951777a2c2b8480)
|
|
|
|
| |
(cherry picked from commit 90d0beb3c528d91029349b64d0159836c776189b)
|
|
|
|
|
|
| |
The program doesn't actually require FUSE when used without
any --script options.
(cherry picked from commit 8fc2127975de2f364e348c5a558d78e77988953c)
|
|
|
|
|
| |
The test uses FUSE, so we need a way to disable it on RHEL 5.
(cherry picked from commit f27770e1412c0dbe652d490791347911aac62b24)
|
|
|
|
|
|
|
| |
This was always incorrect behaviour, but qemu appears to tolerate it.
This cherry picks just the test fixes from
commit 729bb9c6b5ae0c0e7c68dc802b1617936062f966.
|
|
|
|
|
| |
These haven't been used since we switched over to virtio-serial.
(cherry picked from commit 78a515ec4a4e8650bd2e1ffc0bfbb97b9568306d)
|
|
|
|
|
|
|
|
|
|
|
|
| |
Old <libvirt.h> had a conflicting definition of virDomainGetXMLDesc:
fake_libvirt_xml.c:36: error: conflicting types for 'virDomainGetXMLDesc'
/usr/include/libvirt/libvirt.h:715: error: previous declaration of 'virDomainGetXMLDesc' was here
The difference is not material ('int' vs. 'unsigned int').
Avoid the error by not including <libvirt.h>.
(cherry picked from commit 461455ca7cab93af09445d135483f5705589cc0c)
|
|
|
|
| |
(cherry picked from commit 9e7644346dc4303316e59dda13ea5b2f60549626)
|
|
|
|
| |
(cherry picked from commit 35882ba97722ddf9b4c55a332961b08ad8240dd7)
|
|
|
|
|
|
|
|
| |
Another instance of 'truncate' command.
See commit 39df80dcc0e485e69048bddbf33c259ce532e50d for an
explanation.
(cherry picked from commit ef1514aa1e0a099d71cbb7d2c5f24f9f32e1939d)
|
|
|
|
|
|
|
|
|
| |
The original fix for this in
commit 511c82df46f5c6f4a7f984fdb81d4691038ed6da was not complete, in
that it did not fix the case of the old (pre '-m' option) parted.
This doesn't matter for Fedora, but it matters for RHEL 5 which has
this ancient parted.
(cherry picked from commit 4d3ec25b47361601604e2f585178393e60f4cd4d)
|
|
|
|
|
| |
This function was first added to Ruby in 1.8.7.
(cherry picked from commit 8098d062b4cb70defd4aecba0ba8cd75cf893751)
|
|
|
|
|
|
|
| |
If -lruby was not available, this used to define HAVE_LIBRUBY=0.
However this meant that the later test -n "$HAVE_LIBRUBY" would
be successful, whereas it should fail in this case.
(cherry picked from commit 823ba05ebd8f1a12574a3f154aaf7c8b4f2aeeac)
|
|
|
|
|
|
| |
This API is optional. Don't call it unless it's available
in the appliance.
(cherry picked from commit 6cb74d46ba5b1c3f1edd3bfb12df9d4da2ec8a8f)
|
|
|
|
|
|
| |
By setting these variables, we can skip tests that fail on
RHEL 5.
(cherry picked from commit 145f35badfd9ca4a6d9f54f7732566a5e5114876)
|
| |
|
|
|
|
| |
(cherry picked from commit 6352953ea927819a8ece795d03c4938e657d0a97)
|
|
|
|
|
| |
This didn't exist on ancient autoconf in RHEL 5.
(cherry picked from commit 489da3ccdf96e995d3f53fe68eced37b16baa1d2)
|
|
|
|
|
|
|
| |
This is missing on RHEL 5.
This updates commit 50aa9533e4a505e1c64dbedddb30491bfbb755d6.
(cherry picked from commit bc7f1a5ef156576c069f47ea33f4977979ac032d)
|
|
|
|
| |
(cherry picked from commit d7c9c6a0d926982b64d13949a5da580ea4ecc4b6)
|
|
|
|
|
|
|
|
|
|
|
| |
RHEL 5 didn't have the truncate command, but we can replace:
truncate -s SIZE FILE
with the roughly equivalent command:
guestfish sparse FILE SIZE
(cherry picked from commit 39df80dcc0e485e69048bddbf33c259ce532e50d)
|
|
|
|
|
|
|
|
| |
RHEL 5-era FUSE didn't have this function.
I copied the function out of upstream FUSE, since the license is
compatible.
(cherry picked from commit 4846b84476015874d569c14c2c30fcd71aa4d54c)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
RHEL 5-era autoconf did not define these, so define them manually
when they are missing.
Define builddir as '.' The scripts require this. It won't work
in the srcdir != builddir case, but we don't care about that for
RHEL 5.
This commit also moves the builddir / abs_srcdir variable setting
above the include of subdir-rules.mk, in case that include uses
these variables.
Useful script:
for f in $(find -name Makefile.am | xargs fgrep '$(abs_srcdir)' -l) ; do
if ! grep -q '^abs_srcdir' $f; then
echo missing in $f
fi
done
(cherry picked from commit 50aa9533e4a505e1c64dbedddb30491bfbb755d6)
|
|
|
|
| |
(cherry picked from commit dd216fedbdacfd641c2da4073ae26d3ccb6098a6)
|
|
|
|
|
| |
For our purposes, the two tools are compatible.
(cherry picked from commit 87de36670108a19b832e8f5ded8d413e7b575d70)
|
|
|
|
| |
(cherry picked from commit 60a2f8706b305b4068df020598abee9566022e20)
|
|
|
|
| |
(cherry picked from commit d43e3d63de1622e98313bb797922dfd7d95ddd11)
|
|
|
|
|
| |
Thanks Alasdair Kergon.
(cherry picked from commit 998ebc333dbfe40c5953e36fb42f9610727a7532)
|
|
|
|
|
|
| |
Sort the device names correctly, not just treating them as
strings. As a result, /dev/sdz < /dev/sdaa.
(cherry picked from commit c0a087b8236755e95371d5c352c9d29a3ca992c0)
|
|
|
|
| |
(cherry picked from commit cef979b2897725b735c68f5b806d332f4cea864d)
|