F-11 libvirt no longer creating firewall/iptables rules for virtual network?
by Jonathan Underwood
Hi there,
I've recently installed F-11 and am having a problem with networking
between the host and guest with the default network configuration -
specifically that the iptables rules for virbr0 are not being inserted
by libvirt as they used to be under F-10.
I am using the default configuration of the firewall as shipped with
F-11. The guest instance is a windowsXP image created under F-10 - I
simply recreated the cconfig files by "creating" a new guest under
virt-manager and pointing it to the disk image file. The guest boots
up fine, but no networking. The output of iptables -L doesn't contain
any reference to virbr0 or vnet0 (the latter automatically created
when starting the guest OS) - I have confirmed virbr0 and vnet0 are
present using ifconfig.. In case it's relevant this machine is using
NetworkManager and has a single wired ethernet adapter configured with
a static IP.
Any suggestions on how I can debug further ?
Thanks,
jonathan
14 years, 9 months
[PATCH libguestfs] generate slightly more "const-correct" code
by Jim Meyering
const correctness is nice.
These changes exposed no problems and induced no new warnings.
>From 4a8c1284e88a3a92377919616e73c65ea68e33ae Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering(a)redhat.com>
Date: Fri, 3 Jul 2009 14:17:23 +0200
Subject: [PATCH libguestfs] generate slightly more "const-correct" code
* src/generator.ml: Add a few "const" attributes.
---
src/generator.ml | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/generator.ml b/src/generator.ml
index c65e717..5c9e1c3 100755
--- a/src/generator.ml
+++ b/src/generator.ml
@@ -4686,7 +4686,7 @@ and generate_one_test_body name i test_name init test =
List.iter (generate_test_command_call test_name) seq
| TestOutput (seq, expected) ->
pr " /* TestOutput for %s (%d) */\n" name i;
- pr " char expected[] = \"%s\";\n" (c_quote expected);
+ pr " const char *expected = \"%s\";\n" (c_quote expected);
let seq, last = get_seq_last seq in
let test () =
pr " if (strcmp (r, expected) != 0) {\n";
@@ -4708,7 +4708,7 @@ and generate_one_test_body name i test_name init test =
pr " return -1;\n";
pr " }\n";
pr " {\n";
- pr " char expected[] = \"%s\";\n" (c_quote str);
+ pr " const char *expected = \"%s\";\n" (c_quote str);
pr " if (strcmp (r[%d], expected) != 0) {\n" i;
pr " fprintf (stderr, \"%s: expected \\\"%%s\\\" but got \\\"%%s\\\"\\n\", expected, r[%d]);\n" test_name i;
pr " return -1;\n";
@@ -4736,7 +4736,7 @@ and generate_one_test_body name i test_name init test =
pr " return -1;\n";
pr " }\n";
pr " {\n";
- pr " char expected[] = \"%s\";\n" (c_quote str);
+ pr " const char *expected = \"%s\";\n" (c_quote str);
pr " r[%d][5] = 's';\n" i;
pr " if (strcmp (r[%d], expected) != 0) {\n" i;
pr " fprintf (stderr, \"%s: expected \\\"%%s\\\" but got \\\"%%s\\\"\\n\", expected, r[%d]);\n" test_name i;
@@ -4882,7 +4882,7 @@ and generate_test_command_call ?(expect_error = false) ?test test_name cmd =
| OptString n, "NULL" -> ()
| String n, arg
| OptString n, arg ->
- pr " char %s[] = \"%s\";\n" n (c_quote arg);
+ pr " const char *%s = \"%s\";\n" n (c_quote arg);
| Int _, _
| Bool _, _
| FileIn _, _ | FileOut _, _ -> ()
@@ -4890,9 +4890,9 @@ and generate_test_command_call ?(expect_error = false) ?test test_name cmd =
let strs = string_split " " arg in
iteri (
fun i str ->
- pr " char %s_%d[] = \"%s\";\n" n i (c_quote str);
+ pr " const char *%s_%d = \"%s\";\n" n i (c_quote str);
) strs;
- pr " char *%s[] = {\n" n;
+ pr " const char *%s[] = {\n" n;
iteri (
fun i _ -> pr " %s_%d,\n" n i
) strs;
--
1.6.3.3.507.gc6b5a
14 years, 9 months
[PATCH libguestfs] avoid leak upon failed realloc
by Jim Meyering
Hi again,
No big deal, but might as well fix this...
>From a4040866dd60c92bb2994f8fd9f0d57b62f1842c Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering(a)redhat.com>
Date: Fri, 3 Jul 2009 12:05:22 +0200
Subject: [PATCH libguestfs] avoid leak upon failed realloc
* daemon/guestfsd.c (commandrv): Free original buffer (rather
than leaking it) if realloc fails.
---
daemon/guestfsd.c | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/daemon/guestfsd.c b/daemon/guestfsd.c
index 581c82e..87065b9 100644
--- a/daemon/guestfsd.c
+++ b/daemon/guestfsd.c
@@ -572,19 +572,23 @@ commandrv (char **stdoutput, char **stderror, char * const* const argv)
* trailing \n characters from the error buffer (not from stdout).
*/
if (stdoutput) {
- *stdoutput = realloc (*stdoutput, so_size+1);
- if (*stdoutput == NULL) {
+ void *q = realloc (*stdoutput, so_size+1);
+ if (q == NULL) {
perror ("realloc");
- *stdoutput = NULL;
- } else
+ free (*stdoutput);
+ }
+ *stdoutput = q;
+ if (*stdoutput)
(*stdoutput)[so_size] = '\0';
}
if (stderror) {
- *stderror = realloc (*stderror, se_size+1);
- if (*stderror == NULL) {
+ void *q = realloc (*stderror, se_size+1);
+ if (q == NULL) {
perror ("realloc");
- *stderror = NULL;
- } else {
+ free (*stderror);
+ }
+ *stderror = q;
+ if (*stderror) {
(*stderror)[se_size] = '\0';
se_size--;
while (se_size >= 0 && (*stderror)[se_size] == '\n')
--
1.6.3.3.507.gc6b5a
14 years, 9 months
[PATCH libguestfs] remove trailing blanks
by Jim Meyering
Hi Rich,
What do you think about this?
I was slightly annoyed to see occasional trailing blanks
being highlighted. This removes them all:
git grep -a -l '[[:blank:]]$' | grep -v -E '\.(gif|png|jpg|rpm)$' \
| xargs perl -pi -e 's/[ \t]+$//'
>From 840056c7e5b51462aa8c959bbaa58e6c392daa92 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering(a)redhat.com>
Date: Fri, 3 Jul 2009 11:53:49 +0200
Subject: [PATCH libguestfs] remove trailing blanks
---
ABOUT-NLS | 6 +++---
daemon/augeas.c | 2 +-
daemon/blockdev.c | 2 +-
daemon/checksum.c | 2 +-
daemon/cmp.c | 2 +-
daemon/command.c | 2 +-
daemon/cpmv.c | 2 +-
daemon/debug.c | 2 +-
daemon/devsparts.c | 2 +-
daemon/df.c | 2 +-
daemon/dir.c | 2 +-
daemon/dmesg.c | 2 +-
daemon/dropcaches.c | 2 +-
daemon/du.c | 2 +-
daemon/ext2.c | 2 +-
daemon/file.c | 2 +-
daemon/find.c | 2 +-
daemon/fsck.c | 2 +-
daemon/glob.c | 2 +-
daemon/grub.c | 2 +-
daemon/guestfsd.c | 2 +-
daemon/headtail.c | 2 +-
daemon/hexdump.c | 2 +-
daemon/initrd.c | 2 +-
daemon/ls.c | 2 +-
daemon/lvm.c | 2 +-
daemon/mknod.c | 2 +-
daemon/mount.c | 2 +-
daemon/ntfs.c | 2 +-
daemon/pingdaemon.c | 2 +-
daemon/proto.c | 2 +-
daemon/readdir.c | 2 +-
daemon/scrub.c | 2 +-
daemon/sfdisk.c | 2 +-
daemon/sleep.c | 2 +-
daemon/stat.c | 2 +-
daemon/strings.c | 2 +-
daemon/swap.c | 2 +-
daemon/sync.c | 2 +-
daemon/tar.c | 2 +-
daemon/umask.c | 2 +-
daemon/upload.c | 2 +-
daemon/wc.c | 2 +-
daemon/zero.c | 2 +-
daemon/zerofree.c | 2 +-
fish/alloc.c | 2 +-
fish/echo.c | 2 +-
fish/edit.c | 2 +-
fish/fish.c | 2 +-
fish/glob.c | 2 +-
fish/lcd.c | 2 +-
fish/more.c | 2 +-
fish/time.c | 2 +-
guestfish.pod | 6 +++---
guestfs.pod | 14 +++++++-------
inspector/virt-inspector.pl | 2 +-
libguestfs.pc.in | 2 +-
m4/intltool.m4 | 32 ++++++++++++++++----------------
m4/intmax.m4 | 2 +-
ocaml/.depend | 10 +++++-----
recipes/clone.example | 2 +-
recipes/export2tar.example | 4 ++--
recipes/iso2tar.example | 2 +-
regressions/test-cleanup.sh | 1 -
64 files changed, 93 insertions(+), 94 deletions(-)
diff --git a/ABOUT-NLS b/ABOUT-NLS
index 2f50c66..18386f0 100644
--- a/ABOUT-NLS
+++ b/ABOUT-NLS
@@ -319,7 +319,7 @@ translation percentage of at least 50%.
+----------------------------------------------------+
af am ar az be bg bs ca cs da de el en en_GB eo es
4 0 0 1 9 4 1 40 41 60 78 17 1 5 13 68
-
+
et eu fa fi fr ga gl he hr hu id is it ja ko lg
+-------------------------------------------------+
a2ps | [] [] [] () () |
@@ -456,7 +456,7 @@ translation percentage of at least 50%.
+-------------------------------------------------+
et eu fa fi fr ga gl he hr hu id is it ja ko lg
22 2 1 26 106 28 24 8 10 41 33 1 26 33 12 0
-
+
lt lv mk mn ms mt nb nl nn no nso pl pt pt_BR ro ru
+-----------------------------------------------------+
a2ps | [] [] () () [] [] [] |
@@ -593,7 +593,7 @@ translation percentage of at least 50%.
+-----------------------------------------------------+
lt lv mk mn ms mt nb nl nn no nso pl pt pt_BR ro ru
1 2 0 3 12 0 10 69 6 7 1 40 26 36 76 63
-
+
sk sl sr sv ta th tr uk ven vi wa xh zh_CN zh_TW zu
+-----------------------------------------------------+
a2ps | [] [] [] [] | 16
diff --git a/daemon/augeas.c b/daemon/augeas.c
index 9b45f97..383812f 100644
--- a/daemon/augeas.c
+++ b/daemon/augeas.c
@@ -1,5 +1,5 @@
/* libguestfs - the guestfsd daemon
- * Copyright (C) 2009 Red Hat Inc.
+ * Copyright (C) 2009 Red Hat Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/daemon/blockdev.c b/daemon/blockdev.c
index 1b0185a..35d14bf 100644
--- a/daemon/blockdev.c
+++ b/daemon/blockdev.c
@@ -1,5 +1,5 @@
/* libguestfs - the guestfsd daemon
- * Copyright (C) 2009 Red Hat Inc.
+ * Copyright (C) 2009 Red Hat Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/daemon/checksum.c b/daemon/checksum.c
index 3654b65..bb30b05 100644
--- a/daemon/checksum.c
+++ b/daemon/checksum.c
@@ -1,5 +1,5 @@
/* libguestfs - the guestfsd daemon
- * Copyright (C) 2009 Red Hat Inc.
+ * Copyright (C) 2009 Red Hat Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/daemon/cmp.c b/daemon/cmp.c
index 04feba6..f650083 100644
--- a/daemon/cmp.c
+++ b/daemon/cmp.c
@@ -1,5 +1,5 @@
/* libguestfs - the guestfsd daemon
- * Copyright (C) 2009 Red Hat Inc.
+ * Copyright (C) 2009 Red Hat Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/daemon/command.c b/daemon/command.c
index b33f2db..3f21807 100644
--- a/daemon/command.c
+++ b/daemon/command.c
@@ -1,5 +1,5 @@
/* libguestfs - the guestfsd daemon
- * Copyright (C) 2009 Red Hat Inc.
+ * Copyright (C) 2009 Red Hat Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/daemon/cpmv.c b/daemon/cpmv.c
index b87d7a4..5448a97 100644
--- a/daemon/cpmv.c
+++ b/daemon/cpmv.c
@@ -1,5 +1,5 @@
/* libguestfs - the guestfsd daemon
- * Copyright (C) 2009 Red Hat Inc.
+ * Copyright (C) 2009 Red Hat Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/daemon/debug.c b/daemon/debug.c
index d6e469b..68320a3 100644
--- a/daemon/debug.c
+++ b/daemon/debug.c
@@ -1,5 +1,5 @@
/* libguestfs - the guestfsd daemon
- * Copyright (C) 2009 Red Hat Inc.
+ * Copyright (C) 2009 Red Hat Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/daemon/devsparts.c b/daemon/devsparts.c
index 4c7a643..32d2fa8 100644
--- a/daemon/devsparts.c
+++ b/daemon/devsparts.c
@@ -1,5 +1,5 @@
/* libguestfs - the guestfsd daemon
- * Copyright (C) 2009 Red Hat Inc.
+ * Copyright (C) 2009 Red Hat Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/daemon/df.c b/daemon/df.c
index 0a7303c..73604b4 100644
--- a/daemon/df.c
+++ b/daemon/df.c
@@ -1,5 +1,5 @@
/* libguestfs - the guestfsd daemon
- * Copyright (C) 2009 Red Hat Inc.
+ * Copyright (C) 2009 Red Hat Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/daemon/dir.c b/daemon/dir.c
index 753323d..6eb86bb 100644
--- a/daemon/dir.c
+++ b/daemon/dir.c
@@ -1,5 +1,5 @@
/* libguestfs - the guestfsd daemon
- * Copyright (C) 2009 Red Hat Inc.
+ * Copyright (C) 2009 Red Hat Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/daemon/dmesg.c b/daemon/dmesg.c
index 2e58eb9..adc3426 100644
--- a/daemon/dmesg.c
+++ b/daemon/dmesg.c
@@ -1,5 +1,5 @@
/* libguestfs - the guestfsd daemon
- * Copyright (C) 2009 Red Hat Inc.
+ * Copyright (C) 2009 Red Hat Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/daemon/dropcaches.c b/daemon/dropcaches.c
index 82d95ee..a818323 100644
--- a/daemon/dropcaches.c
+++ b/daemon/dropcaches.c
@@ -1,5 +1,5 @@
/* libguestfs - the guestfsd daemon
- * Copyright (C) 2009 Red Hat Inc.
+ * Copyright (C) 2009 Red Hat Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/daemon/du.c b/daemon/du.c
index 6287a20..6f1adba 100644
--- a/daemon/du.c
+++ b/daemon/du.c
@@ -1,5 +1,5 @@
/* libguestfs - the guestfsd daemon
- * Copyright (C) 2009 Red Hat Inc.
+ * Copyright (C) 2009 Red Hat Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/daemon/ext2.c b/daemon/ext2.c
index c5e1415..5a1d0fd 100644
--- a/daemon/ext2.c
+++ b/daemon/ext2.c
@@ -1,5 +1,5 @@
/* libguestfs - the guestfsd daemon
- * Copyright (C) 2009 Red Hat Inc.
+ * Copyright (C) 2009 Red Hat Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/daemon/file.c b/daemon/file.c
index 3f07ffc..3ef7441 100644
--- a/daemon/file.c
+++ b/daemon/file.c
@@ -1,5 +1,5 @@
/* libguestfs - the guestfsd daemon
- * Copyright (C) 2009 Red Hat Inc.
+ * Copyright (C) 2009 Red Hat Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/daemon/find.c b/daemon/find.c
index 7ceeafa..85994b6 100644
--- a/daemon/find.c
+++ b/daemon/find.c
@@ -1,5 +1,5 @@
/* libguestfs - the guestfsd daemon
- * Copyright (C) 2009 Red Hat Inc.
+ * Copyright (C) 2009 Red Hat Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/daemon/fsck.c b/daemon/fsck.c
index 77e7c66..f1a9dc5 100644
--- a/daemon/fsck.c
+++ b/daemon/fsck.c
@@ -1,5 +1,5 @@
/* libguestfs - the guestfsd daemon
- * Copyright (C) 2009 Red Hat Inc.
+ * Copyright (C) 2009 Red Hat Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/daemon/glob.c b/daemon/glob.c
index f39832e..f15d5e5 100644
--- a/daemon/glob.c
+++ b/daemon/glob.c
@@ -1,5 +1,5 @@
/* libguestfs - the guestfsd daemon
- * Copyright (C) 2009 Red Hat Inc.
+ * Copyright (C) 2009 Red Hat Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/daemon/grub.c b/daemon/grub.c
index 85a5ab9..29fe294 100644
--- a/daemon/grub.c
+++ b/daemon/grub.c
@@ -1,5 +1,5 @@
/* libguestfs - the guestfsd daemon
- * Copyright (C) 2009 Red Hat Inc.
+ * Copyright (C) 2009 Red Hat Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/daemon/guestfsd.c b/daemon/guestfsd.c
index e5f2cf0..581c82e 100644
--- a/daemon/guestfsd.c
+++ b/daemon/guestfsd.c
@@ -1,5 +1,5 @@
/* libguestfs - the guestfsd daemon
- * Copyright (C) 2009 Red Hat Inc.
+ * Copyright (C) 2009 Red Hat Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/daemon/headtail.c b/daemon/headtail.c
index b522c55..6d24851 100644
--- a/daemon/headtail.c
+++ b/daemon/headtail.c
@@ -1,5 +1,5 @@
/* libguestfs - the guestfsd daemon
- * Copyright (C) 2009 Red Hat Inc.
+ * Copyright (C) 2009 Red Hat Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/daemon/hexdump.c b/daemon/hexdump.c
index ae7df92..a582c57 100644
--- a/daemon/hexdump.c
+++ b/daemon/hexdump.c
@@ -1,5 +1,5 @@
/* libguestfs - the guestfsd daemon
- * Copyright (C) 2009 Red Hat Inc.
+ * Copyright (C) 2009 Red Hat Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/daemon/initrd.c b/daemon/initrd.c
index 2d6cbdd..7b32a08 100644
--- a/daemon/initrd.c
+++ b/daemon/initrd.c
@@ -1,5 +1,5 @@
/* libguestfs - the guestfsd daemon
- * Copyright (C) 2009 Red Hat Inc.
+ * Copyright (C) 2009 Red Hat Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/daemon/ls.c b/daemon/ls.c
index 61055b6..a440080 100644
--- a/daemon/ls.c
+++ b/daemon/ls.c
@@ -1,5 +1,5 @@
/* libguestfs - the guestfsd daemon
- * Copyright (C) 2009 Red Hat Inc.
+ * Copyright (C) 2009 Red Hat Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/daemon/lvm.c b/daemon/lvm.c
index 0fba447..b81badb 100644
--- a/daemon/lvm.c
+++ b/daemon/lvm.c
@@ -1,5 +1,5 @@
/* libguestfs - the guestfsd daemon
- * Copyright (C) 2009 Red Hat Inc.
+ * Copyright (C) 2009 Red Hat Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/daemon/mknod.c b/daemon/mknod.c
index 5af791f..315ea7d 100644
--- a/daemon/mknod.c
+++ b/daemon/mknod.c
@@ -1,5 +1,5 @@
/* libguestfs - the guestfsd daemon
- * Copyright (C) 2009 Red Hat Inc.
+ * Copyright (C) 2009 Red Hat Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/daemon/mount.c b/daemon/mount.c
index b0cb496..1820f8a 100644
--- a/daemon/mount.c
+++ b/daemon/mount.c
@@ -1,5 +1,5 @@
/* libguestfs - the guestfsd daemon
- * Copyright (C) 2009 Red Hat Inc.
+ * Copyright (C) 2009 Red Hat Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/daemon/ntfs.c b/daemon/ntfs.c
index 87881b1..26c8d50 100644
--- a/daemon/ntfs.c
+++ b/daemon/ntfs.c
@@ -1,5 +1,5 @@
/* libguestfs - the guestfsd daemon
- * Copyright (C) 2009 Red Hat Inc.
+ * Copyright (C) 2009 Red Hat Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/daemon/pingdaemon.c b/daemon/pingdaemon.c
index 5417a1d..0a69afa 100644
--- a/daemon/pingdaemon.c
+++ b/daemon/pingdaemon.c
@@ -1,5 +1,5 @@
/* libguestfs - the guestfsd daemon
- * Copyright (C) 2009 Red Hat Inc.
+ * Copyright (C) 2009 Red Hat Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/daemon/proto.c b/daemon/proto.c
index 3ca4316..62871b5 100644
--- a/daemon/proto.c
+++ b/daemon/proto.c
@@ -1,5 +1,5 @@
/* libguestfs - the guestfsd daemon
- * Copyright (C) 2009 Red Hat Inc.
+ * Copyright (C) 2009 Red Hat Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/daemon/readdir.c b/daemon/readdir.c
index 38bc66e..e3851db 100644
--- a/daemon/readdir.c
+++ b/daemon/readdir.c
@@ -1,5 +1,5 @@
/* libguestfs - the guestfsd daemon
- * Copyright (C) 2009 Red Hat Inc.
+ * Copyright (C) 2009 Red Hat Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/daemon/scrub.c b/daemon/scrub.c
index 9b6d49d..2f14bcb 100644
--- a/daemon/scrub.c
+++ b/daemon/scrub.c
@@ -1,5 +1,5 @@
/* libguestfs - the guestfsd daemon
- * Copyright (C) 2009 Red Hat Inc.
+ * Copyright (C) 2009 Red Hat Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/daemon/sfdisk.c b/daemon/sfdisk.c
index f1726fc..f512e26 100644
--- a/daemon/sfdisk.c
+++ b/daemon/sfdisk.c
@@ -1,5 +1,5 @@
/* libguestfs - the guestfsd daemon
- * Copyright (C) 2009 Red Hat Inc.
+ * Copyright (C) 2009 Red Hat Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/daemon/sleep.c b/daemon/sleep.c
index 2cf3ff7..3b5d395 100644
--- a/daemon/sleep.c
+++ b/daemon/sleep.c
@@ -1,5 +1,5 @@
/* libguestfs - the guestfsd daemon
- * Copyright (C) 2009 Red Hat Inc.
+ * Copyright (C) 2009 Red Hat Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/daemon/stat.c b/daemon/stat.c
index 6b12f4c..da360ce 100644
--- a/daemon/stat.c
+++ b/daemon/stat.c
@@ -1,5 +1,5 @@
/* libguestfs - the guestfsd daemon
- * Copyright (C) 2009 Red Hat Inc.
+ * Copyright (C) 2009 Red Hat Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/daemon/strings.c b/daemon/strings.c
index d78f9fd..2c52532 100644
--- a/daemon/strings.c
+++ b/daemon/strings.c
@@ -1,5 +1,5 @@
/* libguestfs - the guestfsd daemon
- * Copyright (C) 2009 Red Hat Inc.
+ * Copyright (C) 2009 Red Hat Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/daemon/swap.c b/daemon/swap.c
index 7dac96e..faed7f6 100644
--- a/daemon/swap.c
+++ b/daemon/swap.c
@@ -1,5 +1,5 @@
/* libguestfs - the guestfsd daemon
- * Copyright (C) 2009 Red Hat Inc.
+ * Copyright (C) 2009 Red Hat Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/daemon/sync.c b/daemon/sync.c
index 70962df..b353b6c 100644
--- a/daemon/sync.c
+++ b/daemon/sync.c
@@ -1,5 +1,5 @@
/* libguestfs - the guestfsd daemon
- * Copyright (C) 2009 Red Hat Inc.
+ * Copyright (C) 2009 Red Hat Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/daemon/tar.c b/daemon/tar.c
index 0320604..9540827 100644
--- a/daemon/tar.c
+++ b/daemon/tar.c
@@ -1,5 +1,5 @@
/* libguestfs - the guestfsd daemon
- * Copyright (C) 2009 Red Hat Inc.
+ * Copyright (C) 2009 Red Hat Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/daemon/umask.c b/daemon/umask.c
index ad8573d..22d2cc9 100644
--- a/daemon/umask.c
+++ b/daemon/umask.c
@@ -1,5 +1,5 @@
/* libguestfs - the guestfsd daemon
- * Copyright (C) 2009 Red Hat Inc.
+ * Copyright (C) 2009 Red Hat Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/daemon/upload.c b/daemon/upload.c
index 0f737af..6c5f6dc 100644
--- a/daemon/upload.c
+++ b/daemon/upload.c
@@ -1,5 +1,5 @@
/* libguestfs - the guestfsd daemon
- * Copyright (C) 2009 Red Hat Inc.
+ * Copyright (C) 2009 Red Hat Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/daemon/wc.c b/daemon/wc.c
index 91e1942..370ffdd 100644
--- a/daemon/wc.c
+++ b/daemon/wc.c
@@ -1,5 +1,5 @@
/* libguestfs - the guestfsd daemon
- * Copyright (C) 2009 Red Hat Inc.
+ * Copyright (C) 2009 Red Hat Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/daemon/zero.c b/daemon/zero.c
index 9d793e1..9c803d8 100644
--- a/daemon/zero.c
+++ b/daemon/zero.c
@@ -1,5 +1,5 @@
/* libguestfs - the guestfsd daemon
- * Copyright (C) 2009 Red Hat Inc.
+ * Copyright (C) 2009 Red Hat Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/daemon/zerofree.c b/daemon/zerofree.c
index ed7a3fc..8000bb3 100644
--- a/daemon/zerofree.c
+++ b/daemon/zerofree.c
@@ -1,5 +1,5 @@
/* libguestfs - the guestfsd daemon
- * Copyright (C) 2009 Red Hat Inc.
+ * Copyright (C) 2009 Red Hat Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/fish/alloc.c b/fish/alloc.c
index cdce73c..a7d115a 100644
--- a/fish/alloc.c
+++ b/fish/alloc.c
@@ -1,5 +1,5 @@
/* guestfish - the filesystem interactive shell
- * Copyright (C) 2009 Red Hat Inc.
+ * Copyright (C) 2009 Red Hat Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/fish/echo.c b/fish/echo.c
index b4b5cf1..33992d4 100644
--- a/fish/echo.c
+++ b/fish/echo.c
@@ -1,5 +1,5 @@
/* guestfish - the filesystem interactive shell
- * Copyright (C) 2009 Red Hat Inc.
+ * Copyright (C) 2009 Red Hat Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/fish/edit.c b/fish/edit.c
index c72ad1d..3e6973e 100644
--- a/fish/edit.c
+++ b/fish/edit.c
@@ -1,5 +1,5 @@
/* guestfish - the filesystem interactive shell
- * Copyright (C) 2009 Red Hat Inc.
+ * Copyright (C) 2009 Red Hat Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/fish/fish.c b/fish/fish.c
index 59348c3..b905c55 100644
--- a/fish/fish.c
+++ b/fish/fish.c
@@ -1,5 +1,5 @@
/* guestfish - the filesystem interactive shell
- * Copyright (C) 2009 Red Hat Inc.
+ * Copyright (C) 2009 Red Hat Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/fish/glob.c b/fish/glob.c
index a8ac58a..581bc28 100644
--- a/fish/glob.c
+++ b/fish/glob.c
@@ -1,5 +1,5 @@
/* guestfish - the filesystem interactive shell
- * Copyright (C) 2009 Red Hat Inc.
+ * Copyright (C) 2009 Red Hat Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/fish/lcd.c b/fish/lcd.c
index 359d178..e631f21 100644
--- a/fish/lcd.c
+++ b/fish/lcd.c
@@ -1,5 +1,5 @@
/* guestfish - the filesystem interactive shell
- * Copyright (C) 2009 Red Hat Inc.
+ * Copyright (C) 2009 Red Hat Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/fish/more.c b/fish/more.c
index 8bc9d95..9abb51b 100644
--- a/fish/more.c
+++ b/fish/more.c
@@ -1,5 +1,5 @@
/* guestfish - the filesystem interactive shell
- * Copyright (C) 2009 Red Hat Inc.
+ * Copyright (C) 2009 Red Hat Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/fish/time.c b/fish/time.c
index d2a2066..aae9afe 100644
--- a/fish/time.c
+++ b/fish/time.c
@@ -1,5 +1,5 @@
/* guestfish - the filesystem interactive shell
- * Copyright (C) 2009 Red Hat Inc.
+ * Copyright (C) 2009 Red Hat Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/guestfish.pod b/guestfish.pod
index 0c3fda6..4341e2a 100644
--- a/guestfish.pod
+++ b/guestfish.pod
@@ -49,13 +49,13 @@ Remove C</boot/grub/menu.lst> (in reality not such a great idea):
=head2 As an interactive shell
$ guestfish
-
+
Welcome to guestfish, the libguestfs filesystem interactive shell for
editing virtual machine filesystems.
-
+
Type: 'help' for help with commands
'quit' to quit the shell
-
+
><fs> help
=head2 As a script interpreter
diff --git a/guestfs.pod b/guestfs.pod
index a41fd27..c7310a6 100644
--- a/guestfs.pod
+++ b/guestfs.pod
@@ -7,7 +7,7 @@ guestfs - Library for accessing and modifying virtual machine images
=head1 SYNOPSIS
#include <guestfs.h>
-
+
guestfs_h *handle = guestfs_create ();
guestfs_add_drive (handle, "guest.img");
guestfs_launch (handle);
@@ -49,28 +49,28 @@ If you are using the high-level API, then you should call the
functions in the following order:
guestfs_h *handle = guestfs_create ();
-
+
guestfs_add_drive (handle, "guest.img");
/* call guestfs_add_drive additional times if the guest has
* multiple disks
*/
-
+
guestfs_launch (handle);
guestfs_wait_ready (handle);
/* now you can examine what partitions, LVs etc are available
* you have to mount / at least
- */
+ */
guestfs_mount (handle, "/dev/sda1", "/");
/* now you can perform actions on the guest disk image */
guestfs_touch (handle, "/hello");
-
+
/* you only need to call guestfs_sync if you have made
* changes to the guest image
*/
guestfs_sync (handle);
-
+
guestfs_close (handle);
C<guestfs_wait_ready> and all of the actions including C<guestfs_sync>
@@ -168,7 +168,7 @@ If you set C<cb> to C<NULL> then I<no> handler is called.
Returns the current error handler callback.
-=head2 guestfs_set_out_of_memory_handler
+=head2 guestfs_set_out_of_memory_handler
typedef void (*guestfs_abort_cb) (void);
int guestfs_set_out_of_memory_handler (guestfs_h *handle,
diff --git a/inspector/virt-inspector.pl b/inspector/virt-inspector.pl
index 66b1553..3557a38 100755
--- a/inspector/virt-inspector.pl
+++ b/inspector/virt-inspector.pl
@@ -968,7 +968,7 @@ elsif ($output eq "perl") {
elsif ($output eq "yaml") {
die "virt-inspector: no YAML support\n"
unless exists $INC{"YAML/Any.pm"};
-
+
print Dump(\%oses);
}
diff --git a/libguestfs.pc.in b/libguestfs.pc.in
index bcbc241..679ed7e 100644
--- a/libguestfs.pc.in
+++ b/libguestfs.pc.in
@@ -7,5 +7,5 @@ Name: libguestfs
Version: @VERSION@
Description: libguestfs library for accessing and modifying VM images
Requires:
-Cflags:
+Cflags:
Libs: -lguestfs @LIBS@
diff --git a/m4/intltool.m4 b/m4/intltool.m4
index 122d773..ba4c0b1 100644
--- a/m4/intltool.m4
+++ b/m4/intltool.m4
@@ -55,23 +55,23 @@ if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT";
AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.])
fi
- INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@'
- INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@'
- INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@'
+ INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
diff --git a/m4/intmax.m4 b/m4/intmax.m4
index dfb08cc..d41188d 100644
--- a/m4/intmax.m4
+++ b/m4/intmax.m4
@@ -16,7 +16,7 @@ AC_DEFUN([gt_TYPE_INTMAX_T],
AC_REQUIRE([jm_AC_HEADER_STDINT_H])
AC_CACHE_CHECK(for intmax_t, gt_cv_c_intmax_t,
[AC_TRY_COMPILE([
-#include <stddef.h>
+#include <stddef.h>
#include <stdlib.h>
#if HAVE_STDINT_H_WITH_UINTMAX
#include <stdint.h>
diff --git a/ocaml/.depend b/ocaml/.depend
index 5074667..2a582db 100644
--- a/ocaml/.depend
+++ b/ocaml/.depend
@@ -1,5 +1,5 @@
-guestfs.cmi:
-bindtests.cmo: guestfs.cmi
-bindtests.cmx: guestfs.cmx
-guestfs.cmo: guestfs.cmi
-guestfs.cmx: guestfs.cmi
+guestfs.cmi:
+bindtests.cmo: guestfs.cmi
+bindtests.cmx: guestfs.cmx
+guestfs.cmo: guestfs.cmi
+guestfs.cmx: guestfs.cmi
diff --git a/recipes/clone.example b/recipes/clone.example
index 40b4df1..3ee96c5 100644
--- a/recipes/clone.example
+++ b/recipes/clone.example
@@ -11,7 +11,7 @@ editing virtual machine filesystems.
Type: 'help' for help with commands
'quit' to quit the shell
-><fs> cat /etc/resolv.conf
+><fs> cat /etc/resolv.conf
nameserver 192.168.1.1
><fs> cat /etc/HOSTNAME
newmachine
diff --git a/recipes/export2tar.example b/recipes/export2tar.example
index 47033c8..7f222f3 100644
--- a/recipes/export2tar.example
+++ b/recipes/export2tar.example
@@ -1,8 +1,8 @@
$ ./export2tar.sh /dev/mapper/Guests-RHEL53PV32 /dev/VolGroup00/LogVol00 \
/home /tmp/home.tar.gz
-$ ll /tmp/home.tar.gz
+$ ll /tmp/home.tar.gz
-rw-rw-r--. 1 rjones rjones 824 2009-04-25 12:33 /tmp/home.tar.gz
-$ tar ztf /tmp/home.tar.gz
+$ tar ztf /tmp/home.tar.gz
./
./rjones/
./rjones/.bash_profile
diff --git a/recipes/iso2tar.example b/recipes/iso2tar.example
index 16cb7da..5c796e1 100644
--- a/recipes/iso2tar.example
+++ b/recipes/iso2tar.example
@@ -1,4 +1,4 @@
-$ ll -h /tmp/Fedora-11-Beta-i386-netinst.iso
+$ ll -h /tmp/Fedora-11-Beta-i386-netinst.iso
-r--r--r--. 1 rjones rjones 168M 2009-04-25 22:38 /tmp/Fedora-11-Beta-i386-netinst.iso
$ ./iso2tar.sh /tmp/Fedora-11-Beta-i386-netinst.iso /tmp/cd.tar.gz
$ ls -lh /tmp/cd.tar.gz
diff --git a/regressions/test-cleanup.sh b/regressions/test-cleanup.sh
index 33194ab..a68f57e 100755
--- a/regressions/test-cleanup.sh
+++ b/regressions/test-cleanup.sh
@@ -30,4 +30,3 @@ run
run
ping-daemon
EOF
-
\ No newline at end of file
--
1.6.3.3.507.gc6b5a
14 years, 9 months
[PATCH libguestfs] daemon/readdir: avoid a small leak
by Jim Meyering
>From 1b85f07c6aa5f4877ac066aed9c2341782b7f1fe Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering(a)redhat.com>
Date: Fri, 3 Jul 2009 11:52:19 +0200
Subject: [PATCH libguestfs] daemon/readdir: avoid a small leak
* daemon/readdir.c (do_readdir): Free both p and v.name, in case
only one of the allocations failed.
---
daemon/readdir.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/daemon/readdir.c b/daemon/readdir.c
index cea6fdd..38bc66e 100644
--- a/daemon/readdir.c
+++ b/daemon/readdir.c
@@ -68,6 +68,8 @@ do_readdir (char *path)
if (!p || !v.name) {
reply_with_perror ("allocate");
free (ret->guestfs_int_dirent_list_val);
+ free (p);
+ free (v.name);
free (ret);
closedir (dir);
return NULL;
--
1.6.3.3.507.gc6b5a
14 years, 9 months
[PATCH] Remove receive callbacks
by Matthew Booth
This is a repost of my previous patch, rebased against the current head.
Matt
--
Matthew Booth, RHCA, RHCSS
Red Hat Engineering, Virtualisation Team
M: +44 (0)7977 267231
GPG ID: D33C3490
GPG FPR: 3733 612D 2D05 5458 8A8A 1600 3441 EA19 D33C 3490
14 years, 9 months
[PATCH] Make it possible to build in a separate directory
by Matthew Booth
Attached fixes up some build related things. Note that I'm not convinced
that the debirf will work if the build directory isn't the top level,
and I haven't been able to test. However, the behaviour shouldn't be
changed if you aren't using a separate build directory.
Matt
--
Matthew Booth, RHCA, RHCSS
Red Hat Engineering, Virtualisation Team
M: +44 (0)7977 267231
GPG ID: D33C3490
GPG FPR: 3733 612D 2D05 5458 8A8A 1600 3441 EA19 D33C 3490
14 years, 9 months
Re: [PATCH] allow to build Debian based appliance
by Richard W.M. Jones
On Fri, Jul 03, 2009 at 01:00:20PM +0200, Guido Günther wrote:
> On Fri, Jul 03, 2009 at 10:52:00AM +0100, Richard W.M. Jones wrote:
> >
> > Guido, please see if this cset fixes your issue:
> >
> > http://git.et.redhat.com/?p=libguestfs.git;a=commitdiff;h=a67c46b4b2ff5a2...
> >
> Thanks! Looks good. While looking at this, I noticed that we can easily
> drop some of the debirf scripts. Possible patch attached.
> The remaining symlinks don't contain much. I could put them into one
> script so we don't have to ship any symlinks if you'd prefer that?
>
> The second patch attached touches fakeroot.log (which is what's checked
> by applicance/Makefile) so the appliance doesn't get rebuild every time.
I pushed both of these patches.
Rich.
> >From 8eee4dea4c705d3156ac31356565a8f9b30c2f8d Mon Sep 17 00:00:00 2001
> From: =?utf-8?q?Guido=20G=C3=BCnther?= <agx(a)sigxcpu.org>
> Date: Fri, 3 Jul 2009 12:42:38 +0200
> Subject: [PATCH] remove superflous debirf scripts
>
> ---
> appliance/Makefile.am | 4 ----
> appliance/debian/modules/a0_motd | 1 -
> appliance/debian/modules/network | 1 -
> appliance/debian/modules/root-bashrc | 1 -
> appliance/debian/modules/serial-terminal | 1 -
> 5 files changed, 0 insertions(+), 8 deletions(-)
> delete mode 120000 appliance/debian/modules/a0_motd
> delete mode 120000 appliance/debian/modules/network
> delete mode 120000 appliance/debian/modules/root-bashrc
> delete mode 120000 appliance/debian/modules/serial-terminal
>
> diff --git a/appliance/Makefile.am b/appliance/Makefile.am
> index 9de11cd..ff75a67 100644
> --- a/appliance/Makefile.am
> +++ b/appliance/Makefile.am
> @@ -98,11 +98,7 @@ endif
>
> # Extra symlinks needed by the Debian appliance.
> debirf_symlinks = \
> - a0_motd \
> a0_prep-root \
> - network \
> - root-bashrc \
> - serial-terminal \
> z0_remove-aptitude \
> z0_remove-locales \
> z1_clean-root
> diff --git a/appliance/debian/modules/a0_motd b/appliance/debian/modules/a0_motd
> deleted file mode 120000
> index 8e3ad2f..0000000
> --- a/appliance/debian/modules/a0_motd
> +++ /dev/null
> @@ -1 +0,0 @@
> -/usr/share/debirf/modules/a0_motd
> \ No newline at end of file
> diff --git a/appliance/debian/modules/network b/appliance/debian/modules/network
> deleted file mode 120000
> index 979418d..0000000
> --- a/appliance/debian/modules/network
> +++ /dev/null
> @@ -1 +0,0 @@
> -/usr/share/debirf/modules/network
> \ No newline at end of file
> diff --git a/appliance/debian/modules/root-bashrc b/appliance/debian/modules/root-bashrc
> deleted file mode 120000
> index 651d030..0000000
> --- a/appliance/debian/modules/root-bashrc
> +++ /dev/null
> @@ -1 +0,0 @@
> -/usr/share/debirf/modules/root-bashrc
> \ No newline at end of file
> diff --git a/appliance/debian/modules/serial-terminal b/appliance/debian/modules/serial-terminal
> deleted file mode 120000
> index a5376da..0000000
> --- a/appliance/debian/modules/serial-terminal
> +++ /dev/null
> @@ -1 +0,0 @@
> -/usr/share/debirf/modules/serial-terminal
> \ No newline at end of file
> --
> 1.6.3.3
>
> From: =?utf-8?q?Guido=20G=C3=BCnther?= <agx(a)sigxcpu.org>
> Date: Thu, 2 Jul 2009 17:30:40 +0200
> Subject: [PATCH] touch fakeroot.log
>
> indicationg we're done creating the appliance
> ---
> appliance/make.sh.in | 2 ++
> 1 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/appliance/make.sh.in b/appliance/make.sh.in
> index e98c325..dd36bb4 100755
> --- a/appliance/make.sh.in
> +++ b/appliance/make.sh.in
> @@ -148,5 +148,7 @@ __EOF__
> elif [ "@DIST@" = "DEBIAN" ]; then
> cd @top_builddir@/appliance
> debirf make -n debian
> + mkdir -p @top_builddir@/initramfs
> + touch @top_builddir(a)/initramfs/fakeroot.log
> fi
>
> --
--
Richard Jones, Emerging Technologies, Red Hat http://et.redhat.com/~rjones
virt-df lists disk usage of guests without needing to install any
software inside the virtual machine. Supports Linux and Windows.
http://et.redhat.com/~rjones/virt-df/
14 years, 9 months
