| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
|
|
|
| |
(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)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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)
|
|
|
|
|
| |
These haven't been used since we switched over to virtio-serial.
(cherry picked from commit 78a515ec4a4e8650bd2e1ffc0bfbb97b9568306d)
|
|
|
|
|
|
|
|
| |
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)
|
|
|
|
|
|
| |
By setting these variables, we can skip tests that fail on
RHEL 5.
(cherry picked from commit 145f35badfd9ca4a6d9f54f7732566a5e5114876)
|
| |
|
|
|
|
|
| |
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
and backported to libguestfs 1.16.
|
|
|
|
| |
(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
and backported to libguestfs 1.16 branch.
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
and backported to libguestfs 1.16. This includes more of the
development 'configure.ac' than is strictly necessary, but on the
other hand it brings the code closer to that development branch.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
and backported to libguestfs 1.16.
|
|
|
|
| |
(cherry picked from commit cef979b2897725b735c68f5b806d332f4cea864d)
|
|
|
|
|
| |
Use a small sed script to canonicalize the device names.
(cherry picked from commit 320adf477805f703b0a1c79d86c3fb4078d11700)
|
|
|
|
| |
(cherry picked from commit 9a5c0d39081f9f40d7ad12fbb55fb6120046679c)
|
|
|
|
|
|
| |
Hard-coding it breaks virtio-scsi because the devices are called
/dev/sda etc.
(cherry picked from commit 7509cdf18e6d3fd96b10246f4d0417e5285e38f6)
|
|
|
|
|
|
|
|
|
|
|
| |
Apparently e2fsprogs only knows that "/dev/sda" is a whole device, but
doesn't think that "/dev/vda" is. On switching the default device
over to virtio-scsi, that causes mke2fs without -F option to complain
and ask for an interactive prompt. Adding -F forces it to go ahead
anyway.
This caused several less-used APIs to break with virtio-scsi.
(cherry picked from commit 62c5b6db58911a5e51f59965619355437b7a7214)
|
|
|
|
| |
(cherry picked from commit 251b131e0a55cce21f6ee2240315903e34c4ffe1)
|
|
|
|
|
|
| |
The output of this test depends on page size, so on ppc64
it returns 64K.
(cherry picked from commit 42475dd21fbdc551137fe815efadf08a87729642)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The test used the external 'od' command to compare the output of
guestfish with what it's supposed to be. Unfortunately by default
this outputs groups of 2-byte words, with the words' endianness
affected by the current hardware endianness. For example:
x86-64$ echo -n ab | od
0000000 061141
0000002
ppc64$ echo -n ab | od
0000000 060542
0000002
By using 'od -b' instead we can output bytes instead of words, and
there is no endianness issue, and the output is clearer:
x86-64$ echo -n ab | od -b
0000000 141 142
0000002
ppc64$ echo -n ab | od -b
0000000 141 142
0000002
(cherry picked from commit 20137c8731d142797e2476e35fe724c95a8a7a06)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Since RHBZ was updated, the old python-bugzilla program broke. When
it was fixed, I found the (undocumented) ordering of the results from
the old tool was no longer true.
This commit adds a small Perl script to sort the output predictably.
Now bugs are sorted by both bug state and bug number, so the output
should be more stable than before.
Re-enable creation of the BUGS file in 'make dist'
(this reverts commit 91f3456244e7843768da659e24ce0aeeb4ebe4b0).
Also the BUGS file has been updated.
Cherry picked from commit f90c01a5dc6a01284debdd0a45406f9d4a5e7159
and backported to libguestfs 1.16 branch. Note the BUGS file has
been deleted, and will be updated at the next release.
|
|
|
|
|
| |
The first parameter (not used) is a unit, so declare it properly.
(cherry picked from commit 1bdfc88eba7f932b2581d55ecf4455d0e70335c2)
|
|
|
|
| |
(cherry picked from commit 3893dc0b9436ebb4dd620c6ca9b1d038eacf83a6)
|
|
|
|
| |
(cherry picked from commit 148e8068267bcf9ce8ff3a5062747998f960619d)
|
| |
|
|
|
|
|
| |
Red Hat Bugzilla is broken: RHBZ#823510.
(cherry picked from commit 91f3456244e7843768da659e24ce0aeeb4ebe4b0)
|
|
|
|
| |
(cherry picked from commit a7868dd3c940b6cee0894e6033ba611f01a423dd)
|
|
|
|
|
| |
This should be just code motion.
(cherry picked from commit a7e4a6c692554e4207b3bdff65946427e66e9fce)
|
|
|
|
| |
(cherry picked from commit fba81add94cde015afe8a65245cb4e60a1d3e6bf)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
(RHBZ#823821).
Change guestfs___first_line_of_file so that if the file is empty this
returns an empty string instead of an error. This is consistent with
the behaviour of this function in the case where the file starts with
a \n character, where it would previously have returned an empty
string.
Change all callers so that they handle this case.
Then change the hostname parsing code so that it doesn't give up when
/etc/HOSTNAME is empty, but falls through to the next alternative, and
similarly for /etc/hostname.
Thanks Todd Mummert for finding and diagnosing this bug.
(cherry picked from commit f00066d22b11bf40d0272f68565a2a27fea15627)
|
|
|
|
|
|
|
|
|
|
| |
parse_release_file should be used to set fs->product_name, instead of
calling guestfs___first_line_of_file directory, although currently the
two are equivalent.
This is code motion and fixes
commit b648b1813fc8e55db790435b5414d9be3ec765d2.
(cherry picked from commit cffb7fefc88a317f957785f6448fb24183c8c629)
|
|
|
|
| |
(cherry picked from commit ee9ab52bc3e087f63dcc51d3b6ac5c79277425e1)
|
|
|
|
| |
(cherry picked from commit 216a6d16abdfbc36a5514df34f59507ef825e33e)
|