[Pkg-libvirt-commits] [libguestfs] 04/37: Imported Upstream version 1.15.3
Hilko Bengen
bengen at moszumanska.debian.org
Sun Dec 22 18:13:34 UTC 2013
This is an automated email from the git hooks/post-receive script.
bengen pushed a commit to annotated tag debian/1%1.15.10-1
in repository libguestfs.
commit e837a103eb9285307a4a218eed97e306798b072b
Author: Hilko Bengen <bengen at debian.org>
Date: Fri Nov 11 11:57:00 2011 +0100
Imported Upstream version 1.15.3
---
BUGS | 2 +-
ChangeLog | 45 +++++++++
Makefile.am | 2 +-
Makefile.in | 4 +-
align/Makefile.am | 2 +-
align/Makefile.in | 4 +-
align/scan.c | 2 +-
align/virt-alignment-scan.pod | 2 +-
appliance/Makefile.am | 2 +-
appliance/Makefile.in | 4 +-
appliance/make.sh.in | 2 +-
autogen.sh | 2 +-
bugs-in-changelog.sh | 2 +-
capitests/Makefile.am | 2 +-
capitests/Makefile.in | 4 +-
cat/Makefile.am | 2 +-
cat/Makefile.in | 4 +-
cat/virt-cat.c | 2 +-
cat/virt-cat.pod | 2 +-
cat/virt-filesystems.c | 2 +-
cat/virt-filesystems.pod | 2 +-
cat/virt-ls.c | 2 +-
cat/virt-ls.pod | 2 +-
caution/Makefile.am | 2 +-
caution/Makefile.in | 4 +-
caution/qemu-snapshot-isolation.sh | 2 +-
clone/Makefile.am | 2 +-
clone/Makefile.in | 4 +-
clone/test-virt-sysprep.sh | 2 +-
clone/virt-sysprep.in | 2 +-
clone/virt-sysprep.pod | 2 +-
configure | 26 ++---
configure.ac | 4 +-
contrib/autobuild/autobuild.sh | 2 +-
contrib/guestfsd-in-wine.sh | 2 +-
contrib/visualize-alignment/tracetops.ml | 2 +-
csharp/Makefile.am | 2 +-
csharp/Makefile.in | 4 +-
daemon/9p.c | 2 +-
daemon/Makefile.am | 2 +-
daemon/Makefile.in | 4 +-
daemon/augeas.c | 2 +-
daemon/available.c | 2 +-
daemon/base64.c | 2 +-
daemon/blkid.c | 2 +-
daemon/blockdev.c | 2 +-
daemon/btrfs.c | 2 +-
daemon/checksum.c | 2 +-
daemon/cmp.c | 2 +-
daemon/command.c | 2 +-
daemon/compress.c | 2 +-
daemon/copy.c | 2 +-
daemon/cpmv.c | 2 +-
daemon/daemon.h | 3 +
daemon/dd.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/echo_daemon.c | 2 +-
daemon/ext2.c | 2 +-
daemon/fallocate.c | 2 +-
daemon/file.c | 2 +-
daemon/fill.c | 2 +-
daemon/find.c | 2 +-
daemon/findfs.c | 2 +-
daemon/fsck.c | 2 +-
daemon/glob.c | 2 +-
daemon/grep.c | 2 +-
daemon/grub.c | 2 +-
daemon/guestfsd.c | 7 +-
daemon/headtail.c | 2 +-
daemon/hexdump.c | 2 +-
daemon/initrd.c | 2 +-
daemon/inotify.c | 29 ++++--
daemon/is.c | 2 +-
daemon/link.c | 2 +-
daemon/ls.c | 2 +-
daemon/luks.c | 2 +-
daemon/lvm-filter.c | 111 +++++++++++++++++----
daemon/lvm.c | 2 +-
daemon/mkfs.c | 2 +-
daemon/mknod.c | 2 +-
daemon/modprobe.c | 2 +-
daemon/mount.c | 2 +-
daemon/ntfs.c | 2 +-
daemon/parted.c | 2 +-
daemon/pingdaemon.c | 2 +-
daemon/proto.c | 2 +-
daemon/readdir.c | 2 +-
daemon/realpath.c | 2 +-
daemon/scrub.c | 2 +-
daemon/selinux.c | 2 +-
daemon/sfdisk.c | 2 +-
daemon/sleep.c | 2 +-
daemon/stat.c | 2 +-
daemon/statvfs.c | 2 +-
daemon/strings.c | 2 +-
daemon/swap.c | 2 +-
daemon/sync.c | 2 +-
daemon/tar.c | 41 +++++---
daemon/truncate.c | 2 +-
daemon/umask.c | 2 +-
daemon/upload.c | 2 +-
daemon/utimens.c | 2 +-
daemon/wc.c | 2 +-
daemon/xattr.c | 2 +-
daemon/zero.c | 2 +-
daemon/zerofree.c | 2 +-
debian/changelog | 4 +-
df/Makefile.am | 2 +-
df/Makefile.in | 4 +-
df/df.c | 2 +-
df/domains.c | 2 +-
df/main.c | 2 +-
df/output.c | 2 +-
df/virt-df.h | 2 +-
df/virt-df.pod | 2 +-
edit/Makefile.am | 2 +-
edit/Makefile.in | 4 +-
edit/virt-edit.c | 2 +-
edit/virt-edit.pod | 2 +-
erlang/Makefile.am | 2 +-
erlang/Makefile.in | 4 +-
erlang/examples/Makefile.am | 2 +-
erlang/examples/Makefile.in | 2 +-
examples/Makefile.am | 2 +-
examples/Makefile.in | 2 +-
fish/Makefile.am | 2 +-
fish/Makefile.in | 4 +-
fish/alloc.c | 2 +-
fish/cmds.c | 24 ++---
fish/copy.c | 2 +-
fish/destpaths.c | 2 +-
fish/display.c | 2 +-
fish/echo.c | 2 +-
fish/edit.c | 2 +-
fish/fish.c | 2 +-
fish/glob.c | 2 +-
fish/guestfish-actions.pod | 24 ++---
fish/guestfish-bash-completion.sh | 2 +-
fish/guestfish.pod | 2 +-
fish/help.c | 2 +-
fish/hexedit.c | 2 +-
fish/inspect.c | 2 +-
fish/keys.c | 2 +-
fish/lcd.c | 2 +-
fish/man.c | 2 +-
fish/more.c | 2 +-
fish/prep.c | 2 +-
fish/prep_boot.c | 2 +-
fish/prep_disk.c | 2 +-
fish/prep_fs.c | 2 +-
fish/prep_lv.c | 2 +-
fish/prep_part.c | 2 +-
fish/progress.c | 2 +-
fish/progress.h | 2 +-
fish/rc.c | 2 +-
fish/reopen.c | 2 +-
fish/setenv.c | 2 +-
fish/supported.c | 2 +-
fish/tilde.c | 2 +-
fish/time.c | 2 +-
fish/virt-copy-in | 2 +-
fish/virt-copy-in.pod | 2 +-
fish/virt-copy-out | 2 +-
fish/virt-copy-out.pod | 2 +-
fish/virt-tar-in | 2 +-
fish/virt-tar-in.pod | 2 +-
fish/virt-tar-out | 2 +-
fish/virt-tar-out.pod | 2 +-
fish/virt.c | 2 +-
fuse/Makefile.am | 2 +-
fuse/Makefile.in | 4 +-
fuse/dircache.c | 2 +-
fuse/dircache.h | 2 +-
fuse/guestmount.c | 2 +-
fuse/guestmount.h | 2 +-
fuse/guestmount.pod | 2 +-
fuse/test-fuse.sh | 2 +-
generator/Makefile.am | 2 +-
generator/Makefile.in | 2 +-
generator/generator_capitests.ml | 13 +--
generator/generator_fish.ml | 14 ++-
generator/generator_ocaml.ml | 18 +++-
haskell/Guestfs005Load.hs | 2 +-
haskell/Guestfs010Basic.hs | 2 +-
haskell/Makefile.am | 2 +-
haskell/Makefile.in | 4 +-
haskell/run-bindtests | 2 +-
images/Makefile.am | 2 +-
images/Makefile.in | 4 +-
images/guest-aux/make-debian-img.sh | 2 +-
images/guest-aux/make-fedora-img.sh | 2 +-
images/guest-aux/make-ubuntu-img.sh | 2 +-
images/guest-aux/make-windows-img.sh | 2 +-
inspector/Makefile.am | 2 +-
inspector/Makefile.in | 4 +-
inspector/virt-inspector.c | 2 +-
inspector/virt-inspector.pod | 2 +-
java/Makefile.am | 2 +-
java/Makefile.in | 4 +-
java/examples/Makefile.am | 2 +-
java/examples/Makefile.in | 2 +-
java/run-bindtests | 2 +-
java/run-java-tests | 2 +-
libguestfs.pc | 2 +-
libtool-kill-dependency_libs.sh | 2 +-
ocaml/Makefile.am | 29 +++---
ocaml/Makefile.in | 30 +++---
ocaml/examples/Makefile.am | 2 +-
ocaml/examples/Makefile.in | 2 +-
ocaml/run-bindtests | 2 +-
ocaml/t/guestfs_005_load.ml | 2 +-
ocaml/t/guestfs_010_basic.ml | 2 +-
ocaml/t/guestfs_070_threads.ml | 2 +-
ocaml/t/guestfs_080_optargs.ml | 2 +-
ocaml/t/guestfs_400_events.ml | 5 +-
ocaml/t/guestfs_400_progress.ml | 2 +-
perl/Makefile.PL.in | 2 +-
perl/Makefile.am | 2 +-
perl/Makefile.in | 4 +-
perl/examples/Makefile.am | 2 +-
perl/examples/Makefile.in | 2 +-
perl/run-bindtests | 2 +-
perl/run-perl-tests | 2 +-
perl/t/005-pod.t | 2 +-
perl/t/006-pod-coverage.t | 2 +-
perl/t/010-load.t | 2 +-
perl/t/020-create.t | 2 +-
perl/t/030-config.t | 2 +-
perl/t/050-lvcreate.t | 2 +-
perl/t/060-readdir.t | 2 +-
perl/t/070-optargs.t | 2 +-
perl/t/400-events.t | 2 +-
perl/t/500-lib-load.t | 2 +-
perl/t/800-explicit-close.t | 2 +-
perl/t/810-mkdir-eexist.t | 2 +-
perl/t/900-introspection.t | 2 +-
php/Makefile.am | 2 +-
php/Makefile.in | 4 +-
php/extension/config.m4 | 2 +-
php/run-php-tests.sh | 2 +-
po-docs/Makefile.am | 2 +-
po-docs/Makefile.in | 2 +-
po-docs/ja.po | 30 +++---
po-docs/ja/Makefile.am | 2 +-
po-docs/ja/Makefile.in | 2 +-
po-docs/ja/guestfish-actions.pod | 24 ++---
po-docs/ja/guestfish.1 | 30 +++---
po-docs/ja/guestfish.pod | 4 +-
po-docs/ja/guestfs.3 | 2 +-
po-docs/ja/guestmount.1 | 6 +-
po-docs/ja/guestmount.pod | 4 +-
po-docs/ja/libguestfs-test-tool.1 | 6 +-
po-docs/ja/libguestfs-test-tool.pod | 4 +-
po-docs/ja/virt-alignment-scan.1 | 6 +-
po-docs/ja/virt-alignment-scan.pod | 4 +-
po-docs/ja/virt-cat.1 | 6 +-
po-docs/ja/virt-cat.pod | 4 +-
po-docs/ja/virt-copy-in.1 | 6 +-
po-docs/ja/virt-copy-in.pod | 4 +-
po-docs/ja/virt-copy-out.1 | 6 +-
po-docs/ja/virt-copy-out.pod | 4 +-
po-docs/ja/virt-df.1 | 6 +-
po-docs/ja/virt-df.pod | 4 +-
po-docs/ja/virt-edit.1 | 6 +-
po-docs/ja/virt-edit.pod | 4 +-
po-docs/ja/virt-filesystems.1 | 6 +-
po-docs/ja/virt-filesystems.pod | 4 +-
po-docs/ja/virt-inspector.1 | 6 +-
po-docs/ja/virt-inspector.pod | 4 +-
po-docs/ja/virt-list-filesystems.1 | 6 +-
po-docs/ja/virt-list-filesystems.pl | 4 +-
po-docs/ja/virt-list-partitions.1 | 6 +-
po-docs/ja/virt-list-partitions.pl | 4 +-
po-docs/ja/virt-ls.1 | 6 +-
po-docs/ja/virt-ls.pod | 4 +-
po-docs/ja/virt-make-fs.1 | 6 +-
po-docs/ja/virt-make-fs.pl | 4 +-
po-docs/ja/virt-rescue.1 | 6 +-
po-docs/ja/virt-rescue.pod | 4 +-
po-docs/ja/virt-resize.1 | 6 +-
po-docs/ja/virt-resize.pod | 4 +-
po-docs/ja/virt-sparsify.1 | 6 +-
po-docs/ja/virt-sparsify.pod | 4 +-
po-docs/ja/virt-sysprep.1 | 6 +-
po-docs/ja/virt-sysprep.pod | 4 +-
po-docs/ja/virt-tar-in.1 | 6 +-
po-docs/ja/virt-tar-in.pod | 4 +-
po-docs/ja/virt-tar-out.1 | 6 +-
po-docs/ja/virt-tar-out.pod | 4 +-
po-docs/ja/virt-tar.1 | 6 +-
po-docs/ja/virt-tar.pl | 4 +-
po-docs/ja/virt-win-reg.1 | 6 +-
po-docs/ja/virt-win-reg.pl | 4 +-
po-docs/libguestfs-docs.pot | 37 +++----
po-docs/uk.po | 32 +++---
po-docs/uk/Makefile.am | 2 +-
po-docs/uk/Makefile.in | 2 +-
po-docs/uk/guestfish-actions.pod | 24 ++---
po-docs/uk/guestfish.1 | 28 +++---
po-docs/uk/guestfish.pod | 2 +-
po-docs/uk/guestfs.3 | 2 +-
po-docs/uk/guestmount.1 | 4 +-
po-docs/uk/guestmount.pod | 2 +-
po-docs/uk/libguestfs-test-tool.1 | 4 +-
po-docs/uk/libguestfs-test-tool.pod | 2 +-
po-docs/uk/virt-alignment-scan.1 | 4 +-
po-docs/uk/virt-alignment-scan.pod | 2 +-
po-docs/uk/virt-cat.1 | 4 +-
po-docs/uk/virt-cat.pod | 2 +-
po-docs/uk/virt-copy-in.1 | 4 +-
po-docs/uk/virt-copy-in.pod | 2 +-
po-docs/uk/virt-copy-out.1 | 4 +-
po-docs/uk/virt-copy-out.pod | 2 +-
po-docs/uk/virt-df.1 | 4 +-
po-docs/uk/virt-df.pod | 2 +-
po-docs/uk/virt-edit.1 | 4 +-
po-docs/uk/virt-edit.pod | 2 +-
po-docs/uk/virt-filesystems.1 | 4 +-
po-docs/uk/virt-filesystems.pod | 2 +-
po-docs/uk/virt-inspector.1 | 4 +-
po-docs/uk/virt-inspector.pod | 2 +-
po-docs/uk/virt-list-filesystems.1 | 4 +-
po-docs/uk/virt-list-filesystems.pl | 2 +-
po-docs/uk/virt-list-partitions.1 | 4 +-
po-docs/uk/virt-list-partitions.pl | 2 +-
po-docs/uk/virt-ls.1 | 4 +-
po-docs/uk/virt-ls.pod | 2 +-
po-docs/uk/virt-make-fs.1 | 4 +-
po-docs/uk/virt-make-fs.pl | 2 +-
po-docs/uk/virt-rescue.1 | 4 +-
po-docs/uk/virt-rescue.pod | 2 +-
po-docs/uk/virt-resize.1 | 4 +-
po-docs/uk/virt-resize.pod | 2 +-
po-docs/uk/virt-sparsify.1 | 4 +-
po-docs/uk/virt-sparsify.pod | 2 +-
po-docs/uk/virt-sysprep.1 | 4 +-
po-docs/uk/virt-sysprep.pod | 2 +-
po-docs/uk/virt-tar-in.1 | 4 +-
po-docs/uk/virt-tar-in.pod | 2 +-
po-docs/uk/virt-tar-out.1 | 4 +-
po-docs/uk/virt-tar-out.pod | 2 +-
po-docs/uk/virt-tar.1 | 4 +-
po-docs/uk/virt-tar.pl | 2 +-
po-docs/uk/virt-win-reg.1 | 4 +-
po-docs/uk/virt-win-reg.pl | 2 +-
po/en_GB.gmo | Bin 10781 -> 10781 bytes
po/en_GB.po | 2 +-
po/es.gmo | Bin 92709 -> 92709 bytes
po/es.po | 2 +-
po/gu.gmo | Bin 53605 -> 53605 bytes
po/gu.po | 2 +-
po/hi.gmo | Bin 43389 -> 43389 bytes
po/hi.po | 2 +-
po/kn.gmo | Bin 52822 -> 52822 bytes
po/kn.po | 2 +-
po/libguestfs.pot | 4 +-
po/ml.gmo | Bin 56355 -> 56355 bytes
po/ml.po | 2 +-
po/mr.gmo | Bin 104937 -> 104937 bytes
po/mr.po | 2 +-
po/nl.gmo | Bin 90946 -> 90946 bytes
po/nl.po | 2 +-
po/or.gmo | Bin 52173 -> 52173 bytes
po/or.po | 2 +-
po/pa.gmo | Bin 90834 -> 90834 bytes
po/pa.po | 2 +-
po/pl.gmo | Bin 95389 -> 95389 bytes
po/pl.po | 2 +-
po/ta.gmo | Bin 47311 -> 47311 bytes
po/ta.po | 2 +-
po/te.gmo | Bin 49970 -> 49970 bytes
po/te.po | 2 +-
po/uk.gmo | Bin 125123 -> 125123 bytes
po/uk.po | 2 +-
podwrapper.sh.in | 2 +-
python/Makefile.am | 2 +-
python/Makefile.in | 4 +-
python/examples/Makefile.am | 2 +-
python/examples/Makefile.in | 2 +-
python/run-bindtests | 2 +-
python/run-python-tests | 2 +-
python/t/005-import.py | 2 +-
python/t/010-basic.py | 2 +-
python/t/060-optargs.py | 2 +-
python/t/400-events.py | 2 +-
python/t/800-explicit-close.py | 2 +-
regressions/Makefile.am | 2 +-
regressions/Makefile.in | 4 +-
regressions/rhbz501893.c | 2 +-
regressions/rhbz503169c13.sh | 2 +-
regressions/rhbz557655.sh | 2 +-
regressions/rhbz576879.sh | 2 +-
regressions/rhbz578407.sh | 2 +-
regressions/rhbz580246.sh | 2 +-
regressions/rhbz602997.sh | 2 +-
regressions/rhbz690819.sh | 2 +-
regressions/tell-user-to-ignore-errors.sh | 2 +-
regressions/test-add-domain.sh | 2 +-
regressions/test-bootbootboot.sh | 2 +-
regressions/test-both-ends-cancel.sh | 2 +-
.../test-cancellation-download-librarycancels.sh | 2 +-
.../test-cancellation-upload-daemoncancels.sh | 2 +-
regressions/test-copy.sh | 2 +-
regressions/test-find0.sh | 2 +-
regressions/test-guestfish-a.sh | 2 +-
regressions/test-guestfish-d.sh | 2 +-
regressions/test-guestfish-escapes.sh | 2 +-
regressions/test-guestfish-tilde.sh | 2 +-
regressions/test-inspect-fstab.sh | 2 +-
regressions/test-launch-race.pl | 2 +-
regressions/test-luks-list.sh | 2 +-
regressions/test-luks.sh | 2 +-
regressions/test-lvm-filtering.sh | 2 +-
regressions/test-lvm-mapping.pl | 2 +-
regressions/test-noexec-stack.pl | 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 +-
regressions/test-upload-to-dir.sh | 2 +-
rescue/Makefile.am | 2 +-
rescue/Makefile.in | 4 +-
rescue/virt-rescue.c | 2 +-
rescue/virt-rescue.pod | 2 +-
resize/Makefile.am | 2 +-
resize/Makefile.in | 4 +-
resize/progress_c.c | 2 +-
resize/test-virt-resize.sh | 2 +-
resize/virt-resize.pod | 2 +-
ruby/Makefile.am | 2 +-
ruby/Makefile.in | 4 +-
ruby/Rakefile.in | 2 +-
ruby/examples/Makefile.am | 2 +-
ruby/examples/Makefile.in | 2 +-
ruby/ext/guestfs/extconf.rb | 2 +-
ruby/run-bindtests | 2 +-
ruby/run-ruby-tests | 2 +-
ruby/tests/tc_010_load.rb | 2 +-
ruby/tests/tc_050_lvcreate.rb | 2 +-
ruby/tests/tc_060_optargs.rb | 2 +-
ruby/tests/tc_400_events.rb | 2 +-
ruby/tests/tc_rhbz507346.rb | 2 +-
ruby/tests/tc_rhbz664558c6.rb | 2 +-
run | 2 +-
run.in | 2 +-
sparsify/Makefile.am | 2 +-
sparsify/Makefile.in | 4 +-
sparsify/progress_c.c | 2 +-
sparsify/test-virt-sparsify.sh | 2 +-
sparsify/virt-sparsify.pod | 2 +-
src/Makefile.am | 2 +-
src/Makefile.in | 4 +-
src/api-support/update-from-tarballs.sh | 2 +-
subdir-rules.mk | 2 +-
test-tool/Makefile.am | 2 +-
test-tool/Makefile.in | 4 +-
test-tool/libguestfs-test-tool.pod | 2 +-
test-tool/test-tool.c | 2 +-
tools/Makefile.am | 2 +-
tools/Makefile.in | 4 +-
tools/test-virt-make-fs.sh | 2 +-
tools/virt-list-filesystems | 4 +-
tools/virt-list-partitions | 4 +-
tools/virt-make-fs | 4 +-
tools/virt-tar | 4 +-
tools/virt-win-reg | 4 +-
update-bugs.sh | 2 +-
477 files changed, 971 insertions(+), 787 deletions(-)
diff --git a/BUGS b/BUGS
index f14dd81..3fb698b 100644
--- a/BUGS
+++ b/BUGS
@@ -1,5 +1,5 @@
NOTE: This file is automatically generated from "update-bugs.sh".
-Last updated: 2011-11-03
+Last updated: 2011-11-09
This contains a local list of the bugs that are open against
libguestfs. Bugs are tracked in the Red Hat Bugzilla database
diff --git a/ChangeLog b/ChangeLog
index 7d165eb..f07a551 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,50 @@
+2011-11-09 Richard W.M. Jones <rjones at redhat.com>
+
+ ocaml: Fix bindings when a function takes more than 10 parameters.
+ If any function had more than 10 required + optional parameters, OCaml
+ bindings could not be generated. Currently there are no such
+ functions.
+
+ tests: Fix bitmask parameter when testing optional arguments.
+ The bitmask was being constructed backwards(!)
+
+ As a result, any test which tested optional arguments didn't work.
+ There are very few such tests and they happened not to be affected by
+ this.
+
+ fish: More informative documentation of optargs.
+
+ ocaml: Compile OCaml bindings and tests with -warn-error.
+
+ ocaml: Catch EVENT_ENTER case in test.
+ For some reason we are not compiling the tests with -warn-error so
+ this problem was not noticed before.
+
+ This fixes commit 9420eaf44ec4067c3740b91b0be0fede08a0c515.
+
+2011-11-08 Matthew Booth <mbooth at redhat.com>
+
+ Update FSF address.
+
+2011-11-04 Richard W.M. Jones <rjones at redhat.com>
+
+ daemon: Use a private copy of /etc/lvm so we don't modify the real config.
+ In the libguestfs live case we need to be careful not to modify the
+ real /etc/lvm/lvm.conf file (when setting the filter rule).
+
+ When the daemon starts, make a complete copy of /etc/lvm in a
+ temporary directory, and adjust LVM_SYSTEM_DIR to point to the copy.
+ All changes are made in the temporary copy.
+
+ daemon: Don't use files with fixed names in /tmp (thanks Steve Kemp).
+ Although this doesn't matter for the ordinary (appliance) case, it
+ matters for the libguestfs live case. In that case it could cause the
+ guest to be exploited by a tmp/symlink attack.
+
2011-11-03 Richard W.M. Jones <rjones at redhat.com>
+ Version 1.15.2.
+
virt-sysprep: Don't use xmlstarlet.
Use virt-inspector --xpath option instead.
diff --git a/Makefile.am b/Makefile.am
index 60343f8..115c699 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
include $(top_srcdir)/subdir-rules.mk
diff --git a/Makefile.in b/Makefile.in
index 0a19366..b554b95 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -30,7 +30,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# libguestfs
# Copyright (C) 2009 Red Hat Inc.
@@ -47,7 +47,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
diff --git a/align/Makefile.am b/align/Makefile.am
index 5692fd4..1dc9221 100644
--- a/align/Makefile.am
+++ b/align/Makefile.am
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
include $(top_srcdir)/subdir-rules.mk
diff --git a/align/Makefile.in b/align/Makefile.in
index 97195b8..0934148 100644
--- a/align/Makefile.in
+++ b/align/Makefile.in
@@ -30,7 +30,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# libguestfs
# Copyright (C) 2009 Red Hat Inc.
@@ -47,7 +47,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
VPATH = @srcdir@
diff --git a/align/scan.c b/align/scan.c
index a409654..529add5 100644
--- a/align/scan.c
+++ b/align/scan.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/align/virt-alignment-scan.pod b/align/virt-alignment-scan.pod
index 601c5e8..5eb9312 100755
--- a/align/virt-alignment-scan.pod
+++ b/align/virt-alignment-scan.pod
@@ -378,4 +378,4 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/appliance/Makefile.am b/appliance/Makefile.am
index bec2b48..e2e8b96 100644
--- a/appliance/Makefile.am
+++ b/appliance/Makefile.am
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
include $(top_srcdir)/subdir-rules.mk
diff --git a/appliance/Makefile.in b/appliance/Makefile.in
index 9e09fab..e6f9f20 100644
--- a/appliance/Makefile.in
+++ b/appliance/Makefile.in
@@ -30,7 +30,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# libguestfs
# Copyright (C) 2009 Red Hat Inc.
@@ -47,7 +47,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
diff --git a/appliance/make.sh.in b/appliance/make.sh.in
index cb243b5..e856c3f 100755
--- a/appliance/make.sh.in
+++ b/appliance/make.sh.in
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
unset CDPATH
diff --git a/autogen.sh b/autogen.sh
index 0c74fae..794d25c 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
# Rebuild the autotools environment.
diff --git a/bugs-in-changelog.sh b/bugs-in-changelog.sh
index 9173fa4..84efc51 100755
--- a/bugs-in-changelog.sh
+++ b/bugs-in-changelog.sh
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# Used when preparing the RELEASE-NOTES file. This script looks at
# the bugs noted in the git changelog since the last stable release
diff --git a/capitests/Makefile.am b/capitests/Makefile.am
index 64fc0a1..cb9188e 100644
--- a/capitests/Makefile.am
+++ b/capitests/Makefile.am
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
include $(top_srcdir)/subdir-rules.mk
diff --git a/capitests/Makefile.in b/capitests/Makefile.in
index 220eb44..9a76f4a 100644
--- a/capitests/Makefile.in
+++ b/capitests/Makefile.in
@@ -30,7 +30,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# libguestfs
# Copyright (C) 2009 Red Hat Inc.
@@ -47,7 +47,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
diff --git a/cat/Makefile.am b/cat/Makefile.am
index 91abfac..3180b26 100644
--- a/cat/Makefile.am
+++ b/cat/Makefile.am
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
include $(top_srcdir)/subdir-rules.mk
diff --git a/cat/Makefile.in b/cat/Makefile.in
index c8da507..fa4e83d 100644
--- a/cat/Makefile.in
+++ b/cat/Makefile.in
@@ -30,7 +30,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# libguestfs
# Copyright (C) 2009 Red Hat Inc.
@@ -47,7 +47,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
VPATH = @srcdir@
diff --git a/cat/virt-cat.c b/cat/virt-cat.c
index 268ca56..4d37dda 100644
--- a/cat/virt-cat.c
+++ b/cat/virt-cat.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/cat/virt-cat.pod b/cat/virt-cat.pod
index a4b54b8..d125e6f 100755
--- a/cat/virt-cat.pod
+++ b/cat/virt-cat.pod
@@ -269,4 +269,4 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/cat/virt-filesystems.c b/cat/virt-filesystems.c
index 6e160a2..de7a243 100644
--- a/cat/virt-filesystems.c
+++ b/cat/virt-filesystems.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/cat/virt-filesystems.pod b/cat/virt-filesystems.pod
index 5112395..e5ba483 100755
--- a/cat/virt-filesystems.pod
+++ b/cat/virt-filesystems.pod
@@ -413,4 +413,4 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/cat/virt-ls.c b/cat/virt-ls.c
index 97f0c55..b29af27 100644
--- a/cat/virt-ls.c
+++ b/cat/virt-ls.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/cat/virt-ls.pod b/cat/virt-ls.pod
index 645a9c0..cd1166b 100755
--- a/cat/virt-ls.pod
+++ b/cat/virt-ls.pod
@@ -524,4 +524,4 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/caution/Makefile.am b/caution/Makefile.am
index 5b31d80..fb95a74 100644
--- a/caution/Makefile.am
+++ b/caution/Makefile.am
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# Safety and liveness tests of components that libguestfs depends upon
# (not of libguestfs itself). Mainly this is for qemu and the kernel.
diff --git a/caution/Makefile.in b/caution/Makefile.in
index 2f39f5b..bfa02c6 100644
--- a/caution/Makefile.in
+++ b/caution/Makefile.in
@@ -30,7 +30,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# Safety and liveness tests of components that libguestfs depends upon
# (not of libguestfs itself). Mainly this is for qemu and the kernel.
@@ -52,7 +52,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
diff --git a/caution/qemu-snapshot-isolation.sh b/caution/qemu-snapshot-isolation.sh
index ae22611..384706c 100755
--- a/caution/qemu-snapshot-isolation.sh
+++ b/caution/qemu-snapshot-isolation.sh
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# Test that qemu snapshots are really isolating writes from the
# underlying disk image. If this test were to fail, you could expect
diff --git a/clone/Makefile.am b/clone/Makefile.am
index 20e1d52..11a2e9b 100644
--- a/clone/Makefile.am
+++ b/clone/Makefile.am
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
include $(top_srcdir)/subdir-rules.mk
diff --git a/clone/Makefile.in b/clone/Makefile.in
index 42f4baf..28fcec7 100644
--- a/clone/Makefile.in
+++ b/clone/Makefile.in
@@ -30,7 +30,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# libguestfs
# Copyright (C) 2009 Red Hat Inc.
@@ -47,7 +47,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
VPATH = @srcdir@
diff --git a/clone/test-virt-sysprep.sh b/clone/test-virt-sysprep.sh
index 097f416..1ebbde7 100755
--- a/clone/test-virt-sysprep.sh
+++ b/clone/test-virt-sysprep.sh
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
export LANG=C
set -e
diff --git a/clone/virt-sysprep.in b/clone/virt-sysprep.in
index 9150872..9e8f212 100644
--- a/clone/virt-sysprep.in
+++ b/clone/virt-sysprep.in
@@ -15,7 +15,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
unset CDPATH
program="virt-sysprep"
diff --git a/clone/virt-sysprep.pod b/clone/virt-sysprep.pod
index eb56801..5cab3eb 100755
--- a/clone/virt-sysprep.pod
+++ b/clone/virt-sysprep.pod
@@ -518,4 +518,4 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/configure b/configure
index 1aeb467..44f310a 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for libguestfs 1.15.2.
+# Generated by GNU Autoconf 2.68 for libguestfs 1.15.3.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -567,8 +567,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='libguestfs'
PACKAGE_TARNAME='libguestfs'
-PACKAGE_VERSION='1.15.2'
-PACKAGE_STRING='libguestfs 1.15.2'
+PACKAGE_VERSION='1.15.3'
+PACKAGE_STRING='libguestfs 1.15.3'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -2279,7 +2279,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures libguestfs 1.15.2 to adapt to many kinds of systems.
+\`configure' configures libguestfs 1.15.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -2349,7 +2349,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of libguestfs 1.15.2:";;
+ short | recursive ) echo "Configuration of libguestfs 1.15.3:";;
esac
cat <<\_ACEOF
@@ -2519,7 +2519,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-libguestfs configure 1.15.2
+libguestfs configure 1.15.3
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -3261,7 +3261,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by libguestfs $as_me 1.15.2, which was
+It was created by libguestfs $as_me 1.15.3, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -4168,7 +4168,7 @@ fi
# Define the identity of the package.
PACKAGE='libguestfs'
- VERSION='1.15.2'
+ VERSION='1.15.3'
cat >>confdefs.h <<_ACEOF
@@ -4265,8 +4265,8 @@ else
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: libguestfs version 1.15.2$libguestfs_extra" >&5
-$as_echo "$as_me: libguestfs version 1.15.2$libguestfs_extra" >&6;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: libguestfs version 1.15.3$libguestfs_extra" >&5
+$as_echo "$as_me: libguestfs version 1.15.3$libguestfs_extra" >&6;}
$as_echo "#define PACKAGE_VERSION_MAJOR 1" >>confdefs.h
@@ -4275,7 +4275,7 @@ $as_echo "#define PACKAGE_VERSION_MAJOR 1" >>confdefs.h
$as_echo "#define PACKAGE_VERSION_MINOR 15" >>confdefs.h
-$as_echo "#define PACKAGE_VERSION_RELEASE 2" >>confdefs.h
+$as_echo "#define PACKAGE_VERSION_RELEASE 3" >>confdefs.h
cat >>confdefs.h <<_ACEOF
@@ -53172,7 +53172,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by libguestfs $as_me 1.15.2, which was
+This file was extended by libguestfs $as_me 1.15.3, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -53242,7 +53242,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-libguestfs config.status 1.15.2
+libguestfs config.status 1.15.3
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index 0f09c3d..fc811cf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,14 +13,14 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# The major, minor, and release fields MUST be numbers. Packagers can
# add extra information using --with-extra="..." which may be any
# freeform string.
m4_define([libguestfs_major], [1])
m4_define([libguestfs_minor], [15])
-m4_define([libguestfs_release], [2])
+m4_define([libguestfs_release], [3])
AC_INIT([libguestfs],libguestfs_major.libguestfs_minor.libguestfs_release)
AC_CONFIG_AUX_DIR([build-aux])
diff --git a/contrib/autobuild/autobuild.sh b/contrib/autobuild/autobuild.sh
index c7b0fed..69956f8 100755
--- a/contrib/autobuild/autobuild.sh
+++ b/contrib/autobuild/autobuild.sh
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# This script is used to download and test the latest tarball on
# Debian and other platforms. It runs from a cron job and sends email
diff --git a/contrib/guestfsd-in-wine.sh b/contrib/guestfsd-in-wine.sh
index bc9d87b..8cfd3c1 100755
--- a/contrib/guestfsd-in-wine.sh
+++ b/contrib/guestfsd-in-wine.sh
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# INSTRUCTIONS
#----------------------------------------------------------------------
diff --git a/contrib/visualize-alignment/tracetops.ml b/contrib/visualize-alignment/tracetops.ml
index 3ea2327..6b8e424 100755
--- a/contrib/visualize-alignment/tracetops.ml
+++ b/contrib/visualize-alignment/tracetops.ml
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*)
(* Note that we use ordinary OCaml ints, which means this program is
diff --git a/csharp/Makefile.am b/csharp/Makefile.am
index 5846435..5bd423b 100644
--- a/csharp/Makefile.am
+++ b/csharp/Makefile.am
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
include $(top_srcdir)/subdir-rules.mk
diff --git a/csharp/Makefile.in b/csharp/Makefile.in
index 6d3639d..95d970a 100644
--- a/csharp/Makefile.in
+++ b/csharp/Makefile.in
@@ -30,7 +30,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# libguestfs
# Copyright (C) 2009 Red Hat Inc.
@@ -47,7 +47,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
diff --git a/daemon/9p.c b/daemon/9p.c
index 550516e..3ab1044 100644
--- a/daemon/9p.c
+++ b/daemon/9p.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index f8e0ecb..7757067 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
include $(top_srcdir)/subdir-rules.mk
diff --git a/daemon/Makefile.in b/daemon/Makefile.in
index de194e2..55e1335 100644
--- a/daemon/Makefile.in
+++ b/daemon/Makefile.in
@@ -30,7 +30,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# libguestfs
# Copyright (C) 2009 Red Hat Inc.
@@ -47,7 +47,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
VPATH = @srcdir@
diff --git a/daemon/augeas.c b/daemon/augeas.c
index a9ad91f..03cba42 100644
--- a/daemon/augeas.c
+++ b/daemon/augeas.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/daemon/available.c b/daemon/available.c
index 17ce1b1..6d2aea2 100644
--- a/daemon/available.c
+++ b/daemon/available.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/daemon/base64.c b/daemon/base64.c
index 8aca5b7..215812a 100644
--- a/daemon/base64.c
+++ b/daemon/base64.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/daemon/blkid.c b/daemon/blkid.c
index 7935ac3..6d395c1 100644
--- a/daemon/blkid.c
+++ b/daemon/blkid.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/daemon/blockdev.c b/daemon/blockdev.c
index 1afb4b8..d056abe 100644
--- a/daemon/blockdev.c
+++ b/daemon/blockdev.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/daemon/btrfs.c b/daemon/btrfs.c
index 619ab50..755f47e 100644
--- a/daemon/btrfs.c
+++ b/daemon/btrfs.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/daemon/checksum.c b/daemon/checksum.c
index 0bd9623..ca5abe7 100644
--- a/daemon/checksum.c
+++ b/daemon/checksum.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/daemon/cmp.c b/daemon/cmp.c
index bbf9c74..0673403 100644
--- a/daemon/cmp.c
+++ b/daemon/cmp.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/daemon/command.c b/daemon/command.c
index ef23695..7c67d83 100644
--- a/daemon/command.c
+++ b/daemon/command.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/daemon/compress.c b/daemon/compress.c
index d08d3cc..b9967d9 100644
--- a/daemon/compress.c
+++ b/daemon/compress.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/daemon/copy.c b/daemon/copy.c
index 1d515f8..4bfbfa9 100644
--- a/daemon/copy.c
+++ b/daemon/copy.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/daemon/cpmv.c b/daemon/cpmv.c
index e5457d6..b51ed41 100644
--- a/daemon/cpmv.c
+++ b/daemon/cpmv.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/daemon/daemon.h b/daemon/daemon.h
index b4f99a8..6ed68fd 100644
--- a/daemon/daemon.h
+++ b/daemon/daemon.h
@@ -134,6 +134,9 @@ extern int e2prog (char *name); /* Massive hack for RHEL 5. */
/*-- in lvm.c --*/
extern int lv_canonical (const char *device, char **ret);
+/*-- in lvm-filter.c --*/
+extern void copy_lvm (void);
+
/*-- in proto.c --*/
extern void main_loop (int sock) __attribute__((noreturn));
diff --git a/daemon/dd.c b/daemon/dd.c
index f08eb36..a98f7ae 100644
--- a/daemon/dd.c
+++ b/daemon/dd.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/daemon/debug.c b/daemon/debug.c
index 6b9d756..bb91c9e 100644
--- a/daemon/debug.c
+++ b/daemon/debug.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/daemon/devsparts.c b/daemon/devsparts.c
index 79da41b..440739f 100644
--- a/daemon/devsparts.c
+++ b/daemon/devsparts.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/daemon/df.c b/daemon/df.c
index 7127c00..14954d2 100644
--- a/daemon/df.c
+++ b/daemon/df.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/daemon/dir.c b/daemon/dir.c
index 383acd2..3b18d48 100644
--- a/daemon/dir.c
+++ b/daemon/dir.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/daemon/dmesg.c b/daemon/dmesg.c
index 462787a..5e98a18 100644
--- a/daemon/dmesg.c
+++ b/daemon/dmesg.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/daemon/dropcaches.c b/daemon/dropcaches.c
index 46bfd07..0da882c 100644
--- a/daemon/dropcaches.c
+++ b/daemon/dropcaches.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/daemon/du.c b/daemon/du.c
index 1c44b3b..efff208 100644
--- a/daemon/du.c
+++ b/daemon/du.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/daemon/echo_daemon.c b/daemon/echo_daemon.c
index 658974b..18e2cf8 100644
--- a/daemon/echo_daemon.c
+++ b/daemon/echo_daemon.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/daemon/ext2.c b/daemon/ext2.c
index 01a4628..f7889da 100644
--- a/daemon/ext2.c
+++ b/daemon/ext2.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/daemon/fallocate.c b/daemon/fallocate.c
index 0c948ff..bc744f5 100644
--- a/daemon/fallocate.c
+++ b/daemon/fallocate.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/daemon/file.c b/daemon/file.c
index 691f917..0f27b68 100644
--- a/daemon/file.c
+++ b/daemon/file.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/daemon/fill.c b/daemon/fill.c
index d78e6ee..9ea00ab 100644
--- a/daemon/fill.c
+++ b/daemon/fill.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/daemon/find.c b/daemon/find.c
index 61d4a5f..c509720 100644
--- a/daemon/find.c
+++ b/daemon/find.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/daemon/findfs.c b/daemon/findfs.c
index 061ab0a..2c624b6 100644
--- a/daemon/findfs.c
+++ b/daemon/findfs.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/daemon/fsck.c b/daemon/fsck.c
index 7a36440..7e835a7 100644
--- a/daemon/fsck.c
+++ b/daemon/fsck.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/daemon/glob.c b/daemon/glob.c
index f2815ec..ad8aa54 100644
--- a/daemon/glob.c
+++ b/daemon/glob.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/daemon/grep.c b/daemon/grep.c
index 09683ef..3562f36 100644
--- a/daemon/grep.c
+++ b/daemon/grep.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/daemon/grub.c b/daemon/grub.c
index c61f9df..0617036 100644
--- a/daemon/grub.c
+++ b/daemon/grub.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/daemon/guestfsd.c b/daemon/guestfsd.c
index 51bb0b7..eacbc1d 100644
--- a/daemon/guestfsd.c
+++ b/daemon/guestfsd.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
@@ -239,6 +239,11 @@ main (int argc, char *argv[])
_umask (0);
#endif
+ /* Make a private copy of /etc/lvm so we can change the config (see
+ * daemon/lvm-filter.c).
+ */
+ copy_lvm ();
+
/* Connect to virtio-serial channel. */
int sock = open (VIRTIO_SERIAL_CHANNEL, O_RDWR | O_CLOEXEC);
if (sock == -1) {
diff --git a/daemon/headtail.c b/daemon/headtail.c
index 528cc09..83f3f5c 100644
--- a/daemon/headtail.c
+++ b/daemon/headtail.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/daemon/hexdump.c b/daemon/hexdump.c
index 202f856..3698613 100644
--- a/daemon/hexdump.c
+++ b/daemon/hexdump.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/daemon/initrd.c b/daemon/initrd.c
index 3c960b2..7c4d03f 100644
--- a/daemon/initrd.c
+++ b/daemon/initrd.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/daemon/inotify.c b/daemon/inotify.c
index c8862e5..3fc7b92 100644
--- a/daemon/inotify.c
+++ b/daemon/inotify.c
@@ -1,5 +1,5 @@
/* libguestfs - the guestfsd daemon
- * Copyright (C) 2009 Red Hat Inc.
+ * Copyright (C) 2009-2011 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
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
@@ -317,10 +317,21 @@ do_inotify_files (void)
FILE *fp = NULL;
guestfs_int_inotify_event_list *events;
char buf[PATH_MAX];
+ char tempfile[] = "/tmp/inotifyXXXXXX";
+ int fd;
+ char cmd[64];
NEED_INOTIFY (NULL);
- fp = popen ("sort -u > /tmp/inotify", "w");
+ fd = mkstemp (tempfile);
+ if (fd == -1) {
+ reply_with_perror ("mkstemp");
+ return NULL;
+ }
+
+ snprintf (cmd, sizeof cmd, "sort -u > %s", tempfile);
+
+ fp = popen (cmd, "w");
if (fp == NULL) {
reply_with_perror ("sort");
return NULL;
@@ -349,9 +360,11 @@ do_inotify_files (void)
pclose (fp);
- fp = fopen ("/tmp/inotify", "r");
+ fp = fdopen (fd, "r");
if (fp == NULL) {
- reply_with_perror ("/tmp/inotify");
+ reply_with_perror ("%s", tempfile);
+ unlink (tempfile);
+ close (fd);
return NULL;
}
@@ -365,20 +378,20 @@ do_inotify_files (void)
goto error;
}
- fclose (fp);
+ fclose (fp); /* implicitly closes fd */
fp = NULL;
if (add_string (&ret, &size, &alloc, NULL) == -1)
goto error;
- unlink ("/tmp/inotify");
+ unlink (tempfile);
return ret;
error:
if (fp != NULL)
fclose (fp);
- unlink ("/tmp/inotify");
+ unlink (tempfile);
return NULL;
#else
NOT_AVAILABLE (NULL);
diff --git a/daemon/is.c b/daemon/is.c
index 6f35489..f892ccf 100644
--- a/daemon/is.c
+++ b/daemon/is.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/daemon/link.c b/daemon/link.c
index 1049640..b27e72c 100644
--- a/daemon/link.c
+++ b/daemon/link.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/daemon/ls.c b/daemon/ls.c
index 0af2356..d0c7b52 100644
--- a/daemon/ls.c
+++ b/daemon/ls.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/daemon/luks.c b/daemon/luks.c
index 0b59b5a..bbe6328 100644
--- a/daemon/luks.c
+++ b/daemon/luks.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/daemon/lvm-filter.c b/daemon/lvm-filter.c
index a62d40a..07d872b 100644
--- a/daemon/lvm-filter.c
+++ b/daemon/lvm-filter.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
@@ -23,11 +23,79 @@
#include <inttypes.h>
#include <string.h>
#include <unistd.h>
+#include <sys/stat.h>
-#include "daemon.h"
#include "c-ctype.h"
+#include "ignore-value.h"
+
+#include "daemon.h"
#include "actions.h"
+/* This runs during daemon start up and creates a complete copy of
+ * /etc/lvm so that we can modify it as we desire. We set
+ * LVM_SYSTEM_DIR to point to the copy.
+ */
+static char lvm_system_dir[] = "/tmp/lvmXXXXXX";
+
+static void rm_lvm_system_dir (void);
+
+void
+copy_lvm (void)
+{
+ struct stat statbuf;
+ char cmd[64];
+ int r;
+
+ /* If /etc/lvm directory doesn't exist (or isn't a directory) assume
+ * that this system doesn't support LVM and do nothing.
+ */
+ r = stat ("/etc/lvm", &statbuf);
+ if (r == -1) {
+ perror ("copy_lvm: stat: /etc/lvm");
+ return;
+ }
+ if (! S_ISDIR (statbuf.st_mode)) {
+ fprintf (stderr, "copy_lvm: warning: /etc/lvm is not a directory\n");
+ return;
+ }
+
+ if (mkdtemp (lvm_system_dir) == NULL) {
+ perror (lvm_system_dir);
+ exit (EXIT_FAILURE);
+ }
+
+ /* Hopefully no dotfiles in there ... XXX */
+ snprintf (cmd, sizeof cmd, "cp -a /etc/lvm/* %s", lvm_system_dir);
+ r = system (cmd);
+ if (r == -1) {
+ perror (cmd);
+ rmdir (lvm_system_dir);
+ exit (EXIT_FAILURE);
+ }
+
+ if (WEXITSTATUS (r) != 0) {
+ fprintf (stderr, "cp command failed with return code %d\n",
+ WEXITSTATUS (r));
+ rmdir (lvm_system_dir);
+ exit (EXIT_FAILURE);
+ }
+
+ /* Set environment variable so we use the copy. */
+ setenv ("LVM_SYSTEM_DIR", lvm_system_dir, 1);
+
+ /* Set a handler to remove the temporary directory at exit. */
+ atexit (rm_lvm_system_dir);
+}
+
+static void
+rm_lvm_system_dir (void)
+{
+ char cmd[64];
+
+ snprintf (cmd, sizeof cmd, "rm -rf %s", lvm_system_dir);
+ ignore_value (system (cmd));
+}
+
/* Does the current line match the regexp /^\s*filter\s*=/ */
static int
is_filter_line (const char *line)
@@ -52,18 +120,24 @@ is_filter_line (const char *line)
return 1;
}
-/* Rewrite the 'filter = [ ... ]' line in /etc/lvm/lvm.conf. */
+/* Rewrite the 'filter = [ ... ]' line in lvm.conf. */
static int
set_filter (const char *filter)
{
- FILE *ifp = fopen ("/etc/lvm/lvm.conf", "r");
+ char lvm_conf[64];
+ snprintf (lvm_conf, sizeof lvm_conf, "%s/lvm.conf", lvm_system_dir);
+
+ char lvm_conf_new[64];
+ snprintf (lvm_conf_new, sizeof lvm_conf, "%s/lvm.conf.new", lvm_system_dir);
+
+ FILE *ifp = fopen (lvm_conf, "r");
if (ifp == NULL) {
- reply_with_perror ("open: /etc/lvm/lvm.conf");
+ reply_with_perror ("open: %s", lvm_conf);
return -1;
}
- FILE *ofp = fopen ("/etc/lvm/lvm.conf.new", "w");
+ FILE *ofp = fopen (lvm_conf_new, "w");
if (ofp == NULL) {
- reply_with_perror ("open: /etc/lvm/lvm.conf.new");
+ reply_with_perror ("open: %s", lvm_conf_new);
fclose (ifp);
return -1;
}
@@ -79,11 +153,11 @@ set_filter (const char *filter)
}
if (r < 0) {
/* NB. fprintf doesn't set errno on error. */
- reply_with_error ("/etc/lvm/lvm.conf.new: write failed");
+ reply_with_error ("%s: write failed", lvm_conf_new);
fclose (ifp);
fclose (ofp);
free (line);
- unlink ("/etc/lvm/lvm.conf.new");
+ unlink (lvm_conf_new);
return -1;
}
}
@@ -91,20 +165,20 @@ set_filter (const char *filter)
free (line);
if (fclose (ifp) == EOF) {
- reply_with_perror ("/etc/lvm/lvm.conf.new");
- unlink ("/etc/lvm/lvm.conf.new");
+ reply_with_perror ("close: %s", lvm_conf);
+ unlink (lvm_conf_new);
fclose (ofp);
return -1;
}
if (fclose (ofp) == EOF) {
- reply_with_perror ("/etc/lvm/lvm.conf.new");
- unlink ("/etc/lvm/lvm.conf.new");
+ reply_with_perror ("close: %s", lvm_conf_new);
+ unlink (lvm_conf_new);
return -1;
}
- if (rename ("/etc/lvm/lvm.conf.new", "/etc/lvm/lvm.conf") == -1) {
- reply_with_perror ("rename: /etc/lvm/lvm.conf");
- unlink ("/etc/lvm/lvm.conf.new");
+ if (rename (lvm_conf_new, lvm_conf) == -1) {
+ reply_with_perror ("rename: %s", lvm_conf);
+ unlink (lvm_conf_new);
return -1;
}
@@ -144,7 +218,10 @@ reactivate (void)
static int
rescan (void)
{
- unlink ("/etc/lvm/cache/.cache");
+ char lvm_cache[64];
+ snprintf (lvm_cache, sizeof lvm_cache, "%s/cache/.cache", lvm_system_dir);
+
+ unlink (lvm_cache);
char *err;
int r = command (NULL, &err, "lvm", "vgscan", NULL);
diff --git a/daemon/lvm.c b/daemon/lvm.c
index eaa6bce..c12118c 100644
--- a/daemon/lvm.c
+++ b/daemon/lvm.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/daemon/mkfs.c b/daemon/mkfs.c
index fc798c4..d073c07 100644
--- a/daemon/mkfs.c
+++ b/daemon/mkfs.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/daemon/mknod.c b/daemon/mknod.c
index ee2d1ff..d5b8467 100644
--- a/daemon/mknod.c
+++ b/daemon/mknod.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/daemon/modprobe.c b/daemon/modprobe.c
index 0d7318c..1063043 100644
--- a/daemon/modprobe.c
+++ b/daemon/modprobe.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/daemon/mount.c b/daemon/mount.c
index ab43c20..98b9488 100644
--- a/daemon/mount.c
+++ b/daemon/mount.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/daemon/ntfs.c b/daemon/ntfs.c
index 5891263..92d2432 100644
--- a/daemon/ntfs.c
+++ b/daemon/ntfs.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/daemon/parted.c b/daemon/parted.c
index 2b70fdd..dbcae03 100644
--- a/daemon/parted.c
+++ b/daemon/parted.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/daemon/pingdaemon.c b/daemon/pingdaemon.c
index 0a69afa..eac291d 100644
--- a/daemon/pingdaemon.c
+++ b/daemon/pingdaemon.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/daemon/proto.c b/daemon/proto.c
index 238ee88..bbba205 100644
--- a/daemon/proto.c
+++ b/daemon/proto.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/daemon/readdir.c b/daemon/readdir.c
index 876041e..b8f5fea 100644
--- a/daemon/readdir.c
+++ b/daemon/readdir.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/daemon/realpath.c b/daemon/realpath.c
index 592e12c..ea936c6 100644
--- a/daemon/realpath.c
+++ b/daemon/realpath.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/daemon/scrub.c b/daemon/scrub.c
index 573385f..2cef69d 100644
--- a/daemon/scrub.c
+++ b/daemon/scrub.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/daemon/selinux.c b/daemon/selinux.c
index 0bf6fd2..2db05ee 100644
--- a/daemon/selinux.c
+++ b/daemon/selinux.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/daemon/sfdisk.c b/daemon/sfdisk.c
index b595601..8221ffa 100644
--- a/daemon/sfdisk.c
+++ b/daemon/sfdisk.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/daemon/sleep.c b/daemon/sleep.c
index 6e133bd..af01d25 100644
--- a/daemon/sleep.c
+++ b/daemon/sleep.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/daemon/stat.c b/daemon/stat.c
index e245323..22592bb 100644
--- a/daemon/stat.c
+++ b/daemon/stat.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/daemon/statvfs.c b/daemon/statvfs.c
index e5118e4..4eff22d 100644
--- a/daemon/statvfs.c
+++ b/daemon/statvfs.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/daemon/strings.c b/daemon/strings.c
index f08401b..d94ac44 100644
--- a/daemon/strings.c
+++ b/daemon/strings.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/daemon/swap.c b/daemon/swap.c
index c2fe13a..51dbbe4 100644
--- a/daemon/swap.c
+++ b/daemon/swap.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/daemon/sync.c b/daemon/sync.c
index a09c8c1..bde181f 100644
--- a/daemon/sync.c
+++ b/daemon/sync.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/daemon/tar.c b/daemon/tar.c
index 74d7b05..9e45dee 100644
--- a/daemon/tar.c
+++ b/daemon/tar.c
@@ -1,5 +1,5 @@
/* libguestfs - the guestfsd daemon
- * Copyright (C) 2009-2010 Red Hat Inc.
+ * Copyright (C) 2009-2011 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
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
@@ -36,18 +36,14 @@ optgroup_xz_available (void)
return prog_exists ("xz");
}
-/* Redirect errors from the tar command to the error file, then
- * provide functions for reading it in. We overwrite the file each
- * time, and since it's small and stored on the appliance we don't
- * bother to delete it.
- */
-static const char *error_file = "/tmp/error";
-
+/* Read the error file. Returns a string that the caller must free. */
static char *
-read_error_file (void)
+read_error_file (char *error_file)
{
size_t len;
- char *str = read_file (error_file, &len);
+ char *str;
+
+ str = read_file (error_file, &len);
if (str == NULL) {
str = strdup ("(no error)");
if (str == NULL) {
@@ -78,6 +74,16 @@ do_tXz_in (const char *dir, const char *filter)
int err, r;
FILE *fp;
char *cmd;
+ char error_file[] = "/tmp/tarXXXXXX";
+ int fd;
+
+ fd = mkstemp (error_file);
+ if (fd == -1) {
+ reply_with_perror ("mkstemp");
+ return -1;
+ }
+
+ close (fd);
/* "tar -C /sysroot%s -xf -" but we have to quote the dir. */
if (asprintf_nowarn (&cmd, "tar -C %R -%sxf - 2> %s",
@@ -86,6 +92,7 @@ do_tXz_in (const char *dir, const char *filter)
r = cancel_receive ();
errno = err;
reply_with_perror ("asprintf");
+ unlink (error_file);
return -1;
}
@@ -98,6 +105,7 @@ do_tXz_in (const char *dir, const char *filter)
r = cancel_receive ();
errno = err;
reply_with_perror ("%s", cmd);
+ unlink (error_file);
free (cmd);
return -1;
}
@@ -106,14 +114,15 @@ do_tXz_in (const char *dir, const char *filter)
/* The semantics of fwrite are too undefined, so write to the
* file descriptor directly instead.
*/
- int fd = fileno (fp);
+ fd = fileno (fp);
r = receive_file (write_cb, &fd);
if (r == -1) { /* write error */
cancel_receive ();
- char *errstr = read_error_file ();
+ char *errstr = read_error_file (error_file);
reply_with_error ("write error on directory: %s: %s", dir, errstr);
free (errstr);
+ unlink (error_file);
pclose (fp);
return -1;
}
@@ -123,17 +132,21 @@ do_tXz_in (const char *dir, const char *filter)
*/
reply_with_error ("file upload cancelled");
pclose (fp);
+ unlink (error_file);
return -1;
}
if (pclose (fp) != 0) {
- char *errstr = read_error_file ();
+ char *errstr = read_error_file (error_file);
reply_with_error ("tar subcommand failed on directory: %s: %s",
dir, errstr);
free (errstr);
+ unlink (error_file);
return -1;
}
+ unlink (error_file);
+
return 0;
}
diff --git a/daemon/truncate.c b/daemon/truncate.c
index 2cc21b4..28d9ceb 100644
--- a/daemon/truncate.c
+++ b/daemon/truncate.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/daemon/umask.c b/daemon/umask.c
index 1563c52..52e854e 100644
--- a/daemon/umask.c
+++ b/daemon/umask.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/daemon/upload.c b/daemon/upload.c
index a1a37ae..dffe411 100644
--- a/daemon/upload.c
+++ b/daemon/upload.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/daemon/utimens.c b/daemon/utimens.c
index 1da2169..ae006c6 100644
--- a/daemon/utimens.c
+++ b/daemon/utimens.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/daemon/wc.c b/daemon/wc.c
index 397d90c..5d35559 100644
--- a/daemon/wc.c
+++ b/daemon/wc.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/daemon/xattr.c b/daemon/xattr.c
index 2b4882a..cb700d7 100644
--- a/daemon/xattr.c
+++ b/daemon/xattr.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/daemon/zero.c b/daemon/zero.c
index 8df2298..67112d8 100644
--- a/daemon/zero.c
+++ b/daemon/zero.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/daemon/zerofree.c b/daemon/zerofree.c
index f98c69b..e9be8fc 100644
--- a/daemon/zerofree.c
+++ b/daemon/zerofree.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/debian/changelog b/debian/changelog
index c25cfa1..b6525f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
-libguestfs (1.15.2-1) unstable; urgency=low
+libguestfs (1.15.3-1) unstable; urgency=low
- * release: New upstream version 1.15.2.
+ * release: New upstream version 1.15.3.
-- Richard W.M. Jones <rjones at redhat.com> Thu, 9 Dec 2010 12:00:00 +0000
diff --git a/df/Makefile.am b/df/Makefile.am
index 6281c96..2b2c47e 100644
--- a/df/Makefile.am
+++ b/df/Makefile.am
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
include $(top_srcdir)/subdir-rules.mk
diff --git a/df/Makefile.in b/df/Makefile.in
index b530d24..fcd86ba 100644
--- a/df/Makefile.in
+++ b/df/Makefile.in
@@ -30,7 +30,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# libguestfs
# Copyright (C) 2009 Red Hat Inc.
@@ -47,7 +47,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
VPATH = @srcdir@
diff --git a/df/df.c b/df/df.c
index 8821d68..2502037 100644
--- a/df/df.c
+++ b/df/df.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/df/domains.c b/df/domains.c
index 7a4e33c..04390e3 100644
--- a/df/domains.c
+++ b/df/domains.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/df/main.c b/df/main.c
index 17aa283..2429c32 100644
--- a/df/main.c
+++ b/df/main.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/df/output.c b/df/output.c
index 7852daa..ea981b8 100644
--- a/df/output.c
+++ b/df/output.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/df/virt-df.h b/df/virt-df.h
index 4a3179e..6982658 100644
--- a/df/virt-df.h
+++ b/df/virt-df.h
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef GUESTFS_VIRT_DF_
diff --git a/df/virt-df.pod b/df/virt-df.pod
index 49c5e0a..df58b4c 100755
--- a/df/virt-df.pod
+++ b/df/virt-df.pod
@@ -252,4 +252,4 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/edit/Makefile.am b/edit/Makefile.am
index eac2877..d94e42e 100644
--- a/edit/Makefile.am
+++ b/edit/Makefile.am
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
include $(top_srcdir)/subdir-rules.mk
diff --git a/edit/Makefile.in b/edit/Makefile.in
index eb9af30..16ff4c3 100644
--- a/edit/Makefile.in
+++ b/edit/Makefile.in
@@ -30,7 +30,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# libguestfs
# Copyright (C) 2009 Red Hat Inc.
@@ -47,7 +47,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
VPATH = @srcdir@
diff --git a/edit/virt-edit.c b/edit/virt-edit.c
index dc2e130..66866b7 100644
--- a/edit/virt-edit.c
+++ b/edit/virt-edit.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/edit/virt-edit.pod b/edit/virt-edit.pod
index 99dd3f3..83f815e 100644
--- a/edit/virt-edit.pod
+++ b/edit/virt-edit.pod
@@ -385,4 +385,4 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/erlang/Makefile.am b/erlang/Makefile.am
index d262f87..f336375 100644
--- a/erlang/Makefile.am
+++ b/erlang/Makefile.am
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
include $(top_srcdir)/subdir-rules.mk
diff --git a/erlang/Makefile.in b/erlang/Makefile.in
index 23ab678..99e450e 100644
--- a/erlang/Makefile.in
+++ b/erlang/Makefile.in
@@ -30,7 +30,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# libguestfs
# Copyright (C) 2009 Red Hat Inc.
@@ -47,7 +47,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
VPATH = @srcdir@
diff --git a/erlang/examples/Makefile.am b/erlang/examples/Makefile.am
index 9fa82bb..724e7f5 100644
--- a/erlang/examples/Makefile.am
+++ b/erlang/examples/Makefile.am
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
EXTRA_DIST = \
LICENSE \
diff --git a/erlang/examples/Makefile.in b/erlang/examples/Makefile.in
index 7ec99d1..9f14194 100644
--- a/erlang/examples/Makefile.in
+++ b/erlang/examples/Makefile.in
@@ -30,7 +30,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 03870cb..8d6accd 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
EXTRA_DIST = \
LICENSE \
diff --git a/examples/Makefile.in b/examples/Makefile.in
index 2e57ccd..e43d02f 100644
--- a/examples/Makefile.in
+++ b/examples/Makefile.in
@@ -30,7 +30,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
VPATH = @srcdir@
diff --git a/fish/Makefile.am b/fish/Makefile.am
index dd0625d..6ca8a82 100644
--- a/fish/Makefile.am
+++ b/fish/Makefile.am
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
include $(top_srcdir)/subdir-rules.mk
diff --git a/fish/Makefile.in b/fish/Makefile.in
index a2391a3..34abefd 100644
--- a/fish/Makefile.in
+++ b/fish/Makefile.in
@@ -30,7 +30,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# libguestfs
# Copyright (C) 2009 Red Hat Inc.
@@ -47,7 +47,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/fish/alloc.c b/fish/alloc.c
index 7799e4e..08790a7 100644
--- a/fish/alloc.c
+++ b/fish/alloc.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/fish/cmds.c b/fish/cmds.c
index e4d5dfb..8e029f6 100644
--- a/fish/cmds.c
+++ b/fish/cmds.c
@@ -804,7 +804,7 @@ struct command_entry list_filesystems_cmd_entry = {
struct command_entry add_drive_opts_cmd_entry = {
.name = "add-drive-opts",
- .help = "NAME\n add-drive-opts - add an image to examine or modify\n\nSYNOPSIS\n add-drive-opts filename [readonly:..] [format:..] [iface:..] [name:..]\n\nDESCRIPTION\n This function adds a virtual machine disk image \"filename\" to\n libguestfs. The first time you call this function, the disk appears as\n \"/dev/sda\", the second time as \"/dev/sdb\", and so on.\n\n You don't necessarily need to be root when using libguestfs. However you\n obviously do need suffi [...]
+ .help = "NAME\n add-drive-opts - add an image to examine or modify\n\nSYNOPSIS\n add-drive-opts filename [readonly:true|false] [format:..] [iface:..] [name:..]\n\nDESCRIPTION\n This function adds a virtual machine disk image \"filename\" to\n libguestfs. The first time you call this function, the disk appears as\n \"/dev/sda\", the second time as \"/dev/sdb\", and so on.\n\n You don't necessarily need to be root when using libguestfs. However you\n obviously do ne [...]
.run = run_add_drive_opts
};
@@ -834,7 +834,7 @@ struct command_entry debug_drives_cmd_entry = {
struct command_entry add_domain_cmd_entry = {
.name = "add-domain",
- .help = "NAME\n add-domain - add the disk(s) from a named libvirt domain\n\nSYNOPSIS\n add-domain dom [libvirturi:..] [readonly:..] [iface:..] [live:..] [allowuuid:..] [readonlydisk:..]\n\nDESCRIPTION\n This function adds the disk(s) attached to the named libvirt domain\n \"dom\". It works by connecting to libvirt, requesting the domain and\n domain XML from libvirt, parsing it for disks, and calling\n \"add_drive_opts\" on each one.\n\n The number of disks added [...]
+ .help = "NAME\n add-domain - add the disk(s) from a named libvirt domain\n\nSYNOPSIS\n add-domain dom [libvirturi:..] [readonly:true|false] [iface:..] [live:true|false] [allowuuid:true|false] [readonlydisk:..]\n\nDESCRIPTION\n This function adds the disk(s) attached to the named libvirt domain\n \"dom\". It works by connecting to libvirt, requesting the domain and\n domain XML from libvirt, parsing it for disks, and calling\n \"add_drive_opts\" on each one.\n\n Th [...]
.run = run_add_domain
};
@@ -918,7 +918,7 @@ struct command_entry inspect_get_drive_mappings_cmd_entry = {
struct command_entry inspect_get_icon_cmd_entry = {
.name = "inspect-get-icon",
- .help = "NAME\n inspect-get-icon - get the icon corresponding to this operating system\n\nSYNOPSIS\n inspect-get-icon root [favicon:..] [highquality:..]\n\nDESCRIPTION\n This function returns an icon corresponding to the inspected operating\n system. The icon is returned as a buffer containing a PNG image\n (re-encoded to PNG if necessary).\n\n If it was not possible to get an icon this function returns a\n zero-length (non-NULL) buffer. *Callers must check for th [...]
+ .help = "NAME\n inspect-get-icon - get the icon corresponding to this operating system\n\nSYNOPSIS\n inspect-get-icon root [favicon:true|false] [highquality:true|false]\n\nDESCRIPTION\n This function returns an icon corresponding to the inspected operating\n system. The icon is returned as a buffer containing a PNG image\n (re-encoded to PNG if necessary).\n\n If it was not possible to get an icon this function returns a\n zero-length (non-NULL) buffer. *Callers m [...]
.run = run_inspect_get_icon
};
@@ -2610,7 +2610,7 @@ struct command_entry lvm_canonical_lv_name_cmd_entry = {
struct command_entry mkfs_opts_cmd_entry = {
.name = "mkfs-opts",
- .help = "NAME\n mkfs-opts - make a filesystem\n\nSYNOPSIS\n mkfs-opts fstype device [blocksize:..] [features:..] [inode:..] [sectorsize:..]\n\nDESCRIPTION\n This function creates a filesystem on \"device\". The filesystem type is\n \"fstype\", for example \"ext3\".\n\n The optional arguments are:\n\n \"blocksize\"\n The filesystem block size. Supported block sizes depend on the\n filesystem type, but typically they are 1024, 2048 or 4096 for Linux\n [...]
+ .help = "NAME\n mkfs-opts - make a filesystem\n\nSYNOPSIS\n mkfs-opts fstype device [blocksize:N] [features:..] [inode:N] [sectorsize:N]\n\nDESCRIPTION\n This function creates a filesystem on \"device\". The filesystem type is\n \"fstype\", for example \"ext3\".\n\n The optional arguments are:\n\n \"blocksize\"\n The filesystem block size. Supported block sizes depend on the\n filesystem type, but typically they are 1024, 2048 or 4096 for Linux\n [...]
.run = run_mkfs_opts
};
@@ -2664,13 +2664,13 @@ struct command_entry list_dm_devices_cmd_entry = {
struct command_entry ntfsresize_opts_cmd_entry = {
.name = "ntfsresize-opts",
- .help = "NAME\n ntfsresize-opts - resize an NTFS filesystem\n\nSYNOPSIS\n ntfsresize-opts device [size:..] [force:..]\n\nDESCRIPTION\n This command resizes an NTFS filesystem, expanding or shrinking it to\n the size of the underlying device.\n\n The optional parameters are:\n\n \"size\"\n The new size (in bytes) of the filesystem. If omitted, the\n filesystem is resized to fit the container (eg. partition).\n\n \"force\"\n If this option is tr [...]
+ .help = "NAME\n ntfsresize-opts - resize an NTFS filesystem\n\nSYNOPSIS\n ntfsresize-opts device [size:N] [force:true|false]\n\nDESCRIPTION\n This command resizes an NTFS filesystem, expanding or shrinking it to\n the size of the underlying device.\n\n The optional parameters are:\n\n \"size\"\n The new size (in bytes) of the filesystem. If omitted, the\n filesystem is resized to fit the container (eg. partition).\n\n \"force\"\n If this optio [...]
.run = run_ntfsresize_opts
};
struct command_entry btrfs_filesystem_resize_cmd_entry = {
.name = "btrfs-filesystem-resize",
- .help = "NAME\n btrfs-filesystem-resize - resize a btrfs filesystem\n\nSYNOPSIS\n btrfs-filesystem-resize mountpoint [size:..]\n\nDESCRIPTION\n This command resizes a btrfs filesystem.\n\n Note that unlike other resize calls, the filesystem has to be mounted\n and the parameter is the mountpoint not the device (this is a\n requirement of btrfs itself).\n\n The optional parameters are:\n\n \"size\"\n The new size (in bytes) of the filesystem. If omitted, [...]
+ .help = "NAME\n btrfs-filesystem-resize - resize a btrfs filesystem\n\nSYNOPSIS\n btrfs-filesystem-resize mountpoint [size:N]\n\nDESCRIPTION\n This command resizes a btrfs filesystem.\n\n Note that unlike other resize calls, the filesystem has to be mounted\n and the parameter is the mountpoint not the device (this is a\n requirement of btrfs itself).\n\n The optional parameters are:\n\n \"size\"\n The new size (in bytes) of the filesystem. If omitted, t [...]
.run = run_btrfs_filesystem_resize
};
@@ -2682,13 +2682,13 @@ struct command_entry write_append_cmd_entry = {
struct command_entry compress_out_cmd_entry = {
.name = "compress-out",
- .help = "NAME\n compress-out - output compressed file\n\nSYNOPSIS\n compress-out ctype file zfile [level:..]\n\nDESCRIPTION\n This command compresses \"file\" and writes it out to the local file\n \"zfile\".\n\n The compression program used is controlled by the \"ctype\" parameter.\n Currently this includes: \"compress\", \"gzip\", \"bzip2\", \"xz\" or \"lzop\".\n Some compression types may not be supported by particular builds of\n libguestfs, in which case yo [...]
+ .help = "NAME\n compress-out - output compressed file\n\nSYNOPSIS\n compress-out ctype file zfile [level:N]\n\nDESCRIPTION\n This command compresses \"file\" and writes it out to the local file\n \"zfile\".\n\n The compression program used is controlled by the \"ctype\" parameter.\n Currently this includes: \"compress\", \"gzip\", \"bzip2\", \"xz\" or \"lzop\".\n Some compression types may not be supported by particular builds of\n libguestfs, in which case you [...]
.run = run_compress_out
};
struct command_entry compress_device_out_cmd_entry = {
.name = "compress-device-out",
- .help = "NAME\n compress-device-out - output compressed device\n\nSYNOPSIS\n compress-device-out ctype device zdevice [level:..]\n\nDESCRIPTION\n This command compresses \"device\" and writes it out to the local file\n \"zdevice\".\n\n The \"ctype\" and optional \"level\" parameters have the same meaning as in\n \"compress_out\".\n\n",
+ .help = "NAME\n compress-device-out - output compressed device\n\nSYNOPSIS\n compress-device-out ctype device zdevice [level:N]\n\nDESCRIPTION\n This command compresses \"device\" and writes it out to the local file\n \"zdevice\".\n\n The \"ctype\" and optional \"level\" parameters have the same meaning as in\n \"compress_out\".\n\n",
.run = run_compress_device_out
};
@@ -2700,25 +2700,25 @@ struct command_entry part_to_partnum_cmd_entry = {
struct command_entry copy_device_to_device_cmd_entry = {
.name = "copy-device-to-device",
- .help = "NAME\n copy-device-to-device - copy from source device to destination device\n\nSYNOPSIS\n copy-device-to-device src dest [srcoffset:..] [destoffset:..] [size:..]\n\nDESCRIPTION\n The four calls \"copy_device_to_device\", \"copy_device_to_file\",\n \"copy_file_to_device\", and \"copy_file_to_file\" let you copy from a\n source (device|file) to a destination (device|file).\n\n Partial copies can be made since you can specify optionally the source\n offset, [...]
+ .help = "NAME\n copy-device-to-device - copy from source device to destination device\n\nSYNOPSIS\n copy-device-to-device src dest [srcoffset:N] [destoffset:N] [size:N]\n\nDESCRIPTION\n The four calls \"copy_device_to_device\", \"copy_device_to_file\",\n \"copy_file_to_device\", and \"copy_file_to_file\" let you copy from a\n source (device|file) to a destination (device|file).\n\n Partial copies can be made since you can specify optionally the source\n offset, de [...]
.run = run_copy_device_to_device
};
struct command_entry copy_device_to_file_cmd_entry = {
.name = "copy-device-to-file",
- .help = "NAME\n copy-device-to-file - copy from source device to destination file\n\nSYNOPSIS\n copy-device-to-file src dest [srcoffset:..] [destoffset:..] [size:..]\n\nDESCRIPTION\n See \"copy_device_to_device\" for a general overview of this call.\n\n",
+ .help = "NAME\n copy-device-to-file - copy from source device to destination file\n\nSYNOPSIS\n copy-device-to-file src dest [srcoffset:N] [destoffset:N] [size:N]\n\nDESCRIPTION\n See \"copy_device_to_device\" for a general overview of this call.\n\n",
.run = run_copy_device_to_file
};
struct command_entry copy_file_to_device_cmd_entry = {
.name = "copy-file-to-device",
- .help = "NAME\n copy-file-to-device - copy from source file to destination device\n\nSYNOPSIS\n copy-file-to-device src dest [srcoffset:..] [destoffset:..] [size:..]\n\nDESCRIPTION\n See \"copy_device_to_device\" for a general overview of this call.\n\n",
+ .help = "NAME\n copy-file-to-device - copy from source file to destination device\n\nSYNOPSIS\n copy-file-to-device src dest [srcoffset:N] [destoffset:N] [size:N]\n\nDESCRIPTION\n See \"copy_device_to_device\" for a general overview of this call.\n\n",
.run = run_copy_file_to_device
};
struct command_entry copy_file_to_file_cmd_entry = {
.name = "copy-file-to-file",
- .help = "NAME\n copy-file-to-file - copy from source file to destination file\n\nSYNOPSIS\n copy-file-to-file src dest [srcoffset:..] [destoffset:..] [size:..]\n\nDESCRIPTION\n See \"copy_device_to_device\" for a general overview of this call.\n\n This is not the function you want for copying files. This is for copying\n blocks within existing files. See \"cp\", \"cp_a\" and \"mv\" for general file\n copying and moving functions.\n\n",
+ .help = "NAME\n copy-file-to-file - copy from source file to destination file\n\nSYNOPSIS\n copy-file-to-file src dest [srcoffset:N] [destoffset:N] [size:N]\n\nDESCRIPTION\n See \"copy_device_to_device\" for a general overview of this call.\n\n This is not the function you want for copying files. This is for copying\n blocks within existing files. See \"cp\", \"cp_a\" and \"mv\" for general file\n copying and moving functions.\n\n",
.run = run_copy_file_to_file
};
diff --git a/fish/copy.c b/fish/copy.c
index c1c1b47..9416ce7 100644
--- a/fish/copy.c
+++ b/fish/copy.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/fish/destpaths.c b/fish/destpaths.c
index 3c90517..c7b9dc5 100644
--- a/fish/destpaths.c
+++ b/fish/destpaths.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/fish/display.c b/fish/display.c
index 4a46ea8..05933f4 100644
--- a/fish/display.c
+++ b/fish/display.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/fish/echo.c b/fish/echo.c
index 78b4160..7cf7c1a 100644
--- a/fish/echo.c
+++ b/fish/echo.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/fish/edit.c b/fish/edit.c
index 80ae44b..7bd6244 100644
--- a/fish/edit.c
+++ b/fish/edit.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/fish/fish.c b/fish/fish.c
index 7b45fec..c55f54b 100644
--- a/fish/fish.c
+++ b/fish/fish.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/fish/glob.c b/fish/glob.c
index 8250c13..e05e775 100644
--- a/fish/glob.c
+++ b/fish/glob.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/fish/guestfish-actions.pod b/fish/guestfish-actions.pod
index 2756190..7c3e49d 100644
--- a/fish/guestfish-actions.pod
+++ b/fish/guestfish-actions.pod
@@ -36,7 +36,7 @@ with correct use of these functions.
=head2 domain
- add-domain dom [libvirturi:..] [readonly:..] [iface:..] [live:..] [allowuuid:..] [readonlydisk:..]
+ add-domain dom [libvirturi:..] [readonly:true|false] [iface:..] [live:true|false] [allowuuid:true|false] [readonlydisk:..]
This function adds the disk(s) attached to the named libvirt
domain C<dom>. It works by connecting to libvirt, requesting
@@ -143,7 +143,7 @@ and specifying the format.
=head2 add
- add-drive-opts filename [readonly:..] [format:..] [iface:..] [name:..]
+ add-drive-opts filename [readonly:true|false] [format:..] [iface:..] [name:..]
This function adds a virtual machine disk image C<filename> to
libguestfs. The first time you call this function, the disk
@@ -600,7 +600,7 @@ This uses the L<blockdev(8)> command.
=head2 btrfs-filesystem-resize
- btrfs-filesystem-resize mountpoint [size:..]
+ btrfs-filesystem-resize mountpoint [size:N]
This command resizes a btrfs filesystem.
@@ -822,7 +822,7 @@ of somewhere between 2MB and 4MB. See L<guestfs(3)/PROTOCOL LIMITS>.
=head2 compress-device-out
- compress-device-out ctype device (zdevice|-) [level:..]
+ compress-device-out ctype device (zdevice|-) [level:N]
This command compresses C<device> and writes it out to the local
file C<zdevice>.
@@ -836,7 +836,7 @@ This command has one or more optional arguments. See L</OPTIONAL ARGUMENTS>.
=head2 compress-out
- compress-out ctype file (zfile|-) [level:..]
+ compress-out ctype file (zfile|-) [level:N]
This command compresses C<file> and writes it out to the local
file C<zfile>.
@@ -870,7 +870,7 @@ C<value> can be NULL.
=head2 copy-device-to-device
- copy-device-to-device src dest [srcoffset:..] [destoffset:..] [size:..]
+ copy-device-to-device src dest [srcoffset:N] [destoffset:N] [size:N]
The four calls L</copy-device-to-device>,
L</copy-device-to-file>,
@@ -895,7 +895,7 @@ This command has one or more optional arguments. See L</OPTIONAL ARGUMENTS>.
=head2 copy-device-to-file
- copy-device-to-file src dest [srcoffset:..] [destoffset:..] [size:..]
+ copy-device-to-file src dest [srcoffset:N] [destoffset:N] [size:N]
See L</copy-device-to-device> for a general overview
of this call.
@@ -904,7 +904,7 @@ This command has one or more optional arguments. See L</OPTIONAL ARGUMENTS>.
=head2 copy-file-to-device
- copy-file-to-device src dest [srcoffset:..] [destoffset:..] [size:..]
+ copy-file-to-device src dest [srcoffset:N] [destoffset:N] [size:N]
See L</copy-device-to-device> for a general overview
of this call.
@@ -913,7 +913,7 @@ This command has one or more optional arguments. See L</OPTIONAL ARGUMENTS>.
=head2 copy-file-to-file
- copy-file-to-file src dest [srcoffset:..] [destoffset:..] [size:..]
+ copy-file-to-file src dest [srcoffset:N] [destoffset:N] [size:N]
See L</copy-device-to-device> for a general overview
of this call.
@@ -2106,7 +2106,7 @@ Please read L<guestfs(3)/INSPECTION> for more details.
=head2 inspect-get-icon
- inspect-get-icon root [favicon:..] [highquality:..]
+ inspect-get-icon root [favicon:true|false] [highquality:true|false]
This function returns an icon corresponding to the inspected
operating system. The icon is returned as a buffer containing a
@@ -3287,7 +3287,7 @@ with correct use of these functions.
=head2 mkfs-opts
- mkfs-opts fstype device [blocksize:..] [features:..] [inode:..] [sectorsize:..]
+ mkfs-opts fstype device [blocksize:N] [features:..] [inode:N] [sectorsize:N]
This function creates a filesystem on C<device>. The filesystem
type is C<fstype>, for example C<ext3>.
@@ -3598,7 +3598,7 @@ with correct use of these functions.
=head2 ntfsresize-opts
- ntfsresize-opts device [size:..] [force:..]
+ ntfsresize-opts device [size:N] [force:true|false]
This command resizes an NTFS filesystem, expanding or
shrinking it to the size of the underlying device.
diff --git a/fish/guestfish-bash-completion.sh b/fish/guestfish-bash-completion.sh
index 243e72b..f9ee668 100644
--- a/fish/guestfish-bash-completion.sh
+++ b/fish/guestfish-bash-completion.sh
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# To use this script, copy it into /etc/bash_completion.d/ if
# that directory exists.
diff --git a/fish/guestfish.pod b/fish/guestfish.pod
index 8190969..ea0b3aa 100644
--- a/fish/guestfish.pod
+++ b/fish/guestfish.pod
@@ -1314,4 +1314,4 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/fish/help.c b/fish/help.c
index 47609e9..e3775e8 100644
--- a/fish/help.c
+++ b/fish/help.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/fish/hexedit.c b/fish/hexedit.c
index 885c54e..472aa8f 100644
--- a/fish/hexedit.c
+++ b/fish/hexedit.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/fish/inspect.c b/fish/inspect.c
index 0b82ade..98329ee 100644
--- a/fish/inspect.c
+++ b/fish/inspect.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/fish/keys.c b/fish/keys.c
index ec15c8f..fe98b61 100644
--- a/fish/keys.c
+++ b/fish/keys.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/fish/lcd.c b/fish/lcd.c
index 857bcf3..69c684e 100644
--- a/fish/lcd.c
+++ b/fish/lcd.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/fish/man.c b/fish/man.c
index 522a86c..9b49122 100644
--- a/fish/man.c
+++ b/fish/man.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/fish/more.c b/fish/more.c
index 01443ff..9008bd1 100644
--- a/fish/more.c
+++ b/fish/more.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/fish/prep.c b/fish/prep.c
index 8ac4b31..9863bc9 100644
--- a/fish/prep.c
+++ b/fish/prep.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/fish/prep_boot.c b/fish/prep_boot.c
index e80f1ee..f66196f 100644
--- a/fish/prep_boot.c
+++ b/fish/prep_boot.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/fish/prep_disk.c b/fish/prep_disk.c
index d393d8d..055b36f 100644
--- a/fish/prep_disk.c
+++ b/fish/prep_disk.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/fish/prep_fs.c b/fish/prep_fs.c
index d8fa609..8934de4 100644
--- a/fish/prep_fs.c
+++ b/fish/prep_fs.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/fish/prep_lv.c b/fish/prep_lv.c
index 627ed0a..3620898 100644
--- a/fish/prep_lv.c
+++ b/fish/prep_lv.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/fish/prep_part.c b/fish/prep_part.c
index ac46f37..27f4b78 100644
--- a/fish/prep_part.c
+++ b/fish/prep_part.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/fish/progress.c b/fish/progress.c
index 679c831..b812a57 100644
--- a/fish/progress.c
+++ b/fish/progress.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/fish/progress.h b/fish/progress.h
index 0e965f1..0b08a93 100644
--- a/fish/progress.h
+++ b/fish/progress.h
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/fish/rc.c b/fish/rc.c
index 1744c41..31f5c64 100644
--- a/fish/rc.c
+++ b/fish/rc.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/fish/reopen.c b/fish/reopen.c
index c455a91..56c189e 100644
--- a/fish/reopen.c
+++ b/fish/reopen.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/fish/setenv.c b/fish/setenv.c
index c9a0013..c2af863 100644
--- a/fish/setenv.c
+++ b/fish/setenv.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/fish/supported.c b/fish/supported.c
index 9502ad3..7b9e085 100644
--- a/fish/supported.c
+++ b/fish/supported.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/fish/tilde.c b/fish/tilde.c
index ee87ce1..8ee1437 100644
--- a/fish/tilde.c
+++ b/fish/tilde.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/fish/time.c b/fish/time.c
index 3a46049..246a580 100644
--- a/fish/time.c
+++ b/fish/time.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/fish/virt-copy-in b/fish/virt-copy-in
index b63b24e..76ff57f 100755
--- a/fish/virt-copy-in
+++ b/fish/virt-copy-in
@@ -14,6 +14,6 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
exec guestfish --rw -i copy-in "$@"
diff --git a/fish/virt-copy-in.pod b/fish/virt-copy-in.pod
index f7e63fe..dc3c825 100644
--- a/fish/virt-copy-in.pod
+++ b/fish/virt-copy-in.pod
@@ -78,4 +78,4 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/fish/virt-copy-out b/fish/virt-copy-out
index c617186..20475ef 100755
--- a/fish/virt-copy-out
+++ b/fish/virt-copy-out
@@ -14,6 +14,6 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
exec guestfish --ro -i copy-out "$@"
diff --git a/fish/virt-copy-out.pod b/fish/virt-copy-out.pod
index 4bfc32d..3f2d900 100644
--- a/fish/virt-copy-out.pod
+++ b/fish/virt-copy-out.pod
@@ -67,4 +67,4 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/fish/virt-tar-in b/fish/virt-tar-in
index 15d9015..1501b38 100755
--- a/fish/virt-tar-in
+++ b/fish/virt-tar-in
@@ -14,6 +14,6 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
exec guestfish --rw -i tar-in "$@"
diff --git a/fish/virt-tar-in.pod b/fish/virt-tar-in.pod
index e0eec1b..8ec3d36 100644
--- a/fish/virt-tar-in.pod
+++ b/fish/virt-tar-in.pod
@@ -76,4 +76,4 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/fish/virt-tar-out b/fish/virt-tar-out
index ea4e516..4d30de4 100755
--- a/fish/virt-tar-out
+++ b/fish/virt-tar-out
@@ -14,6 +14,6 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
exec guestfish --ro -i tar-out "$@"
diff --git a/fish/virt-tar-out.pod b/fish/virt-tar-out.pod
index df01a98..d0c50a0 100644
--- a/fish/virt-tar-out.pod
+++ b/fish/virt-tar-out.pod
@@ -69,4 +69,4 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/fish/virt.c b/fish/virt.c
index 8e8720f..083ea65 100644
--- a/fish/virt.c
+++ b/fish/virt.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/fuse/Makefile.am b/fuse/Makefile.am
index 10bbc9d..16c93db 100644
--- a/fuse/Makefile.am
+++ b/fuse/Makefile.am
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
include $(top_srcdir)/subdir-rules.mk
diff --git a/fuse/Makefile.in b/fuse/Makefile.in
index c15fac1..08a38a8 100644
--- a/fuse/Makefile.in
+++ b/fuse/Makefile.in
@@ -30,7 +30,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# libguestfs
# Copyright (C) 2009 Red Hat Inc.
@@ -47,7 +47,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
VPATH = @srcdir@
diff --git a/fuse/dircache.c b/fuse/dircache.c
index 8cff0d3..771e313 100644
--- a/fuse/dircache.c
+++ b/fuse/dircache.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Derived from the example program 'fusexmp.c':
* Copyright (C) 2001-2007 Miklos Szeredi <miklos at szeredi.hu>
diff --git a/fuse/dircache.h b/fuse/dircache.h
index 748d17c..76ee930 100644
--- a/fuse/dircache.h
+++ b/fuse/dircache.h
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Derived from the example program 'fusexmp.c':
* Copyright (C) 2001-2007 Miklos Szeredi <miklos at szeredi.hu>
diff --git a/fuse/guestmount.c b/fuse/guestmount.c
index 67a746f..bfd8174 100644
--- a/fuse/guestmount.c
+++ b/fuse/guestmount.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Derived from the example program 'fusexmp.c':
* Copyright (C) 2001-2007 Miklos Szeredi <miklos at szeredi.hu>
diff --git a/fuse/guestmount.h b/fuse/guestmount.h
index 07cd42e..81d026d 100644
--- a/fuse/guestmount.h
+++ b/fuse/guestmount.h
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Derived from the example program 'fusexmp.c':
* Copyright (C) 2001-2007 Miklos Szeredi <miklos at szeredi.hu>
diff --git a/fuse/guestmount.pod b/fuse/guestmount.pod
index 40a7698..c089706 100644
--- a/fuse/guestmount.pod
+++ b/fuse/guestmount.pod
@@ -346,4 +346,4 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/fuse/test-fuse.sh b/fuse/test-fuse.sh
index 27e6296..1accd89 100755
--- a/fuse/test-fuse.sh
+++ b/fuse/test-fuse.sh
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
unset CDPATH
set -e
diff --git a/generator/Makefile.am b/generator/Makefile.am
index 44c0594..d6120e3 100644
--- a/generator/Makefile.am
+++ b/generator/Makefile.am
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
SOURCES = \
generator_types.ml \
diff --git a/generator/Makefile.in b/generator/Makefile.in
index 143c687..11c87ce 100644
--- a/generator/Makefile.in
+++ b/generator/Makefile.in
@@ -30,7 +30,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
diff --git a/generator/generator_capitests.ml b/generator/generator_capitests.ml
index 2cad2ae..7bfd87c 100644
--- a/generator/generator_capitests.ml
+++ b/generator/generator_capitests.ml
@@ -776,8 +776,8 @@ and generate_test_command_call ?(expect_error = false) ?test test_name cmd =
if optargs <> [] then (
pr " struct guestfs_%s_argv optargs;\n" name;
- let bitmask = List.fold_left (
- fun bitmask optarg ->
+ let _, bitmask = List.fold_left (
+ fun (shift, bitmask) optarg ->
let is_set =
match optarg with
| Bool n, "" -> false
@@ -803,10 +803,11 @@ and generate_test_command_call ?(expect_error = false) ?test test_name cmd =
| String n, arg ->
pr " optargs.%s = \"%s\";\n" n (c_quote arg); true
| _ -> assert false in
- let bitmask = Int64.shift_left bitmask 1 in
- let bitmask = if is_set then Int64.succ bitmask else bitmask in
- bitmask
- ) 0L optargs in
+ let bit = if is_set then Int64.shift_left 1L shift else 0L in
+ let bitmask = Int64.logor bitmask bit in
+ let shift = shift + 1 in
+ (shift, bitmask)
+ ) (0, 0L) optargs in
pr " optargs.bitmask = UINT64_C(0x%Lx);\n" bitmask;
);
diff --git a/generator/generator_fish.ml b/generator/generator_fish.ml
index 6d6a571..4111be5 100644
--- a/generator/generator_fish.ml
+++ b/generator/generator_fish.ml
@@ -30,6 +30,13 @@ open Generator_structs
open Generator_prepopts
open Generator_c
+let doc_opttype_of = function
+ | Bool n -> "true|false"
+ | Int n
+ | Int64 n -> "N"
+ | String n -> ".."
+ | _ -> assert false
+
(* Generate a lot of different functions for guestfish. *)
let generate_fish_cmds () =
generate_header CStyle GPLv2plus;
@@ -122,7 +129,9 @@ let generate_fish_cmds () =
(String.concat ""
(List.map (fun arg -> " " ^ name_of_argt arg) args))
(String.concat ""
- (List.map (fun arg -> sprintf " [%s:..]" (name_of_argt arg)) optargs)) in
+ (List.map (fun arg ->
+ sprintf " [%s:%s]" (name_of_argt arg) (doc_opttype_of arg)
+ ) optargs)) in
let warnings =
if List.exists (function Key _ -> true | _ -> false) args then
@@ -834,7 +843,8 @@ and generate_fish_actions_pod () =
) args;
List.iter (
function
- | Bool n | Int n | Int64 n | String n -> pr " [%s:..]" n
+ | (Bool n | Int n | Int64 n | String n) as arg ->
+ pr " [%s:%s]" n (doc_opttype_of arg)
| _ -> assert false
) optargs;
pr "\n";
diff --git a/generator/generator_ocaml.ml b/generator/generator_ocaml.ml
index 51bc3d6..4f7548c 100644
--- a/generator/generator_ocaml.ml
+++ b/generator/generator_ocaml.ml
@@ -440,13 +440,23 @@ copy_table (char * const * argv)
pr ")\n";
pr "{\n";
+ (* CAMLparam<N> can only take up to 5 parameters. Further parameters
+ * have to be passed in groups of 5 to CAMLxparam<N> calls.
+ *)
(match params with
- | [p1; p2; p3; p4; p5] ->
- pr " CAMLparam5 (%s);\n" (String.concat ", " params)
| p1 :: p2 :: p3 :: p4 :: p5 :: rest ->
pr " CAMLparam5 (%s);\n" (String.concat ", " [p1; p2; p3; p4; p5]);
- pr " CAMLxparam%d (%s);\n"
- (List.length rest) (String.concat ", " rest)
+ let rec loop = function
+ | [] -> ()
+ | p1 :: p2 :: p3 :: p4 :: p5 :: rest ->
+ pr " CAMLxparam5 (%s);\n"
+ (String.concat ", " [p1; p2; p3; p4; p5]);
+ loop rest
+ | rest ->
+ pr " CAMLxparam%d (%s);\n"
+ (List.length rest) (String.concat ", " rest)
+ in
+ loop rest
| ps ->
pr " CAMLparam%d (%s);\n" (List.length ps) (String.concat ", " ps)
);
diff --git a/haskell/Guestfs005Load.hs b/haskell/Guestfs005Load.hs
index c7cb167..f119c7f 100644
--- a/haskell/Guestfs005Load.hs
+++ b/haskell/Guestfs005Load.hs
@@ -13,7 +13,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-}
module Guestfs005Load where
diff --git a/haskell/Guestfs010Basic.hs b/haskell/Guestfs010Basic.hs
index f59465b..2889e28 100644
--- a/haskell/Guestfs010Basic.hs
+++ b/haskell/Guestfs010Basic.hs
@@ -13,7 +13,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-}
module Guestfs010Basic where
diff --git a/haskell/Makefile.am b/haskell/Makefile.am
index d8a06f3..1fa8c0b 100644
--- a/haskell/Makefile.am
+++ b/haskell/Makefile.am
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
include $(top_srcdir)/subdir-rules.mk
diff --git a/haskell/Makefile.in b/haskell/Makefile.in
index f5971a6..8e9f043 100644
--- a/haskell/Makefile.in
+++ b/haskell/Makefile.in
@@ -30,7 +30,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# libguestfs
# Copyright (C) 2009 Red Hat Inc.
@@ -47,7 +47,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
diff --git a/haskell/run-bindtests b/haskell/run-bindtests
index 7b45145..3b17403 100755
--- a/haskell/run-bindtests
+++ b/haskell/run-bindtests
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
set -e
diff --git a/images/Makefile.am b/images/Makefile.am
index 90c4ce3..1cae8bf 100644
--- a/images/Makefile.am
+++ b/images/Makefile.am
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
include $(top_srcdir)/subdir-rules.mk
diff --git a/images/Makefile.in b/images/Makefile.in
index 50fb779..f2e3f4e 100644
--- a/images/Makefile.in
+++ b/images/Makefile.in
@@ -30,7 +30,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# libguestfs
# Copyright (C) 2009 Red Hat Inc.
@@ -47,7 +47,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
diff --git a/images/guest-aux/make-debian-img.sh b/images/guest-aux/make-debian-img.sh
index 4b0490d..ade2331 100755
--- a/images/guest-aux/make-debian-img.sh
+++ b/images/guest-aux/make-debian-img.sh
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# Make a Debian image which is enough to fool the inspection heuristics.
diff --git a/images/guest-aux/make-fedora-img.sh b/images/guest-aux/make-fedora-img.sh
index 3d6c471..b4c07e9 100755
--- a/images/guest-aux/make-fedora-img.sh
+++ b/images/guest-aux/make-fedora-img.sh
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# Make a standard test image which is used by all the tools test
# scripts. This test image is supposed to look like a Fedora
diff --git a/images/guest-aux/make-ubuntu-img.sh b/images/guest-aux/make-ubuntu-img.sh
index c48fd5d..0c4d60a 100755
--- a/images/guest-aux/make-ubuntu-img.sh
+++ b/images/guest-aux/make-ubuntu-img.sh
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# Make an Ubuntu image which is enough to fool the inspection heuristics.
diff --git a/images/guest-aux/make-windows-img.sh b/images/guest-aux/make-windows-img.sh
index 9e2152d..ec6aa47 100755
--- a/images/guest-aux/make-windows-img.sh
+++ b/images/guest-aux/make-windows-img.sh
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# Make a Windows image which is enough to fool the inspection heuristics.
diff --git a/inspector/Makefile.am b/inspector/Makefile.am
index 2389dbd..338afe3 100644
--- a/inspector/Makefile.am
+++ b/inspector/Makefile.am
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
include $(top_srcdir)/subdir-rules.mk
diff --git a/inspector/Makefile.in b/inspector/Makefile.in
index de14a3c..ff01017 100644
--- a/inspector/Makefile.in
+++ b/inspector/Makefile.in
@@ -30,7 +30,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# libguestfs
# Copyright (C) 2009 Red Hat Inc.
@@ -47,7 +47,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
VPATH = @srcdir@
diff --git a/inspector/virt-inspector.c b/inspector/virt-inspector.c
index c505fa4..09621ab 100644
--- a/inspector/virt-inspector.c
+++ b/inspector/virt-inspector.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/inspector/virt-inspector.pod b/inspector/virt-inspector.pod
index 9a43e94..04e421d 100755
--- a/inspector/virt-inspector.pod
+++ b/inspector/virt-inspector.pod
@@ -431,4 +431,4 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/java/Makefile.am b/java/Makefile.am
index 6f2af11..7686047 100644
--- a/java/Makefile.am
+++ b/java/Makefile.am
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
include $(top_srcdir)/subdir-rules.mk
diff --git a/java/Makefile.in b/java/Makefile.in
index 1b71825..b900c4b 100644
--- a/java/Makefile.in
+++ b/java/Makefile.in
@@ -30,7 +30,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# libguestfs
# Copyright (C) 2009 Red Hat Inc.
@@ -47,7 +47,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# libguestfs generated file
# WARNING: THIS FILE IS GENERATED FROM:
diff --git a/java/examples/Makefile.am b/java/examples/Makefile.am
index 60fd958..80c2cb3 100644
--- a/java/examples/Makefile.am
+++ b/java/examples/Makefile.am
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
EXTRA_DIST = \
LICENSE \
diff --git a/java/examples/Makefile.in b/java/examples/Makefile.in
index 97e23ee..0d907d6 100644
--- a/java/examples/Makefile.in
+++ b/java/examples/Makefile.in
@@ -30,7 +30,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
VPATH = @srcdir@
diff --git a/java/run-bindtests b/java/run-bindtests
index 7e6eb7f..4fc147a 100755
--- a/java/run-bindtests
+++ b/java/run-bindtests
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
set -e
diff --git a/java/run-java-tests b/java/run-java-tests
index a9fe957..33bb6ca 100755
--- a/java/run-java-tests
+++ b/java/run-java-tests
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
set -e
diff --git a/libguestfs.pc b/libguestfs.pc
index 5a99268..002ba01 100644
--- a/libguestfs.pc
+++ b/libguestfs.pc
@@ -4,7 +4,7 @@ libdir=${exec_prefix}/lib
includedir=${prefix}/include
Name: libguestfs
-Version: 1.15.2
+Version: 1.15.3
Description: libguestfs library for accessing and modifying VM images
Requires:
Cflags:
diff --git a/libtool-kill-dependency_libs.sh b/libtool-kill-dependency_libs.sh
index 9f17038..3d5f318 100755
--- a/libtool-kill-dependency_libs.sh
+++ b/libtool-kill-dependency_libs.sh
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# Run libtool as normal, then kill the dependency_libs line in the .la
# file. Otherwise libtool will add DT_NEEDED entries for dependencies
diff --git a/ocaml/Makefile.am b/ocaml/Makefile.am
index 28c13c5..5287035 100644
--- a/ocaml/Makefile.am
+++ b/ocaml/Makefile.am
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
include $(top_srcdir)/subdir-rules.mk
@@ -41,6 +41,9 @@ AM_CPPFLAGS = -I$(top_builddir) -I$(OCAMLLIB) -I$(top_srcdir)/ocaml \
if HAVE_OCAML
+OCAMLCFLAGS = -g -warn-error CDEFLMPSUVYZX
+OCAMLOPTFLAGS = $(OCAMLCFLAGS)
+
noinst_DATA = mlguestfs.cma mlguestfs.cmxa META
OBJS = guestfs_c.o guestfs_c_actions.o guestfs.cmo
@@ -90,46 +93,46 @@ noinst_DATA += bindtests \
bindtests: bindtests.cmx mlguestfs.cmxa
mkdir -p t
- $(OCAMLFIND) ocamlopt -cclib -L$(top_builddir)/src/.libs -I . -package unix -linkpkg mlguestfs.cmxa $< -o $@
+ $(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) -cclib -L$(top_builddir)/src/.libs -I . -package unix -linkpkg mlguestfs.cmxa $< -o $@
t/guestfs_005_load: t/guestfs_005_load.cmx mlguestfs.cmxa
mkdir -p t
- $(OCAMLFIND) ocamlopt -cclib -L$(top_builddir)/src/.libs -I . -package unix -linkpkg mlguestfs.cmxa $< -o $@
+ $(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) -cclib -L$(top_builddir)/src/.libs -I . -package unix -linkpkg mlguestfs.cmxa $< -o $@
t/guestfs_010_basic: t/guestfs_010_basic.cmx mlguestfs.cmxa
mkdir -p t
- $(OCAMLFIND) ocamlopt -cclib -L$(top_builddir)/src/.libs -I . -package unix -linkpkg mlguestfs.cmxa $< -o $@
+ $(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) -cclib -L$(top_builddir)/src/.libs -I . -package unix -linkpkg mlguestfs.cmxa $< -o $@
t/guestfs_070_threads: t/guestfs_070_threads.cmx mlguestfs.cmxa
mkdir -p t
- $(OCAMLFIND) ocamlopt -cclib -L$(top_builddir)/src/.libs -I . -package unix,threads -thread -linkpkg mlguestfs.cmxa $< -o $@
+ $(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) -cclib -L$(top_builddir)/src/.libs -I . -package unix,threads -thread -linkpkg mlguestfs.cmxa $< -o $@
t/guestfs_080_optargs: t/guestfs_080_optargs.cmx mlguestfs.cmxa
mkdir -p t
- $(OCAMLFIND) ocamlopt -cclib -L$(top_builddir)/src/.libs -I . -package unix -linkpkg mlguestfs.cmxa $< -o $@
+ $(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) -cclib -L$(top_builddir)/src/.libs -I . -package unix -linkpkg mlguestfs.cmxa $< -o $@
t/guestfs_400_events: t/guestfs_400_events.cmx mlguestfs.cmxa
mkdir -p t
- $(OCAMLFIND) ocamlopt -cclib -L$(top_builddir)/src/.libs -I . -package unix -linkpkg mlguestfs.cmxa $< -o $@
+ $(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) -cclib -L$(top_builddir)/src/.libs -I . -package unix -linkpkg mlguestfs.cmxa $< -o $@
t/guestfs_400_progress: t/guestfs_400_progress.cmx mlguestfs.cmxa
mkdir -p t
- $(OCAMLFIND) ocamlopt -cclib -L$(top_builddir)/src/.libs -I . -package unix -linkpkg mlguestfs.cmxa $< -o $@
+ $(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) -cclib -L$(top_builddir)/src/.libs -I . -package unix -linkpkg mlguestfs.cmxa $< -o $@
# Need to rebuild the tests from source if the main library has
# changed at all, otherwise we get inconsistent assumptions.
t/guestfs_070_threads.cmx: t/guestfs_070_threads.ml mlguestfs.cmxa
- $(OCAMLFIND) ocamlopt -package unix,threads -thread -linkpkg -c $< -o $@
+ $(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) -package unix,threads -thread -linkpkg -c $< -o $@
t/%.cmx: t/%.ml mlguestfs.cmxa
- $(OCAMLFIND) ocamlopt -package unix -linkpkg -c $< -o $(builddir)/$@
+ $(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) -package unix -linkpkg -c $< -o $(builddir)/$@
%.cmi: %.mli
- $(OCAMLFIND) ocamlc -package unix -c $< -o $(builddir)/$@
+ $(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -package unix -c $< -o $(builddir)/$@
%.cmo: %.ml
- $(OCAMLFIND) ocamlc -package unix -c $< -o $(builddir)/$@
+ $(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -package unix -c $< -o $(builddir)/$@
%.cmx: %.ml
- $(OCAMLFIND) ocamlopt -package unix -c $< -o $(builddir)/$@
+ $(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) -package unix -c $< -o $(builddir)/$@
depend: .depend
diff --git a/ocaml/Makefile.in b/ocaml/Makefile.in
index 88a9695..060d7a2 100644
--- a/ocaml/Makefile.in
+++ b/ocaml/Makefile.in
@@ -30,7 +30,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# libguestfs
# Copyright (C) 2009 Red Hat Inc.
@@ -47,7 +47,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
@@ -1217,6 +1217,8 @@ AM_CPPFLAGS = -I$(top_builddir) -I$(OCAMLLIB) -I$(top_srcdir)/ocaml \
-I$(top_srcdir)/src -I$(top_builddir)/src \
$(WARN_CFLAGS) $(WERROR_CFLAGS)
+ at HAVE_OCAML_TRUE@OCAMLCFLAGS = -g -warn-error CDEFLMPSUVYZX
+ at HAVE_OCAML_TRUE@OCAMLOPTFLAGS = $(OCAMLCFLAGS)
@HAVE_OCAML_TRUE at noinst_DATA = mlguestfs.cma mlguestfs.cmxa META \
@HAVE_OCAML_TRUE@ $(am__append_1) bindtests t/guestfs_005_load \
@HAVE_OCAML_TRUE@ t/guestfs_010_basic t/guestfs_070_threads \
@@ -1564,46 +1566,46 @@ appliance: force
@HAVE_OCAML_TRUE at bindtests: bindtests.cmx mlguestfs.cmxa
@HAVE_OCAML_TRUE@ mkdir -p t
- at HAVE_OCAML_TRUE@ $(OCAMLFIND) ocamlopt -cclib -L$(top_builddir)/src/.libs -I . -package unix -linkpkg mlguestfs.cmxa $< -o $@
+ at HAVE_OCAML_TRUE@ $(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) -cclib -L$(top_builddir)/src/.libs -I . -package unix -linkpkg mlguestfs.cmxa $< -o $@
@HAVE_OCAML_TRUE at t/guestfs_005_load: t/guestfs_005_load.cmx mlguestfs.cmxa
@HAVE_OCAML_TRUE@ mkdir -p t
- at HAVE_OCAML_TRUE@ $(OCAMLFIND) ocamlopt -cclib -L$(top_builddir)/src/.libs -I . -package unix -linkpkg mlguestfs.cmxa $< -o $@
+ at HAVE_OCAML_TRUE@ $(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) -cclib -L$(top_builddir)/src/.libs -I . -package unix -linkpkg mlguestfs.cmxa $< -o $@
@HAVE_OCAML_TRUE at t/guestfs_010_basic: t/guestfs_010_basic.cmx mlguestfs.cmxa
@HAVE_OCAML_TRUE@ mkdir -p t
- at HAVE_OCAML_TRUE@ $(OCAMLFIND) ocamlopt -cclib -L$(top_builddir)/src/.libs -I . -package unix -linkpkg mlguestfs.cmxa $< -o $@
+ at HAVE_OCAML_TRUE@ $(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) -cclib -L$(top_builddir)/src/.libs -I . -package unix -linkpkg mlguestfs.cmxa $< -o $@
@HAVE_OCAML_TRUE at t/guestfs_070_threads: t/guestfs_070_threads.cmx mlguestfs.cmxa
@HAVE_OCAML_TRUE@ mkdir -p t
- at HAVE_OCAML_TRUE@ $(OCAMLFIND) ocamlopt -cclib -L$(top_builddir)/src/.libs -I . -package unix,threads -thread -linkpkg mlguestfs.cmxa $< -o $@
+ at HAVE_OCAML_TRUE@ $(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) -cclib -L$(top_builddir)/src/.libs -I . -package unix,threads -thread -linkpkg mlguestfs.cmxa $< -o $@
@HAVE_OCAML_TRUE at t/guestfs_080_optargs: t/guestfs_080_optargs.cmx mlguestfs.cmxa
@HAVE_OCAML_TRUE@ mkdir -p t
- at HAVE_OCAML_TRUE@ $(OCAMLFIND) ocamlopt -cclib -L$(top_builddir)/src/.libs -I . -package unix -linkpkg mlguestfs.cmxa $< -o $@
+ at HAVE_OCAML_TRUE@ $(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) -cclib -L$(top_builddir)/src/.libs -I . -package unix -linkpkg mlguestfs.cmxa $< -o $@
@HAVE_OCAML_TRUE at t/guestfs_400_events: t/guestfs_400_events.cmx mlguestfs.cmxa
@HAVE_OCAML_TRUE@ mkdir -p t
- at HAVE_OCAML_TRUE@ $(OCAMLFIND) ocamlopt -cclib -L$(top_builddir)/src/.libs -I . -package unix -linkpkg mlguestfs.cmxa $< -o $@
+ at HAVE_OCAML_TRUE@ $(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) -cclib -L$(top_builddir)/src/.libs -I . -package unix -linkpkg mlguestfs.cmxa $< -o $@
@HAVE_OCAML_TRUE at t/guestfs_400_progress: t/guestfs_400_progress.cmx mlguestfs.cmxa
@HAVE_OCAML_TRUE@ mkdir -p t
- at HAVE_OCAML_TRUE@ $(OCAMLFIND) ocamlopt -cclib -L$(top_builddir)/src/.libs -I . -package unix -linkpkg mlguestfs.cmxa $< -o $@
+ at HAVE_OCAML_TRUE@ $(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) -cclib -L$(top_builddir)/src/.libs -I . -package unix -linkpkg mlguestfs.cmxa $< -o $@
# Need to rebuild the tests from source if the main library has
# changed at all, otherwise we get inconsistent assumptions.
@HAVE_OCAML_TRUE at t/guestfs_070_threads.cmx: t/guestfs_070_threads.ml mlguestfs.cmxa
- at HAVE_OCAML_TRUE@ $(OCAMLFIND) ocamlopt -package unix,threads -thread -linkpkg -c $< -o $@
+ at HAVE_OCAML_TRUE@ $(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) -package unix,threads -thread -linkpkg -c $< -o $@
@HAVE_OCAML_TRUE at t/%.cmx: t/%.ml mlguestfs.cmxa
- at HAVE_OCAML_TRUE@ $(OCAMLFIND) ocamlopt -package unix -linkpkg -c $< -o $(builddir)/$@
+ at HAVE_OCAML_TRUE@ $(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) -package unix -linkpkg -c $< -o $(builddir)/$@
@HAVE_OCAML_TRUE@%.cmi: %.mli
- at HAVE_OCAML_TRUE@ $(OCAMLFIND) ocamlc -package unix -c $< -o $(builddir)/$@
+ at HAVE_OCAML_TRUE@ $(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -package unix -c $< -o $(builddir)/$@
@HAVE_OCAML_TRUE@%.cmo: %.ml
- at HAVE_OCAML_TRUE@ $(OCAMLFIND) ocamlc -package unix -c $< -o $(builddir)/$@
+ at HAVE_OCAML_TRUE@ $(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -package unix -c $< -o $(builddir)/$@
@HAVE_OCAML_TRUE@%.cmx: %.ml
- at HAVE_OCAML_TRUE@ $(OCAMLFIND) ocamlopt -package unix -c $< -o $(builddir)/$@
+ at HAVE_OCAML_TRUE@ $(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) -package unix -c $< -o $(builddir)/$@
@HAVE_OCAML_TRUE at depend: .depend
diff --git a/ocaml/examples/Makefile.am b/ocaml/examples/Makefile.am
index 43e579c..da9b8c0 100644
--- a/ocaml/examples/Makefile.am
+++ b/ocaml/examples/Makefile.am
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
EXTRA_DIST = \
LICENSE \
diff --git a/ocaml/examples/Makefile.in b/ocaml/examples/Makefile.in
index 38fc3ea..3ebba56 100644
--- a/ocaml/examples/Makefile.in
+++ b/ocaml/examples/Makefile.in
@@ -30,7 +30,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
VPATH = @srcdir@
diff --git a/ocaml/run-bindtests b/ocaml/run-bindtests
index d9a3047..af6fc14 100755
--- a/ocaml/run-bindtests
+++ b/ocaml/run-bindtests
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
set -e
diff --git a/ocaml/t/guestfs_005_load.ml b/ocaml/t/guestfs_005_load.ml
index 8b4492a..de67091 100644
--- a/ocaml/t/guestfs_005_load.ml
+++ b/ocaml/t/guestfs_005_load.ml
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*)
let _ = Guestfs.create
diff --git a/ocaml/t/guestfs_010_basic.ml b/ocaml/t/guestfs_010_basic.ml
index 6fa19e4..49006f7 100644
--- a/ocaml/t/guestfs_010_basic.ml
+++ b/ocaml/t/guestfs_010_basic.ml
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*)
(* Test basic functionality. *)
diff --git a/ocaml/t/guestfs_070_threads.ml b/ocaml/t/guestfs_070_threads.ml
index e13ac7b..414b023 100644
--- a/ocaml/t/guestfs_070_threads.ml
+++ b/ocaml/t/guestfs_070_threads.ml
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*)
open Unix
diff --git a/ocaml/t/guestfs_080_optargs.ml b/ocaml/t/guestfs_080_optargs.ml
index 2b37784..a43a83e 100644
--- a/ocaml/t/guestfs_080_optargs.ml
+++ b/ocaml/t/guestfs_080_optargs.ml
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*)
open Unix
diff --git a/ocaml/t/guestfs_400_events.ml b/ocaml/t/guestfs_400_events.ml
index 7bd7715..4585a09 100644
--- a/ocaml/t/guestfs_400_events.ml
+++ b/ocaml/t/guestfs_400_events.ml
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*)
open Printf
@@ -27,7 +27,8 @@ let log g ev eh buf array =
| Guestfs.EVENT_PROGRESS -> "progress"
| Guestfs.EVENT_APPLIANCE -> "appliance"
| Guestfs.EVENT_LIBRARY -> "library"
- | Guestfs.EVENT_TRACE -> "trace" in
+ | Guestfs.EVENT_TRACE -> "trace"
+ | Guestfs.EVENT_ENTER -> "enter" in
let eh : int = Obj.magic eh in
diff --git a/ocaml/t/guestfs_400_progress.ml b/ocaml/t/guestfs_400_progress.ml
index f5b4219..d49ddff 100644
--- a/ocaml/t/guestfs_400_progress.ml
+++ b/ocaml/t/guestfs_400_progress.ml
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*)
module G = Guestfs
diff --git a/perl/Makefile.PL.in b/perl/Makefile.PL.in
index 62cd04b..349adbb 100644
--- a/perl/Makefile.PL.in
+++ b/perl/Makefile.PL.in
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
use Config;
use ExtUtils::MakeMaker;
diff --git a/perl/Makefile.am b/perl/Makefile.am
index d8167d1..eff0059 100644
--- a/perl/Makefile.am
+++ b/perl/Makefile.am
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
include $(top_srcdir)/subdir-rules.mk
diff --git a/perl/Makefile.in b/perl/Makefile.in
index c04219a..87bc059 100644
--- a/perl/Makefile.in
+++ b/perl/Makefile.in
@@ -30,7 +30,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# libguestfs
# Copyright (C) 2009 Red Hat Inc.
@@ -47,7 +47,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
diff --git a/perl/examples/Makefile.am b/perl/examples/Makefile.am
index 387cdf1..472f0b0 100644
--- a/perl/examples/Makefile.am
+++ b/perl/examples/Makefile.am
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
EXTRA_DIST = \
LICENSE \
diff --git a/perl/examples/Makefile.in b/perl/examples/Makefile.in
index 7e2ed02..9c125d6 100644
--- a/perl/examples/Makefile.in
+++ b/perl/examples/Makefile.in
@@ -30,7 +30,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
diff --git a/perl/run-bindtests b/perl/run-bindtests
index f9cf231..5a53ab6 100755
--- a/perl/run-bindtests
+++ b/perl/run-bindtests
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
set -e
diff --git a/perl/run-perl-tests b/perl/run-perl-tests
index c290742..0e7e9ab 100755
--- a/perl/run-perl-tests
+++ b/perl/run-perl-tests
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
set -e
diff --git a/perl/t/005-pod.t b/perl/t/005-pod.t
index 54025f1..e53caaf 100644
--- a/perl/t/005-pod.t
+++ b/perl/t/005-pod.t
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
use Test::More;
use strict;
diff --git a/perl/t/006-pod-coverage.t b/perl/t/006-pod-coverage.t
index 4c8c4ca..65bb4c2 100644
--- a/perl/t/006-pod-coverage.t
+++ b/perl/t/006-pod-coverage.t
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
use Test::More;
use strict;
diff --git a/perl/t/010-load.t b/perl/t/010-load.t
index 05a3995..e279b2a 100644
--- a/perl/t/010-load.t
+++ b/perl/t/010-load.t
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
use strict;
use warnings;
diff --git a/perl/t/020-create.t b/perl/t/020-create.t
index 7bcd76e..16a0375 100644
--- a/perl/t/020-create.t
+++ b/perl/t/020-create.t
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
use strict;
use warnings;
diff --git a/perl/t/030-config.t b/perl/t/030-config.t
index 12f4531..5f8e04a 100644
--- a/perl/t/030-config.t
+++ b/perl/t/030-config.t
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
use strict;
use warnings;
diff --git a/perl/t/050-lvcreate.t b/perl/t/050-lvcreate.t
index a8f3e7b..0079221 100644
--- a/perl/t/050-lvcreate.t
+++ b/perl/t/050-lvcreate.t
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
use strict;
use warnings;
diff --git a/perl/t/060-readdir.t b/perl/t/060-readdir.t
index dc8278b..e8fe151 100644
--- a/perl/t/060-readdir.t
+++ b/perl/t/060-readdir.t
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
use strict;
use warnings;
diff --git a/perl/t/070-optargs.t b/perl/t/070-optargs.t
index 8187395..273a7fa 100644
--- a/perl/t/070-optargs.t
+++ b/perl/t/070-optargs.t
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
use strict;
use warnings;
diff --git a/perl/t/400-events.t b/perl/t/400-events.t
index bea4a52..dd31966 100644
--- a/perl/t/400-events.t
+++ b/perl/t/400-events.t
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
use strict;
use warnings;
diff --git a/perl/t/500-lib-load.t b/perl/t/500-lib-load.t
index 7ce28c6..3b5b054 100644
--- a/perl/t/500-lib-load.t
+++ b/perl/t/500-lib-load.t
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
use strict;
use warnings;
diff --git a/perl/t/800-explicit-close.t b/perl/t/800-explicit-close.t
index 8185168..79fd9fb 100644
--- a/perl/t/800-explicit-close.t
+++ b/perl/t/800-explicit-close.t
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# Test implicit vs explicit closes of the handle (RHBZ#602592).
diff --git a/perl/t/810-mkdir-eexist.t b/perl/t/810-mkdir-eexist.t
index 86b4e0e..a059ee4 100644
--- a/perl/t/810-mkdir-eexist.t
+++ b/perl/t/810-mkdir-eexist.t
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# Test $g->last_errno (RHBZ#672491).
diff --git a/perl/t/900-introspection.t b/perl/t/900-introspection.t
index 6defc9b..c1fa6f8 100644
--- a/perl/t/900-introspection.t
+++ b/perl/t/900-introspection.t
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# Test %guestfs_introspection.
diff --git a/php/Makefile.am b/php/Makefile.am
index 6666f66..828960c 100644
--- a/php/Makefile.am
+++ b/php/Makefile.am
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
include $(top_srcdir)/subdir-rules.mk
diff --git a/php/Makefile.in b/php/Makefile.in
index 0b34939..97bdc75 100644
--- a/php/Makefile.in
+++ b/php/Makefile.in
@@ -30,7 +30,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# libguestfs
# Copyright (C) 2009 Red Hat Inc.
@@ -47,7 +47,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
diff --git a/php/extension/config.m4 b/php/extension/config.m4
index ee19971..00c06b4 100644
--- a/php/extension/config.m4
+++ b/php/extension/config.m4
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
PHP_ARG_ENABLE([guestfs_php], [enable libguestfs PHP bindings],
[ --enable-guestfs-php Enable libguestfs support])
diff --git a/php/run-php-tests.sh b/php/run-php-tests.sh
index 4905c2c..6615985 100755
--- a/php/run-php-tests.sh
+++ b/php/run-php-tests.sh
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
set -e
cd extension
diff --git a/po-docs/Makefile.am b/po-docs/Makefile.am
index 22b6635..f9af41b 100644
--- a/po-docs/Makefile.am
+++ b/po-docs/Makefile.am
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# XXX The use of po4a is naive here. Also we should integrate this
# into the po/ directory and the translations into the usual
diff --git a/po-docs/Makefile.in b/po-docs/Makefile.in
index 72b25ab..f6c8b15 100644
--- a/po-docs/Makefile.in
+++ b/po-docs/Makefile.in
@@ -30,7 +30,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# XXX The use of po4a is naive here. Also we should integrate this
# into the po/ directory and the translations into the usual
diff --git a/po-docs/ja.po b/po-docs/ja.po
index cf21916..9a702f2 100644
--- a/po-docs/ja.po
+++ b/po-docs/ja.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: libguestfs at redhat.com\n"
-"POT-Creation-Date: 2011-11-03 14:10+0000\n"
+"POT-Creation-Date: 2011-11-09 22:24+0000\n"
"PO-Revision-Date: 2011-10-27 09:15+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Japanese <trans-ja at lists.fedoraproject.org>\n"
@@ -1160,8 +1160,8 @@ msgstr ""
#: ../tools/virt-win-reg.pl:801
msgid ""
"You should have received a copy of the GNU General Public License along with "
-"this program; if not, write to the Free Software Foundation, Inc., 675 Mass "
-"Ave, Cambridge, MA 02139, USA."
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
msgstr ""
#. type: textblock
@@ -5850,7 +5850,7 @@ msgstr ""
#: ../fish/guestfish-actions.pod:39
#, no-wrap
msgid ""
-" add-domain dom [libvirturi:..] [readonly:..] [iface:..] [live:..] [allowuuid:..] [readonlydisk:..]\n"
+" add-domain dom [libvirturi:..] [readonly:true|false] [iface:..] [live:true|false] [allowuuid:true|false] [readonlydisk:..]\n"
"\n"
msgstr ""
@@ -6054,7 +6054,7 @@ msgstr ""
#: ../fish/guestfish-actions.pod:146
#, no-wrap
msgid ""
-" add-drive-opts filename [readonly:..] [format:..] [iface:..] [name:..]\n"
+" add-drive-opts filename [readonly:true|false] [format:..] [iface:..] [name:..]\n"
"\n"
msgstr ""
@@ -7047,7 +7047,7 @@ msgstr ""
#: ../fish/guestfish-actions.pod:603
#, no-wrap
msgid ""
-" btrfs-filesystem-resize mountpoint [size:..]\n"
+" btrfs-filesystem-resize mountpoint [size:N]\n"
"\n"
msgstr ""
@@ -7546,7 +7546,7 @@ msgstr ""
#: ../fish/guestfish-actions.pod:825
#, no-wrap
msgid ""
-" compress-device-out ctype device (zdevice|-) [level:..]\n"
+" compress-device-out ctype device (zdevice|-) [level:N]\n"
"\n"
msgstr ""
@@ -7573,7 +7573,7 @@ msgstr ""
#: ../fish/guestfish-actions.pod:839
#, no-wrap
msgid ""
-" compress-out ctype file (zfile|-) [level:..]\n"
+" compress-out ctype file (zfile|-) [level:N]\n"
"\n"
msgstr ""
@@ -7640,7 +7640,7 @@ msgstr ""
#: ../fish/guestfish-actions.pod:873
#, no-wrap
msgid ""
-" copy-device-to-device src dest [srcoffset:..] [destoffset:..] [size:..]\n"
+" copy-device-to-device src dest [srcoffset:N] [destoffset:N] [size:N]\n"
"\n"
msgstr ""
@@ -7684,7 +7684,7 @@ msgstr ""
#: ../fish/guestfish-actions.pod:898
#, no-wrap
msgid ""
-" copy-device-to-file src dest [srcoffset:..] [destoffset:..] [size:..]\n"
+" copy-device-to-file src dest [srcoffset:N] [destoffset:N] [size:N]\n"
"\n"
msgstr ""
@@ -7703,7 +7703,7 @@ msgstr ""
#: ../fish/guestfish-actions.pod:907
#, no-wrap
msgid ""
-" copy-file-to-device src dest [srcoffset:..] [destoffset:..] [size:..]\n"
+" copy-file-to-device src dest [srcoffset:N] [destoffset:N] [size:N]\n"
"\n"
msgstr ""
@@ -7716,7 +7716,7 @@ msgstr ""
#: ../fish/guestfish-actions.pod:916
#, no-wrap
msgid ""
-" copy-file-to-file src dest [srcoffset:..] [destoffset:..] [size:..]\n"
+" copy-file-to-file src dest [srcoffset:N] [destoffset:N] [size:N]\n"
"\n"
msgstr ""
@@ -10273,7 +10273,7 @@ msgstr ""
#: ../fish/guestfish-actions.pod:2109
#, no-wrap
msgid ""
-" inspect-get-icon root [favicon:..] [highquality:..]\n"
+" inspect-get-icon root [favicon:true|false] [highquality:true|false]\n"
"\n"
msgstr ""
@@ -12804,7 +12804,7 @@ msgstr ""
#: ../fish/guestfish-actions.pod:3290
#, no-wrap
msgid ""
-" mkfs-opts fstype device [blocksize:..] [features:..] [inode:..] [sectorsize:..]\n"
+" mkfs-opts fstype device [blocksize:N] [features:..] [inode:N] [sectorsize:N]\n"
"\n"
msgstr ""
@@ -13483,7 +13483,7 @@ msgstr ""
#: ../fish/guestfish-actions.pod:3601
#, no-wrap
msgid ""
-" ntfsresize-opts device [size:..] [force:..]\n"
+" ntfsresize-opts device [size:N] [force:true|false]\n"
"\n"
msgstr ""
diff --git a/po-docs/ja/Makefile.am b/po-docs/ja/Makefile.am
index 68e1643..d0d5c14 100644
--- a/po-docs/ja/Makefile.am
+++ b/po-docs/ja/Makefile.am
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# Note that each Makefile.am in po-docs/$lang/Makefile.am should be
# identical. If you create a new $lang.po, create the $lang/
diff --git a/po-docs/ja/Makefile.in b/po-docs/ja/Makefile.in
index 7e41a5d..a9eca73 100644
--- a/po-docs/ja/Makefile.in
+++ b/po-docs/ja/Makefile.in
@@ -30,7 +30,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# Note that each Makefile.am in po-docs/$lang/Makefile.am should be
# identical. If you create a new $lang.po, create the $lang/
diff --git a/po-docs/ja/guestfish-actions.pod b/po-docs/ja/guestfish-actions.pod
index 3039bfa..0092cd4 100644
--- a/po-docs/ja/guestfish-actions.pod
+++ b/po-docs/ja/guestfish-actions.pod
@@ -38,7 +38,7 @@ these functions.
=head2 domain
- add-domain dom [libvirturi:..] [readonly:..] [iface:..] [live:..] [allowuuid:..] [readonlydisk:..]
+ add-domain dom [libvirturi:..] [readonly:true|false] [iface:..] [live:true|false] [allowuuid:true|false] [readonlydisk:..]
This function adds the disk(s) attached to the named libvirt domain C<dom>.
It works by connecting to libvirt, requesting the domain and domain XML from
@@ -140,7 +140,7 @@ L</add-drive-opts>, and specifying the format.
=head2 add
- add-drive-opts filename [readonly:..] [format:..] [iface:..] [name:..]
+ add-drive-opts filename [readonly:true|false] [format:..] [iface:..] [name:..]
This function adds a virtual machine disk image C<filename> to libguestfs.
The first time you call this function, the disk appears as C</dev/sda>, the
@@ -571,7 +571,7 @@ This uses the L<blockdev(8)> command.
=head2 btrfs-filesystem-resize
- btrfs-filesystem-resize mountpoint [size:..]
+ btrfs-filesystem-resize mountpoint [size:N]
This command resizes a btrfs filesystem.
@@ -779,7 +779,7 @@ between 2MB and 4MB. See L<guestfs(3)/PROTOCOL LIMITS>.
=head2 compress-device-out
- compress-device-out ctype device (zdevice|-) [level:..]
+ compress-device-out ctype device (zdevice|-) [level:N]
This command compresses C<device> and writes it out to the local file
C<zdevice>.
@@ -794,7 +794,7 @@ ARGUMENTS>.
=head2 compress-out
- compress-out ctype file (zfile|-) [level:..]
+ compress-out ctype file (zfile|-) [level:N]
This command compresses C<file> and writes it out to the local file
C<zfile>.
@@ -827,7 +827,7 @@ C<value> can be NULL.
=head2 copy-device-to-device
- copy-device-to-device src dest [srcoffset:..] [destoffset:..] [size:..]
+ copy-device-to-device src dest [srcoffset:N] [destoffset:N] [size:N]
The four calls L</copy-device-to-device>, L</copy-device-to-file>,
L</copy-file-to-device>, and L</copy-file-to-file> let you copy from a
@@ -849,7 +849,7 @@ ARGUMENTS>.
=head2 copy-device-to-file
- copy-device-to-file src dest [srcoffset:..] [destoffset:..] [size:..]
+ copy-device-to-file src dest [srcoffset:N] [destoffset:N] [size:N]
See L</copy-device-to-device> for a general overview of this call.
@@ -858,7 +858,7 @@ ARGUMENTS>.
=head2 copy-file-to-device
- copy-file-to-device src dest [srcoffset:..] [destoffset:..] [size:..]
+ copy-file-to-device src dest [srcoffset:N] [destoffset:N] [size:N]
See L</copy-device-to-device> for a general overview of this call.
@@ -867,7 +867,7 @@ ARGUMENTS>.
=head2 copy-file-to-file
- copy-file-to-file src dest [srcoffset:..] [destoffset:..] [size:..]
+ copy-file-to-file src dest [srcoffset:N] [destoffset:N] [size:N]
See L</copy-device-to-device> for a general overview of this call.
@@ -1999,7 +1999,7 @@ Please read L<guestfs(3)/INSPECTION> for more details.
=head2 inspect-get-icon
- inspect-get-icon root [favicon:..] [highquality:..]
+ inspect-get-icon root [favicon:true|false] [highquality:true|false]
This function returns an icon corresponding to the inspected operating
system. The icon is returned as a buffer containing a PNG image (re-encoded
@@ -3111,7 +3111,7 @@ these functions.
=head2 mkfs-opts
- mkfs-opts fstype device [blocksize:..] [features:..] [inode:..] [sectorsize:..]
+ mkfs-opts fstype device [blocksize:N] [features:..] [inode:N] [sectorsize:N]
This function creates a filesystem on C<device>. The filesystem type is
C<fstype>, for example C<ext3>.
@@ -3410,7 +3410,7 @@ these functions.
=head2 ntfsresize-opts
- ntfsresize-opts device [size:..] [force:..]
+ ntfsresize-opts device [size:N] [force:true|false]
This command resizes an NTFS filesystem, expanding or shrinking it to the
size of the underlying device.
diff --git a/po-docs/ja/guestfish.1 b/po-docs/ja/guestfish.1
index dc33c71..a46825d 100644
--- a/po-docs/ja/guestfish.1
+++ b/po-docs/ja/guestfish.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "guestfish 1"
-.TH guestfish 1 "2011-11-03" "libguestfs-1.15.2" "Virtualization Support"
+.TH guestfish 1 "2011-11-09" "libguestfs-1.15.3" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -1465,7 +1465,7 @@ these functions.
.SS "domain"
.IX Subsection "domain"
.Vb 1
-\& add\-domain dom [libvirturi:..] [readonly:..] [iface:..] [live:..] [allowuuid:..] [readonlydisk:..]
+\& add\-domain dom [libvirturi:..] [readonly:true|false] [iface:..] [live:true|false] [allowuuid:true|false] [readonlydisk:..]
.Ve
.PP
This function adds the disk(s) attached to the named libvirt domain \f(CW\*(C`dom\*(C'\fR.
@@ -1565,7 +1565,7 @@ you should think about replacing calls to this function with calls to
.SS "add"
.IX Subsection "add"
.Vb 1
-\& add\-drive\-opts filename [readonly:..] [format:..] [iface:..] [name:..]
+\& add\-drive\-opts filename [readonly:true|false] [format:..] [iface:..] [name:..]
.Ve
.PP
This function adds a virtual machine disk image \f(CW\*(C`filename\*(C'\fR to libguestfs.
@@ -2008,7 +2008,7 @@ This uses the \fIblockdev\fR\|(8) command.
.SS "btrfs-filesystem-resize"
.IX Subsection "btrfs-filesystem-resize"
.Vb 1
-\& btrfs\-filesystem\-resize mountpoint [size:..]
+\& btrfs\-filesystem\-resize mountpoint [size:N]
.Ve
.PP
This command resizes a btrfs filesystem.
@@ -2218,7 +2218,7 @@ between 2MB and 4MB. See \*(L"\s-1PROTOCOL\s0 \s-1LIMITS\s0\*(R" in \fIguestfs\
.SS "compress-device-out"
.IX Subsection "compress-device-out"
.Vb 1
-\& compress\-device\-out ctype device (zdevice|\-) [level:..]
+\& compress\-device\-out ctype device (zdevice|\-) [level:N]
.Ve
.PP
This command compresses \f(CW\*(C`device\*(C'\fR and writes it out to the local file
@@ -2234,7 +2234,7 @@ This command has one or more optional arguments. See \*(L"\s-1OPTIONAL\s0
.SS "compress-out"
.IX Subsection "compress-out"
.Vb 1
-\& compress\-out ctype file (zfile|\-) [level:..]
+\& compress\-out ctype file (zfile|\-) [level:N]
.Ve
.PP
This command compresses \f(CW\*(C`file\*(C'\fR and writes it out to the local file
@@ -2269,7 +2269,7 @@ The first character of \f(CW\*(C`param\*(C'\fR string must be a \f(CW\*(C`\-\*(C
.SS "copy-device-to-device"
.IX Subsection "copy-device-to-device"
.Vb 1
-\& copy\-device\-to\-device src dest [srcoffset:..] [destoffset:..] [size:..]
+\& copy\-device\-to\-device src dest [srcoffset:N] [destoffset:N] [size:N]
.Ve
.PP
The four calls \*(L"copy-device-to-device\*(R", \*(L"copy-device-to-file\*(R",
@@ -2292,7 +2292,7 @@ This command has one or more optional arguments. See \*(L"\s-1OPTIONAL\s0
.SS "copy-device-to-file"
.IX Subsection "copy-device-to-file"
.Vb 1
-\& copy\-device\-to\-file src dest [srcoffset:..] [destoffset:..] [size:..]
+\& copy\-device\-to\-file src dest [srcoffset:N] [destoffset:N] [size:N]
.Ve
.PP
See \*(L"copy-device-to-device\*(R" for a general overview of this call.
@@ -2302,7 +2302,7 @@ This command has one or more optional arguments. See \*(L"\s-1OPTIONAL\s0
.SS "copy-file-to-device"
.IX Subsection "copy-file-to-device"
.Vb 1
-\& copy\-file\-to\-device src dest [srcoffset:..] [destoffset:..] [size:..]
+\& copy\-file\-to\-device src dest [srcoffset:N] [destoffset:N] [size:N]
.Ve
.PP
See \*(L"copy-device-to-device\*(R" for a general overview of this call.
@@ -2312,7 +2312,7 @@ This command has one or more optional arguments. See \*(L"\s-1OPTIONAL\s0
.SS "copy-file-to-file"
.IX Subsection "copy-file-to-file"
.Vb 1
-\& copy\-file\-to\-file src dest [srcoffset:..] [destoffset:..] [size:..]
+\& copy\-file\-to\-file src dest [srcoffset:N] [destoffset:N] [size:N]
.Ve
.PP
See \*(L"copy-device-to-device\*(R" for a general overview of this call.
@@ -3457,7 +3457,7 @@ Please read \*(L"\s-1INSPECTION\s0\*(R" in \fIguestfs\fR\|(3) for more details.
.SS "inspect-get-icon"
.IX Subsection "inspect-get-icon"
.Vb 1
-\& inspect\-get\-icon root [favicon:..] [highquality:..]
+\& inspect\-get\-icon root [favicon:true|false] [highquality:true|false]
.Ve
.PP
This function returns an icon corresponding to the inspected operating
@@ -4637,7 +4637,7 @@ these functions.
.SS "mkfs-opts"
.IX Subsection "mkfs-opts"
.Vb 1
-\& mkfs\-opts fstype device [blocksize:..] [features:..] [inode:..] [sectorsize:..]
+\& mkfs\-opts fstype device [blocksize:N] [features:..] [inode:N] [sectorsize:N]
.Ve
.PP
This function creates a filesystem on \f(CW\*(C`device\*(C'\fR. The filesystem type is
@@ -4955,7 +4955,7 @@ these functions.
.SS "ntfsresize-opts"
.IX Subsection "ntfsresize-opts"
.Vb 1
-\& ntfsresize\-opts device [size:..] [force:..]
+\& ntfsresize\-opts device [size:N] [force:true|false]
.Ve
.PP
This command resizes an \s-1NTFS\s0 filesystem, expanding or shrinking it to the
@@ -6923,5 +6923,5 @@ This program is distributed in the hope that it will be useful, but \s-1WITHOUT\
more details.
.PP
You should have received a copy of the \s-1GNU\s0 General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, \s-1MA\s0 02139, \s-1USA\s0.
+this program; if not, write to the Free Software Foundation, Inc., 51
+Franklin Street, Fifth Floor, Boston, \s-1MA\s0 02110\-1301 \s-1USA\s0.
diff --git a/po-docs/ja/guestfish.pod b/po-docs/ja/guestfish.pod
index 1254e0c..d53dfcb 100644
--- a/po-docs/ja/guestfish.pod
+++ b/po-docs/ja/guestfish.pod
@@ -1264,6 +1264,6 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
+this program; if not, write to the Free Software Foundation, Inc., 51
+Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/po-docs/ja/guestfs.3 b/po-docs/ja/guestfs.3
index 5236773..99781c2 100644
--- a/po-docs/ja/guestfs.3
+++ b/po-docs/ja/guestfs.3
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "guestfs 3"
-.TH guestfs 3 "2011-11-03" "libguestfs-1.15.2" "Virtualization Support"
+.TH guestfs 3 "2011-11-09" "libguestfs-1.15.3" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/ja/guestmount.1 b/po-docs/ja/guestmount.1
index b47efc6..e49a819 100644
--- a/po-docs/ja/guestmount.1
+++ b/po-docs/ja/guestmount.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "guestmount 1"
-.TH guestmount 1 "2011-11-03" "libguestfs-1.15.2" "Virtualization Support"
+.TH guestmount 1 "2011-11-09" "libguestfs-1.15.3" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -409,5 +409,5 @@ This program is distributed in the hope that it will be useful, but \s-1WITHOUT\
more details.
.PP
You should have received a copy of the \s-1GNU\s0 General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, \s-1MA\s0 02139, \s-1USA\s0.
+this program; if not, write to the Free Software Foundation, Inc., 51
+Franklin Street, Fifth Floor, Boston, \s-1MA\s0 02110\-1301 \s-1USA\s0.
diff --git a/po-docs/ja/guestmount.pod b/po-docs/ja/guestmount.pod
index c7b2742..a8d2246 100644
--- a/po-docs/ja/guestmount.pod
+++ b/po-docs/ja/guestmount.pod
@@ -334,6 +334,6 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
+this program; if not, write to the Free Software Foundation, Inc., 51
+Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/po-docs/ja/libguestfs-test-tool.1 b/po-docs/ja/libguestfs-test-tool.1
index e42e6c9..3703a93 100644
--- a/po-docs/ja/libguestfs-test-tool.1
+++ b/po-docs/ja/libguestfs-test-tool.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "libguestfs-test-tool 1"
-.TH libguestfs-test-tool 1 "2011-11-03" "libguestfs-1.15.2" "Virtualization Support"
+.TH libguestfs-test-tool 1 "2011-11-09" "libguestfs-1.15.3" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -177,5 +177,5 @@ This program is distributed in the hope that it will be useful, but \s-1WITHOUT\
more details.
.PP
You should have received a copy of the \s-1GNU\s0 General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, \s-1MA\s0 02139, \s-1USA\s0.
+this program; if not, write to the Free Software Foundation, Inc., 51
+Franklin Street, Fifth Floor, Boston, \s-1MA\s0 02110\-1301 \s-1USA\s0.
diff --git a/po-docs/ja/libguestfs-test-tool.pod b/po-docs/ja/libguestfs-test-tool.pod
index 8688f1f..6a0a863 100644
--- a/po-docs/ja/libguestfs-test-tool.pod
+++ b/po-docs/ja/libguestfs-test-tool.pod
@@ -120,6 +120,6 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
+this program; if not, write to the Free Software Foundation, Inc., 51
+Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/po-docs/ja/virt-alignment-scan.1 b/po-docs/ja/virt-alignment-scan.1
index 12e3c87..fe740d5 100644
--- a/po-docs/ja/virt-alignment-scan.1
+++ b/po-docs/ja/virt-alignment-scan.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-alignment-scan 1"
-.TH virt-alignment-scan 1 "2011-11-03" "libguestfs-1.15.2" "Virtualization Support"
+.TH virt-alignment-scan 1 "2011-11-09" "libguestfs-1.15.3" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -419,5 +419,5 @@ This program is distributed in the hope that it will be useful, but \s-1WITHOUT\
more details.
.PP
You should have received a copy of the \s-1GNU\s0 General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, \s-1MA\s0 02139, \s-1USA\s0.
+this program; if not, write to the Free Software Foundation, Inc., 51
+Franklin Street, Fifth Floor, Boston, \s-1MA\s0 02110\-1301 \s-1USA\s0.
diff --git a/po-docs/ja/virt-alignment-scan.pod b/po-docs/ja/virt-alignment-scan.pod
index 3f10878..3c92f59 100644
--- a/po-docs/ja/virt-alignment-scan.pod
+++ b/po-docs/ja/virt-alignment-scan.pod
@@ -370,6 +370,6 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
+this program; if not, write to the Free Software Foundation, Inc., 51
+Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/po-docs/ja/virt-cat.1 b/po-docs/ja/virt-cat.1
index b96131d..4fbc1f8 100644
--- a/po-docs/ja/virt-cat.1
+++ b/po-docs/ja/virt-cat.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-cat 1"
-.TH virt-cat 1 "2011-11-03" "libguestfs-1.15.2" "Virtualization Support"
+.TH virt-cat 1 "2011-11-09" "libguestfs-1.15.3" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -324,5 +324,5 @@ This program is distributed in the hope that it will be useful, but \s-1WITHOUT\
more details.
.PP
You should have received a copy of the \s-1GNU\s0 General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, \s-1MA\s0 02139, \s-1USA\s0.
+this program; if not, write to the Free Software Foundation, Inc., 51
+Franklin Street, Fifth Floor, Boston, \s-1MA\s0 02110\-1301 \s-1USA\s0.
diff --git a/po-docs/ja/virt-cat.pod b/po-docs/ja/virt-cat.pod
index b2ae7b6..cbb9b0e 100644
--- a/po-docs/ja/virt-cat.pod
+++ b/po-docs/ja/virt-cat.pod
@@ -260,6 +260,6 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
+this program; if not, write to the Free Software Foundation, Inc., 51
+Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/po-docs/ja/virt-copy-in.1 b/po-docs/ja/virt-copy-in.1
index e681568..cf5369e 100644
--- a/po-docs/ja/virt-copy-in.1
+++ b/po-docs/ja/virt-copy-in.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-copy-in 1"
-.TH virt-copy-in 1 "2011-11-03" "libguestfs-1.15.2" "Virtualization Support"
+.TH virt-copy-in 1 "2011-11-09" "libguestfs-1.15.3" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -135,5 +135,5 @@ This program is distributed in the hope that it will be useful, but \s-1WITHOUT\
more details.
.PP
You should have received a copy of the \s-1GNU\s0 General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, \s-1MA\s0 02139, \s-1USA\s0.
+this program; if not, write to the Free Software Foundation, Inc., 51
+Franklin Street, Fifth Floor, Boston, \s-1MA\s0 02110\-1301 \s-1USA\s0.
diff --git a/po-docs/ja/virt-copy-in.pod b/po-docs/ja/virt-copy-in.pod
index e4b4b0a..6a90afc 100644
--- a/po-docs/ja/virt-copy-in.pod
+++ b/po-docs/ja/virt-copy-in.pod
@@ -71,6 +71,6 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
+this program; if not, write to the Free Software Foundation, Inc., 51
+Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/po-docs/ja/virt-copy-out.1 b/po-docs/ja/virt-copy-out.1
index 6d635cb..57e58a8 100644
--- a/po-docs/ja/virt-copy-out.1
+++ b/po-docs/ja/virt-copy-out.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-copy-out 1"
-.TH virt-copy-out 1 "2011-11-03" "libguestfs-1.15.2" "Virtualization Support"
+.TH virt-copy-out 1 "2011-11-09" "libguestfs-1.15.3" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -124,5 +124,5 @@ This program is distributed in the hope that it will be useful, but \s-1WITHOUT\
more details.
.PP
You should have received a copy of the \s-1GNU\s0 General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, \s-1MA\s0 02139, \s-1USA\s0.
+this program; if not, write to the Free Software Foundation, Inc., 51
+Franklin Street, Fifth Floor, Boston, \s-1MA\s0 02110\-1301 \s-1USA\s0.
diff --git a/po-docs/ja/virt-copy-out.pod b/po-docs/ja/virt-copy-out.pod
index 768ef24..16591cb 100644
--- a/po-docs/ja/virt-copy-out.pod
+++ b/po-docs/ja/virt-copy-out.pod
@@ -61,6 +61,6 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
+this program; if not, write to the Free Software Foundation, Inc., 51
+Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/po-docs/ja/virt-df.1 b/po-docs/ja/virt-df.1
index 693afc5..5549aa8 100644
--- a/po-docs/ja/virt-df.1
+++ b/po-docs/ja/virt-df.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-df 1"
-.TH virt-df 1 "2011-11-03" "libguestfs-1.15.2" "Virtualization Support"
+.TH virt-df 1 "2011-11-09" "libguestfs-1.15.3" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -314,5 +314,5 @@ This program is distributed in the hope that it will be useful, but \s-1WITHOUT\
more details.
.PP
You should have received a copy of the \s-1GNU\s0 General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, \s-1MA\s0 02139, \s-1USA\s0.
+this program; if not, write to the Free Software Foundation, Inc., 51
+Franklin Street, Fifth Floor, Boston, \s-1MA\s0 02110\-1301 \s-1USA\s0.
diff --git a/po-docs/ja/virt-df.pod b/po-docs/ja/virt-df.pod
index 0b70e2b..a03fa85 100644
--- a/po-docs/ja/virt-df.pod
+++ b/po-docs/ja/virt-df.pod
@@ -245,6 +245,6 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
+this program; if not, write to the Free Software Foundation, Inc., 51
+Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/po-docs/ja/virt-edit.1 b/po-docs/ja/virt-edit.1
index 3ee2c37..4658f65 100644
--- a/po-docs/ja/virt-edit.1
+++ b/po-docs/ja/virt-edit.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-edit 1"
-.TH virt-edit 1 "2011-11-03" "libguestfs-1.15.2" "Virtualization Support"
+.TH virt-edit 1 "2011-11-09" "libguestfs-1.15.3" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -437,5 +437,5 @@ This program is distributed in the hope that it will be useful, but \s-1WITHOUT\
more details.
.PP
You should have received a copy of the \s-1GNU\s0 General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, \s-1MA\s0 02139, \s-1USA\s0.
+this program; if not, write to the Free Software Foundation, Inc., 51
+Franklin Street, Fifth Floor, Boston, \s-1MA\s0 02110\-1301 \s-1USA\s0.
diff --git a/po-docs/ja/virt-edit.pod b/po-docs/ja/virt-edit.pod
index 019e304..2a984f9 100644
--- a/po-docs/ja/virt-edit.pod
+++ b/po-docs/ja/virt-edit.pod
@@ -369,6 +369,6 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
+this program; if not, write to the Free Software Foundation, Inc., 51
+Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/po-docs/ja/virt-filesystems.1 b/po-docs/ja/virt-filesystems.1
index d7306fa..9b1fb76 100644
--- a/po-docs/ja/virt-filesystems.1
+++ b/po-docs/ja/virt-filesystems.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-filesystems 1"
-.TH virt-filesystems 1 "2011-11-03" "libguestfs-1.15.2" "Virtualization Support"
+.TH virt-filesystems 1 "2011-11-09" "libguestfs-1.15.3" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -471,5 +471,5 @@ This program is distributed in the hope that it will be useful, but \s-1WITHOUT\
more details.
.PP
You should have received a copy of the \s-1GNU\s0 General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, \s-1MA\s0 02139, \s-1USA\s0.
+this program; if not, write to the Free Software Foundation, Inc., 51
+Franklin Street, Fifth Floor, Boston, \s-1MA\s0 02110\-1301 \s-1USA\s0.
diff --git a/po-docs/ja/virt-filesystems.pod b/po-docs/ja/virt-filesystems.pod
index 02e4652..1dd6bf1 100644
--- a/po-docs/ja/virt-filesystems.pod
+++ b/po-docs/ja/virt-filesystems.pod
@@ -402,6 +402,6 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
+this program; if not, write to the Free Software Foundation, Inc., 51
+Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/po-docs/ja/virt-inspector.1 b/po-docs/ja/virt-inspector.1
index b45b8fd..b896111 100644
--- a/po-docs/ja/virt-inspector.1
+++ b/po-docs/ja/virt-inspector.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-inspector 1"
-.TH virt-inspector 1 "2011-11-03" "libguestfs-1.15.2" "Virtualization Support"
+.TH virt-inspector 1 "2011-11-09" "libguestfs-1.15.3" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -479,5 +479,5 @@ This program is distributed in the hope that it will be useful, but \s-1WITHOUT\
more details.
.PP
You should have received a copy of the \s-1GNU\s0 General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, \s-1MA\s0 02139, \s-1USA\s0.
+this program; if not, write to the Free Software Foundation, Inc., 51
+Franklin Street, Fifth Floor, Boston, \s-1MA\s0 02110\-1301 \s-1USA\s0.
diff --git a/po-docs/ja/virt-inspector.pod b/po-docs/ja/virt-inspector.pod
index c01a453..8921807 100644
--- a/po-docs/ja/virt-inspector.pod
+++ b/po-docs/ja/virt-inspector.pod
@@ -412,6 +412,6 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
+this program; if not, write to the Free Software Foundation, Inc., 51
+Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/po-docs/ja/virt-list-filesystems.1 b/po-docs/ja/virt-list-filesystems.1
index 456cbe8..9172260 100644
--- a/po-docs/ja/virt-list-filesystems.1
+++ b/po-docs/ja/virt-list-filesystems.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-list-filesystems.pl 1"
-.TH virt-list-filesystems.pl 1 "2011-11-03" "libguestfs-1.15.2" "Virtualization Support"
+.TH virt-list-filesystems.pl 1 "2011-11-09" "libguestfs-1.15.3" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -163,5 +163,5 @@ This program is distributed in the hope that it will be useful, but \s-1WITHOUT\
more details.
.PP
You should have received a copy of the \s-1GNU\s0 General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, \s-1MA\s0 02139, \s-1USA\s0.
+this program; if not, write to the Free Software Foundation, Inc., 51
+Franklin Street, Fifth Floor, Boston, \s-1MA\s0 02110\-1301 \s-1USA\s0.
diff --git a/po-docs/ja/virt-list-filesystems.pl b/po-docs/ja/virt-list-filesystems.pl
index b9a5c9e..1f5a18d 100644
--- a/po-docs/ja/virt-list-filesystems.pl
+++ b/po-docs/ja/virt-list-filesystems.pl
@@ -104,6 +104,6 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
+this program; if not, write to the Free Software Foundation, Inc., 51
+Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/po-docs/ja/virt-list-partitions.1 b/po-docs/ja/virt-list-partitions.1
index 420e8b7..ee3870c 100644
--- a/po-docs/ja/virt-list-partitions.1
+++ b/po-docs/ja/virt-list-partitions.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-list-partitions.pl 1"
-.TH virt-list-partitions.pl 1 "2011-11-03" "libguestfs-1.15.2" "Virtualization Support"
+.TH virt-list-partitions.pl 1 "2011-11-09" "libguestfs-1.15.3" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -170,5 +170,5 @@ This program is distributed in the hope that it will be useful, but \s-1WITHOUT\
more details.
.PP
You should have received a copy of the \s-1GNU\s0 General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, \s-1MA\s0 02139, \s-1USA\s0.
+this program; if not, write to the Free Software Foundation, Inc., 51
+Franklin Street, Fifth Floor, Boston, \s-1MA\s0 02110\-1301 \s-1USA\s0.
diff --git a/po-docs/ja/virt-list-partitions.pl b/po-docs/ja/virt-list-partitions.pl
index 289182d..b645737 100644
--- a/po-docs/ja/virt-list-partitions.pl
+++ b/po-docs/ja/virt-list-partitions.pl
@@ -110,6 +110,6 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
+this program; if not, write to the Free Software Foundation, Inc., 51
+Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/po-docs/ja/virt-ls.1 b/po-docs/ja/virt-ls.1
index eaca4d6..1aceddf 100644
--- a/po-docs/ja/virt-ls.1
+++ b/po-docs/ja/virt-ls.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-ls 1"
-.TH virt-ls 1 "2011-11-03" "libguestfs-1.15.2" "Virtualization Support"
+.TH virt-ls 1 "2011-11-09" "libguestfs-1.15.3" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -566,5 +566,5 @@ This program is distributed in the hope that it will be useful, but \s-1WITHOUT\
more details.
.PP
You should have received a copy of the \s-1GNU\s0 General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, \s-1MA\s0 02139, \s-1USA\s0.
+this program; if not, write to the Free Software Foundation, Inc., 51
+Franklin Street, Fifth Floor, Boston, \s-1MA\s0 02110\-1301 \s-1USA\s0.
diff --git a/po-docs/ja/virt-ls.pod b/po-docs/ja/virt-ls.pod
index 2e406c7..ae84dbf 100644
--- a/po-docs/ja/virt-ls.pod
+++ b/po-docs/ja/virt-ls.pod
@@ -507,6 +507,6 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
+this program; if not, write to the Free Software Foundation, Inc., 51
+Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/po-docs/ja/virt-make-fs.1 b/po-docs/ja/virt-make-fs.1
index 25ab823..de377e0 100644
--- a/po-docs/ja/virt-make-fs.1
+++ b/po-docs/ja/virt-make-fs.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-make-fs.pl 1"
-.TH virt-make-fs.pl 1 "2011-11-03" "libguestfs-1.15.2" "Virtualization Support"
+.TH virt-make-fs.pl 1 "2011-11-09" "libguestfs-1.15.3" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -316,5 +316,5 @@ This program is distributed in the hope that it will be useful, but \s-1WITHOUT\
more details.
.PP
You should have received a copy of the \s-1GNU\s0 General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, \s-1MA\s0 02139, \s-1USA\s0.
+this program; if not, write to the Free Software Foundation, Inc., 51
+Franklin Street, Fifth Floor, Boston, \s-1MA\s0 02110\-1301 \s-1USA\s0.
diff --git a/po-docs/ja/virt-make-fs.pl b/po-docs/ja/virt-make-fs.pl
index da063e1..e63fb85 100644
--- a/po-docs/ja/virt-make-fs.pl
+++ b/po-docs/ja/virt-make-fs.pl
@@ -248,6 +248,6 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
+this program; if not, write to the Free Software Foundation, Inc., 51
+Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/po-docs/ja/virt-rescue.1 b/po-docs/ja/virt-rescue.1
index cef206a..5d39a9c 100644
--- a/po-docs/ja/virt-rescue.1
+++ b/po-docs/ja/virt-rescue.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-rescue 1"
-.TH virt-rescue 1 "2011-11-03" "libguestfs-1.15.2" "Virtualization Support"
+.TH virt-rescue 1 "2011-11-09" "libguestfs-1.15.3" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -410,5 +410,5 @@ This program is distributed in the hope that it will be useful, but \s-1WITHOUT\
more details.
.PP
You should have received a copy of the \s-1GNU\s0 General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, \s-1MA\s0 02139, \s-1USA\s0.
+this program; if not, write to the Free Software Foundation, Inc., 51
+Franklin Street, Fifth Floor, Boston, \s-1MA\s0 02110\-1301 \s-1USA\s0.
diff --git a/po-docs/ja/virt-rescue.pod b/po-docs/ja/virt-rescue.pod
index 76bcd02..2383d63 100644
--- a/po-docs/ja/virt-rescue.pod
+++ b/po-docs/ja/virt-rescue.pod
@@ -343,6 +343,6 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
+this program; if not, write to the Free Software Foundation, Inc., 51
+Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/po-docs/ja/virt-resize.1 b/po-docs/ja/virt-resize.1
index eefb543..2ab8f63 100644
--- a/po-docs/ja/virt-resize.1
+++ b/po-docs/ja/virt-resize.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-resize 1"
-.TH virt-resize 1 "2011-11-03" "libguestfs-1.15.2" "Virtualization Support"
+.TH virt-resize 1 "2011-11-09" "libguestfs-1.15.3" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -735,5 +735,5 @@ This program is distributed in the hope that it will be useful, but \s-1WITHOUT\
more details.
.PP
You should have received a copy of the \s-1GNU\s0 General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, \s-1MA\s0 02139, \s-1USA\s0.
+this program; if not, write to the Free Software Foundation, Inc., 51
+Franklin Street, Fifth Floor, Boston, \s-1MA\s0 02110\-1301 \s-1USA\s0.
diff --git a/po-docs/ja/virt-resize.pod b/po-docs/ja/virt-resize.pod
index f47fdae..0d49430 100644
--- a/po-docs/ja/virt-resize.pod
+++ b/po-docs/ja/virt-resize.pod
@@ -695,6 +695,6 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
+this program; if not, write to the Free Software Foundation, Inc., 51
+Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/po-docs/ja/virt-sparsify.1 b/po-docs/ja/virt-sparsify.1
index f90e9b4..4c9f552 100644
--- a/po-docs/ja/virt-sparsify.1
+++ b/po-docs/ja/virt-sparsify.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-sparsify 1"
-.TH virt-sparsify 1 "2011-11-03" "libguestfs-1.15.2" "Virtualization Support"
+.TH virt-sparsify 1 "2011-11-09" "libguestfs-1.15.3" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -303,5 +303,5 @@ This program is distributed in the hope that it will be useful, but \s-1WITHOUT\
more details.
.PP
You should have received a copy of the \s-1GNU\s0 General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, \s-1MA\s0 02139, \s-1USA\s0.
+this program; if not, write to the Free Software Foundation, Inc., 51
+Franklin Street, Fifth Floor, Boston, \s-1MA\s0 02110\-1301 \s-1USA\s0.
diff --git a/po-docs/ja/virt-sparsify.pod b/po-docs/ja/virt-sparsify.pod
index 1314523..c5a6954 100644
--- a/po-docs/ja/virt-sparsify.pod
+++ b/po-docs/ja/virt-sparsify.pod
@@ -266,6 +266,6 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
+this program; if not, write to the Free Software Foundation, Inc., 51
+Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/po-docs/ja/virt-sysprep.1 b/po-docs/ja/virt-sysprep.1
index 61b944d..bf9220d 100644
--- a/po-docs/ja/virt-sysprep.1
+++ b/po-docs/ja/virt-sysprep.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-sysprep 1"
-.TH virt-sysprep 1 "2011-11-03" "libguestfs-1.15.2" "Virtualization Support"
+.TH virt-sysprep 1 "2011-11-09" "libguestfs-1.15.3" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -528,5 +528,5 @@ This program is distributed in the hope that it will be useful, but \s-1WITHOUT\
more details.
.PP
You should have received a copy of the \s-1GNU\s0 General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, \s-1MA\s0 02139, \s-1USA\s0.
+this program; if not, write to the Free Software Foundation, Inc., 51
+Franklin Street, Fifth Floor, Boston, \s-1MA\s0 02110\-1301 \s-1USA\s0.
diff --git a/po-docs/ja/virt-sysprep.pod b/po-docs/ja/virt-sysprep.pod
index 99d2fc5..465f0be 100644
--- a/po-docs/ja/virt-sysprep.pod
+++ b/po-docs/ja/virt-sysprep.pod
@@ -501,6 +501,6 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
+this program; if not, write to the Free Software Foundation, Inc., 51
+Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/po-docs/ja/virt-tar-in.1 b/po-docs/ja/virt-tar-in.1
index d0f01f9..da6156e 100644
--- a/po-docs/ja/virt-tar-in.1
+++ b/po-docs/ja/virt-tar-in.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-tar-in 1"
-.TH virt-tar-in 1 "2011-11-03" "libguestfs-1.15.2" "Virtualization Support"
+.TH virt-tar-in 1 "2011-11-09" "libguestfs-1.15.3" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -131,5 +131,5 @@ This program is distributed in the hope that it will be useful, but \s-1WITHOUT\
more details.
.PP
You should have received a copy of the \s-1GNU\s0 General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, \s-1MA\s0 02139, \s-1USA\s0.
+this program; if not, write to the Free Software Foundation, Inc., 51
+Franklin Street, Fifth Floor, Boston, \s-1MA\s0 02110\-1301 \s-1USA\s0.
diff --git a/po-docs/ja/virt-tar-in.pod b/po-docs/ja/virt-tar-in.pod
index 4a3d10e..91505c2 100644
--- a/po-docs/ja/virt-tar-in.pod
+++ b/po-docs/ja/virt-tar-in.pod
@@ -69,6 +69,6 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
+this program; if not, write to the Free Software Foundation, Inc., 51
+Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/po-docs/ja/virt-tar-out.1 b/po-docs/ja/virt-tar-out.1
index 9524095..e74565b 100644
--- a/po-docs/ja/virt-tar-out.1
+++ b/po-docs/ja/virt-tar-out.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-tar-out 1"
-.TH virt-tar-out 1 "2011-11-03" "libguestfs-1.15.2" "Virtualization Support"
+.TH virt-tar-out 1 "2011-11-09" "libguestfs-1.15.3" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -124,5 +124,5 @@ This program is distributed in the hope that it will be useful, but \s-1WITHOUT\
more details.
.PP
You should have received a copy of the \s-1GNU\s0 General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, \s-1MA\s0 02139, \s-1USA\s0.
+this program; if not, write to the Free Software Foundation, Inc., 51
+Franklin Street, Fifth Floor, Boston, \s-1MA\s0 02110\-1301 \s-1USA\s0.
diff --git a/po-docs/ja/virt-tar-out.pod b/po-docs/ja/virt-tar-out.pod
index efb0fb2..c479570 100644
--- a/po-docs/ja/virt-tar-out.pod
+++ b/po-docs/ja/virt-tar-out.pod
@@ -61,6 +61,6 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
+this program; if not, write to the Free Software Foundation, Inc., 51
+Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/po-docs/ja/virt-tar.1 b/po-docs/ja/virt-tar.1
index 0ce404c..bdb4d98 100644
--- a/po-docs/ja/virt-tar.1
+++ b/po-docs/ja/virt-tar.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-tar.pl 1"
-.TH virt-tar.pl 1 "2011-11-03" "libguestfs-1.15.2" "Virtualization Support"
+.TH virt-tar.pl 1 "2011-11-09" "libguestfs-1.15.3" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -223,5 +223,5 @@ This program is distributed in the hope that it will be useful, but \s-1WITHOUT\
more details.
.PP
You should have received a copy of the \s-1GNU\s0 General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, \s-1MA\s0 02139, \s-1USA\s0.
+this program; if not, write to the Free Software Foundation, Inc., 51
+Franklin Street, Fifth Floor, Boston, \s-1MA\s0 02110\-1301 \s-1USA\s0.
diff --git a/po-docs/ja/virt-tar.pl b/po-docs/ja/virt-tar.pl
index b125723..7dd583a 100644
--- a/po-docs/ja/virt-tar.pl
+++ b/po-docs/ja/virt-tar.pl
@@ -163,6 +163,6 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
+this program; if not, write to the Free Software Foundation, Inc., 51
+Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/po-docs/ja/virt-win-reg.1 b/po-docs/ja/virt-win-reg.1
index b41fb9c..c04ed14 100644
--- a/po-docs/ja/virt-win-reg.1
+++ b/po-docs/ja/virt-win-reg.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-win-reg.pl 1"
-.TH virt-win-reg.pl 1 "2011-11-03" "libguestfs-1.15.2" "Virtualization Support"
+.TH virt-win-reg.pl 1 "2011-11-09" "libguestfs-1.15.3" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -455,5 +455,5 @@ This program is distributed in the hope that it will be useful, but \s-1WITHOUT\
more details.
.PP
You should have received a copy of the \s-1GNU\s0 General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, \s-1MA\s0 02139, \s-1USA\s0.
+this program; if not, write to the Free Software Foundation, Inc., 51
+Franklin Street, Fifth Floor, Boston, \s-1MA\s0 02110\-1301 \s-1USA\s0.
diff --git a/po-docs/ja/virt-win-reg.pl b/po-docs/ja/virt-win-reg.pl
index 4761263..564c1db 100644
--- a/po-docs/ja/virt-win-reg.pl
+++ b/po-docs/ja/virt-win-reg.pl
@@ -393,6 +393,6 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 675 Mass
-Ave, Cambridge, MA 02139, USA.
+this program; if not, write to the Free Software Foundation, Inc., 51
+Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/po-docs/libguestfs-docs.pot b/po-docs/libguestfs-docs.pot
index 180fc70..0f08f4c 100644
--- a/po-docs/libguestfs-docs.pot
+++ b/po-docs/libguestfs-docs.pot
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: libguestfs 1.15.2\n"
+"Project-Id-Version: libguestfs 1.15.3\n"
"Report-Msgid-Bugs-To: libguestfs at redhat.com\n"
-"POT-Creation-Date: 2011-11-03 14:10+0000\n"
+"POT-Creation-Date: 2011-11-09 22:24+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -799,8 +799,8 @@ msgstr ""
#: ../align/virt-alignment-scan.pod:379 ../cat/virt-cat.pod:270 ../cat/virt-filesystems.pod:414 ../cat/virt-ls.pod:525 ../clone/virt-sysprep.pod:519 ../df/virt-df.pod:253 ../edit/virt-edit.pod:386 ../fish/guestfish.pod:1315 ../fish/virt-copy-in.pod:79 ../fish/virt-copy-out.pod:68 ../fish/virt-tar-in.pod:77 ../fish/virt-tar-out.pod:70 ../fuse/guestmount.pod:347 ../inspector/virt-inspector.pod:432 ../rescue/virt-rescue.pod:352 ../resize/virt-resize.pod:729 ../sparsify/virt-sparsify.pod:282 [...]
msgid ""
"You should have received a copy of the GNU General Public License along with "
-"this program; if not, write to the Free Software Foundation, Inc., 675 Mass "
-"Ave, Cambridge, MA 02139, USA."
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
msgstr ""
#. type: textblock
@@ -5325,8 +5325,8 @@ msgstr ""
#: ../fish/guestfish-actions.pod:39
#, no-wrap
msgid ""
-" add-domain dom [libvirturi:..] [readonly:..] [iface:..] [live:..] "
-"[allowuuid:..] [readonlydisk:..]\n"
+" add-domain dom [libvirturi:..] [readonly:true|false] [iface:..] "
+"[live:true|false] [allowuuid:true|false] [readonlydisk:..]\n"
"\n"
msgstr ""
@@ -5519,7 +5519,8 @@ msgstr ""
#: ../fish/guestfish-actions.pod:146
#, no-wrap
msgid ""
-" add-drive-opts filename [readonly:..] [format:..] [iface:..] [name:..]\n"
+" add-drive-opts filename [readonly:true|false] [format:..] [iface:..] "
+"[name:..]\n"
"\n"
msgstr ""
@@ -6489,7 +6490,7 @@ msgstr ""
#: ../fish/guestfish-actions.pod:603
#, no-wrap
msgid ""
-" btrfs-filesystem-resize mountpoint [size:..]\n"
+" btrfs-filesystem-resize mountpoint [size:N]\n"
"\n"
msgstr ""
@@ -6947,7 +6948,7 @@ msgstr ""
#: ../fish/guestfish-actions.pod:825
#, no-wrap
msgid ""
-" compress-device-out ctype device (zdevice|-) [level:..]\n"
+" compress-device-out ctype device (zdevice|-) [level:N]\n"
"\n"
msgstr ""
@@ -6974,7 +6975,7 @@ msgstr ""
#: ../fish/guestfish-actions.pod:839
#, no-wrap
msgid ""
-" compress-out ctype file (zfile|-) [level:..]\n"
+" compress-out ctype file (zfile|-) [level:N]\n"
"\n"
msgstr ""
@@ -7042,7 +7043,7 @@ msgstr ""
#: ../fish/guestfish-actions.pod:873
#, no-wrap
msgid ""
-" copy-device-to-device src dest [srcoffset:..] [destoffset:..] [size:..]\n"
+" copy-device-to-device src dest [srcoffset:N] [destoffset:N] [size:N]\n"
"\n"
msgstr ""
@@ -7086,7 +7087,7 @@ msgstr ""
#: ../fish/guestfish-actions.pod:898
#, no-wrap
msgid ""
-" copy-device-to-file src dest [srcoffset:..] [destoffset:..] [size:..]\n"
+" copy-device-to-file src dest [srcoffset:N] [destoffset:N] [size:N]\n"
"\n"
msgstr ""
@@ -7104,7 +7105,7 @@ msgstr ""
#: ../fish/guestfish-actions.pod:907
#, no-wrap
msgid ""
-" copy-file-to-device src dest [srcoffset:..] [destoffset:..] [size:..]\n"
+" copy-file-to-device src dest [srcoffset:N] [destoffset:N] [size:N]\n"
"\n"
msgstr ""
@@ -7117,7 +7118,7 @@ msgstr ""
#: ../fish/guestfish-actions.pod:916
#, no-wrap
msgid ""
-" copy-file-to-file src dest [srcoffset:..] [destoffset:..] [size:..]\n"
+" copy-file-to-file src dest [srcoffset:N] [destoffset:N] [size:N]\n"
"\n"
msgstr ""
@@ -9628,7 +9629,7 @@ msgstr ""
#: ../fish/guestfish-actions.pod:2109
#, no-wrap
msgid ""
-" inspect-get-icon root [favicon:..] [highquality:..]\n"
+" inspect-get-icon root [favicon:true|false] [highquality:true|false]\n"
"\n"
msgstr ""
@@ -12150,8 +12151,8 @@ msgstr ""
#: ../fish/guestfish-actions.pod:3290
#, no-wrap
msgid ""
-" mkfs-opts fstype device [blocksize:..] [features:..] [inode:..] "
-"[sectorsize:..]\n"
+" mkfs-opts fstype device [blocksize:N] [features:..] [inode:N] "
+"[sectorsize:N]\n"
"\n"
msgstr ""
@@ -12828,7 +12829,7 @@ msgstr ""
#: ../fish/guestfish-actions.pod:3601
#, no-wrap
msgid ""
-" ntfsresize-opts device [size:..] [force:..]\n"
+" ntfsresize-opts device [size:N] [force:true|false]\n"
"\n"
msgstr ""
diff --git a/po-docs/uk.po b/po-docs/uk.po
index dfb612c..fb299f8 100644
--- a/po-docs/uk.po
+++ b/po-docs/uk.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: libguestfs at redhat.com\n"
-"POT-Creation-Date: 2011-11-03 14:10+0000\n"
+"POT-Creation-Date: 2011-11-09 22:24+0000\n"
"PO-Revision-Date: 2011-10-27 09:15+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Ukrainian <trans-uk at lists.fedoraproject.org>\n"
@@ -1164,12 +1164,12 @@ msgstr ""
#: ../tools/virt-win-reg.pl:801
msgid ""
"You should have received a copy of the GNU General Public License along with "
-"this program; if not, write to the Free Software Foundation, Inc., 675 Mass "
-"Ave, Cambridge, MA 02139, USA."
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
msgstr ""
"Ви маєте отримати копію GNU General Public License разом з цією програмою; "
"якщо це не так, повідомте про факт за адресою Free Software Foundation, "
-"Inc., 675 Mass Ave, Cambridge, MA 02139, USA."
+"Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
#. type: textblock
#: ../cat/virt-cat.pod:5
@@ -5969,7 +5969,7 @@ msgstr "домен"
#: ../fish/guestfish-actions.pod:39
#, no-wrap
msgid ""
-" add-domain dom [libvirturi:..] [readonly:..] [iface:..] [live:..] [allowuuid:..] [readonlydisk:..]\n"
+" add-domain dom [libvirturi:..] [readonly:true|false] [iface:..] [live:true|false] [allowuuid:true|false] [readonlydisk:..]\n"
"\n"
msgstr ""
@@ -6175,7 +6175,7 @@ msgstr "add"
#: ../fish/guestfish-actions.pod:146
#, no-wrap
msgid ""
-" add-drive-opts filename [readonly:..] [format:..] [iface:..] [name:..]\n"
+" add-drive-opts filename [readonly:true|false] [format:..] [iface:..] [name:..]\n"
"\n"
msgstr ""
@@ -7168,7 +7168,7 @@ msgstr ""
#: ../fish/guestfish-actions.pod:603
#, no-wrap
msgid ""
-" btrfs-filesystem-resize mountpoint [size:..]\n"
+" btrfs-filesystem-resize mountpoint [size:N]\n"
"\n"
msgstr ""
@@ -7671,7 +7671,7 @@ msgstr ""
#: ../fish/guestfish-actions.pod:825
#, no-wrap
msgid ""
-" compress-device-out ctype device (zdevice|-) [level:..]\n"
+" compress-device-out ctype device (zdevice|-) [level:N]\n"
"\n"
msgstr ""
@@ -7698,7 +7698,7 @@ msgstr ""
#: ../fish/guestfish-actions.pod:839
#, no-wrap
msgid ""
-" compress-out ctype file (zfile|-) [level:..]\n"
+" compress-out ctype file (zfile|-) [level:N]\n"
"\n"
msgstr ""
@@ -7765,7 +7765,7 @@ msgstr ""
#: ../fish/guestfish-actions.pod:873
#, no-wrap
msgid ""
-" copy-device-to-device src dest [srcoffset:..] [destoffset:..] [size:..]\n"
+" copy-device-to-device src dest [srcoffset:N] [destoffset:N] [size:N]\n"
"\n"
msgstr ""
@@ -7809,7 +7809,7 @@ msgstr ""
#: ../fish/guestfish-actions.pod:898
#, no-wrap
msgid ""
-" copy-device-to-file src dest [srcoffset:..] [destoffset:..] [size:..]\n"
+" copy-device-to-file src dest [srcoffset:N] [destoffset:N] [size:N]\n"
"\n"
msgstr ""
@@ -7828,7 +7828,7 @@ msgstr ""
#: ../fish/guestfish-actions.pod:907
#, no-wrap
msgid ""
-" copy-file-to-device src dest [srcoffset:..] [destoffset:..] [size:..]\n"
+" copy-file-to-device src dest [srcoffset:N] [destoffset:N] [size:N]\n"
"\n"
msgstr ""
@@ -7841,7 +7841,7 @@ msgstr ""
#: ../fish/guestfish-actions.pod:916
#, no-wrap
msgid ""
-" copy-file-to-file src dest [srcoffset:..] [destoffset:..] [size:..]\n"
+" copy-file-to-file src dest [srcoffset:N] [destoffset:N] [size:N]\n"
"\n"
msgstr ""
@@ -10508,7 +10508,7 @@ msgstr ""
#: ../fish/guestfish-actions.pod:2109
#, no-wrap
msgid ""
-" inspect-get-icon root [favicon:..] [highquality:..]\n"
+" inspect-get-icon root [favicon:true|false] [highquality:true|false]\n"
"\n"
msgstr ""
@@ -13151,7 +13151,7 @@ msgstr "mkfs-opts"
#: ../fish/guestfish-actions.pod:3290
#, no-wrap
msgid ""
-" mkfs-opts fstype device [blocksize:..] [features:..] [inode:..] [sectorsize:..]\n"
+" mkfs-opts fstype device [blocksize:N] [features:..] [inode:N] [sectorsize:N]\n"
"\n"
msgstr ""
@@ -13861,7 +13861,7 @@ msgstr ""
#: ../fish/guestfish-actions.pod:3601
#, no-wrap
msgid ""
-" ntfsresize-opts device [size:..] [force:..]\n"
+" ntfsresize-opts device [size:N] [force:true|false]\n"
"\n"
msgstr ""
diff --git a/po-docs/uk/Makefile.am b/po-docs/uk/Makefile.am
index 68e1643..d0d5c14 100644
--- a/po-docs/uk/Makefile.am
+++ b/po-docs/uk/Makefile.am
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# Note that each Makefile.am in po-docs/$lang/Makefile.am should be
# identical. If you create a new $lang.po, create the $lang/
diff --git a/po-docs/uk/Makefile.in b/po-docs/uk/Makefile.in
index 1d934d6..c53e56c 100644
--- a/po-docs/uk/Makefile.in
+++ b/po-docs/uk/Makefile.in
@@ -30,7 +30,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# Note that each Makefile.am in po-docs/$lang/Makefile.am should be
# identical. If you create a new $lang.po, create the $lang/
diff --git a/po-docs/uk/guestfish-actions.pod b/po-docs/uk/guestfish-actions.pod
index 5209a2f..50a9424 100644
--- a/po-docs/uk/guestfish-actions.pod
+++ b/po-docs/uk/guestfish-actions.pod
@@ -38,7 +38,7 @@ these functions.
=head2 домен
- add-domain dom [libvirturi:..] [readonly:..] [iface:..] [live:..] [allowuuid:..] [readonlydisk:..]
+ add-domain dom [libvirturi:..] [readonly:true|false] [iface:..] [live:true|false] [allowuuid:true|false] [readonlydisk:..]
This function adds the disk(s) attached to the named libvirt domain C<dom>.
It works by connecting to libvirt, requesting the domain and domain XML from
@@ -140,7 +140,7 @@ L</add-drive-opts>, and specifying the format.
=head2 add
- add-drive-opts filename [readonly:..] [format:..] [iface:..] [name:..]
+ add-drive-opts filename [readonly:true|false] [format:..] [iface:..] [name:..]
This function adds a virtual machine disk image C<filename> to libguestfs.
The first time you call this function, the disk appears as C</dev/sda>, the
@@ -571,7 +571,7 @@ This uses the L<blockdev(8)> command.
=head2 btrfs-filesystem-resize
- btrfs-filesystem-resize mountpoint [size:..]
+ btrfs-filesystem-resize mountpoint [size:N]
This command resizes a btrfs filesystem.
@@ -779,7 +779,7 @@ between 2MB and 4MB. See L<guestfs(3)/PROTOCOL LIMITS>.
=head2 compress-device-out
- compress-device-out ctype device (zdevice|-) [level:..]
+ compress-device-out ctype device (zdevice|-) [level:N]
This command compresses C<device> and writes it out to the local file
C<zdevice>.
@@ -794,7 +794,7 @@ ARGUMENTS>.
=head2 compress-out
- compress-out ctype file (zfile|-) [level:..]
+ compress-out ctype file (zfile|-) [level:N]
This command compresses C<file> and writes it out to the local file
C<zfile>.
@@ -827,7 +827,7 @@ C<value> can be NULL.
=head2 copy-device-to-device
- copy-device-to-device src dest [srcoffset:..] [destoffset:..] [size:..]
+ copy-device-to-device src dest [srcoffset:N] [destoffset:N] [size:N]
The four calls L</copy-device-to-device>, L</copy-device-to-file>,
L</copy-file-to-device>, and L</copy-file-to-file> let you copy from a
@@ -849,7 +849,7 @@ ARGUMENTS>.
=head2 copy-device-to-file
- copy-device-to-file src dest [srcoffset:..] [destoffset:..] [size:..]
+ copy-device-to-file src dest [srcoffset:N] [destoffset:N] [size:N]
See L</copy-device-to-device> for a general overview of this call.
@@ -858,7 +858,7 @@ ARGUMENTS>.
=head2 copy-file-to-device
- copy-file-to-device src dest [srcoffset:..] [destoffset:..] [size:..]
+ copy-file-to-device src dest [srcoffset:N] [destoffset:N] [size:N]
See L</copy-device-to-device> for a general overview of this call.
@@ -867,7 +867,7 @@ ARGUMENTS>.
=head2 copy-file-to-file
- copy-file-to-file src dest [srcoffset:..] [destoffset:..] [size:..]
+ copy-file-to-file src dest [srcoffset:N] [destoffset:N] [size:N]
See L</copy-device-to-device> for a general overview of this call.
@@ -1999,7 +1999,7 @@ Please read L<guestfs(3)/INSPECTION> for more details.
=head2 inspect-get-icon
- inspect-get-icon root [favicon:..] [highquality:..]
+ inspect-get-icon root [favicon:true|false] [highquality:true|false]
This function returns an icon corresponding to the inspected operating
system. The icon is returned as a buffer containing a PNG image (re-encoded
@@ -3111,7 +3111,7 @@ these functions.
=head2 mkfs-opts
- mkfs-opts fstype device [blocksize:..] [features:..] [inode:..] [sectorsize:..]
+ mkfs-opts fstype device [blocksize:N] [features:..] [inode:N] [sectorsize:N]
This function creates a filesystem on C<device>. The filesystem type is
C<fstype>, for example C<ext3>.
@@ -3410,7 +3410,7 @@ these functions.
=head2 ntfsresize-opts
- ntfsresize-opts device [size:..] [force:..]
+ ntfsresize-opts device [size:N] [force:true|false]
This command resizes an NTFS filesystem, expanding or shrinking it to the
size of the underlying device.
diff --git a/po-docs/uk/guestfish.1 b/po-docs/uk/guestfish.1
index bfe2f65..c56e9a3 100644
--- a/po-docs/uk/guestfish.1
+++ b/po-docs/uk/guestfish.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "guestfish 1"
-.TH guestfish 1 "2011-11-03" "libguestfs-1.15.2" "Virtualization Support"
+.TH guestfish 1 "2011-11-09" "libguestfs-1.15.3" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -1465,7 +1465,7 @@ these functions.
.SS "домен"
.IX Subsection "домен"
.Vb 1
-\& add\-domain dom [libvirturi:..] [readonly:..] [iface:..] [live:..] [allowuuid:..] [readonlydisk:..]
+\& add\-domain dom [libvirturi:..] [readonly:true|false] [iface:..] [live:true|false] [allowuuid:true|false] [readonlydisk:..]
.Ve
.PP
This function adds the disk(s) attached to the named libvirt domain \f(CW\*(C`dom\*(C'\fR.
@@ -1565,7 +1565,7 @@ you should think about replacing calls to this function with calls to
.SS "add"
.IX Subsection "add"
.Vb 1
-\& add\-drive\-opts filename [readonly:..] [format:..] [iface:..] [name:..]
+\& add\-drive\-opts filename [readonly:true|false] [format:..] [iface:..] [name:..]
.Ve
.PP
This function adds a virtual machine disk image \f(CW\*(C`filename\*(C'\fR to libguestfs.
@@ -2008,7 +2008,7 @@ This uses the \fIblockdev\fR\|(8) command.
.SS "btrfs-filesystem-resize"
.IX Subsection "btrfs-filesystem-resize"
.Vb 1
-\& btrfs\-filesystem\-resize mountpoint [size:..]
+\& btrfs\-filesystem\-resize mountpoint [size:N]
.Ve
.PP
This command resizes a btrfs filesystem.
@@ -2218,7 +2218,7 @@ between 2MB and 4MB. See \*(L"\s-1PROTOCOL\s0 \s-1LIMITS\s0\*(R" in \fIguestfs\
.SS "compress-device-out"
.IX Subsection "compress-device-out"
.Vb 1
-\& compress\-device\-out ctype device (zdevice|\-) [level:..]
+\& compress\-device\-out ctype device (zdevice|\-) [level:N]
.Ve
.PP
This command compresses \f(CW\*(C`device\*(C'\fR and writes it out to the local file
@@ -2234,7 +2234,7 @@ This command has one or more optional arguments. See \*(L"\s-1OPTIONAL\s0
.SS "compress-out"
.IX Subsection "compress-out"
.Vb 1
-\& compress\-out ctype file (zfile|\-) [level:..]
+\& compress\-out ctype file (zfile|\-) [level:N]
.Ve
.PP
This command compresses \f(CW\*(C`file\*(C'\fR and writes it out to the local file
@@ -2269,7 +2269,7 @@ The first character of \f(CW\*(C`param\*(C'\fR string must be a \f(CW\*(C`\-\*(C
.SS "copy-device-to-device"
.IX Subsection "copy-device-to-device"
.Vb 1
-\& copy\-device\-to\-device src dest [srcoffset:..] [destoffset:..] [size:..]
+\& copy\-device\-to\-device src dest [srcoffset:N] [destoffset:N] [size:N]
.Ve
.PP
The four calls \*(L"copy-device-to-device\*(R", \*(L"copy-device-to-file\*(R",
@@ -2292,7 +2292,7 @@ This command has one or more optional arguments. See \*(L"\s-1OPTIONAL\s0
.SS "copy-device-to-file"
.IX Subsection "copy-device-to-file"
.Vb 1
-\& copy\-device\-to\-file src dest [srcoffset:..] [destoffset:..] [size:..]
+\& copy\-device\-to\-file src dest [srcoffset:N] [destoffset:N] [size:N]
.Ve
.PP
See \*(L"copy-device-to-device\*(R" for a general overview of this call.
@@ -2302,7 +2302,7 @@ This command has one or more optional arguments. See \*(L"\s-1OPTIONAL\s0
.SS "copy-file-to-device"
.IX Subsection "copy-file-to-device"
.Vb 1
-\& copy\-file\-to\-device src dest [srcoffset:..] [destoffset:..] [size:..]
+\& copy\-file\-to\-device src dest [srcoffset:N] [destoffset:N] [size:N]
.Ve
.PP
See \*(L"copy-device-to-device\*(R" for a general overview of this call.
@@ -2312,7 +2312,7 @@ This command has one or more optional arguments. See \*(L"\s-1OPTIONAL\s0
.SS "copy-file-to-file"
.IX Subsection "copy-file-to-file"
.Vb 1
-\& copy\-file\-to\-file src dest [srcoffset:..] [destoffset:..] [size:..]
+\& copy\-file\-to\-file src dest [srcoffset:N] [destoffset:N] [size:N]
.Ve
.PP
See \*(L"copy-device-to-device\*(R" for a general overview of this call.
@@ -3457,7 +3457,7 @@ Please read \*(L"\s-1INSPECTION\s0\*(R" in \fIguestfs\fR\|(3) for more details.
.SS "inspect-get-icon"
.IX Subsection "inspect-get-icon"
.Vb 1
-\& inspect\-get\-icon root [favicon:..] [highquality:..]
+\& inspect\-get\-icon root [favicon:true|false] [highquality:true|false]
.Ve
.PP
This function returns an icon corresponding to the inspected operating
@@ -4637,7 +4637,7 @@ these functions.
.SS "mkfs-opts"
.IX Subsection "mkfs-opts"
.Vb 1
-\& mkfs\-opts fstype device [blocksize:..] [features:..] [inode:..] [sectorsize:..]
+\& mkfs\-opts fstype device [blocksize:N] [features:..] [inode:N] [sectorsize:N]
.Ve
.PP
This function creates a filesystem on \f(CW\*(C`device\*(C'\fR. The filesystem type is
@@ -4955,7 +4955,7 @@ these functions.
.SS "ntfsresize-opts"
.IX Subsection "ntfsresize-opts"
.Vb 1
-\& ntfsresize\-opts device [size:..] [force:..]
+\& ntfsresize\-opts device [size:N] [force:true|false]
.Ve
.PP
This command resizes an \s-1NTFS\s0 filesystem, expanding or shrinking it to the
@@ -6924,4 +6924,4 @@ any later version.
.PP
Ви маєте отримати копію \s-1GNU\s0 General Public License разом з цією програмою;
якщо це не так, повідомте про факт за адресою Free Software Foundation,
-Inc., 675 Mass Ave, Cambridge, \s-1MA\s0 02139, \s-1USA\s0.
+Inc., 51 Franklin Street, Fifth Floor, Boston, \s-1MA\s0 02110\-1301 \s-1USA\s0.
diff --git a/po-docs/uk/guestfish.pod b/po-docs/uk/guestfish.pod
index 6cb49e3..e623b4b 100644
--- a/po-docs/uk/guestfish.pod
+++ b/po-docs/uk/guestfish.pod
@@ -1265,5 +1265,5 @@ any later version.
Ви маєте отримати копію GNU General Public License разом з цією програмою;
якщо це не так, повідомте про факт за адресою Free Software Foundation,
-Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/po-docs/uk/guestfs.3 b/po-docs/uk/guestfs.3
index 4818565..5564a49 100644
--- a/po-docs/uk/guestfs.3
+++ b/po-docs/uk/guestfs.3
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "guestfs 3"
-.TH guestfs 3 "2011-11-03" "libguestfs-1.15.2" "Virtualization Support"
+.TH guestfs 3 "2011-11-09" "libguestfs-1.15.3" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/uk/guestmount.1 b/po-docs/uk/guestmount.1
index 0133d10..94815ea 100644
--- a/po-docs/uk/guestmount.1
+++ b/po-docs/uk/guestmount.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "guestmount 1"
-.TH guestmount 1 "2011-11-03" "libguestfs-1.15.2" "Virtualization Support"
+.TH guestmount 1 "2011-11-09" "libguestfs-1.15.3" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -410,4 +410,4 @@ any later version.
.PP
Ви маєте отримати копію \s-1GNU\s0 General Public License разом з цією програмою;
якщо це не так, повідомте про факт за адресою Free Software Foundation,
-Inc., 675 Mass Ave, Cambridge, \s-1MA\s0 02139, \s-1USA\s0.
+Inc., 51 Franklin Street, Fifth Floor, Boston, \s-1MA\s0 02110\-1301 \s-1USA\s0.
diff --git a/po-docs/uk/guestmount.pod b/po-docs/uk/guestmount.pod
index 879ab9d..9e3149e 100644
--- a/po-docs/uk/guestmount.pod
+++ b/po-docs/uk/guestmount.pod
@@ -335,5 +335,5 @@ any later version.
Ви маєте отримати копію GNU General Public License разом з цією програмою;
якщо це не так, повідомте про факт за адресою Free Software Foundation,
-Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/po-docs/uk/libguestfs-test-tool.1 b/po-docs/uk/libguestfs-test-tool.1
index f223560..1adfb22 100644
--- a/po-docs/uk/libguestfs-test-tool.1
+++ b/po-docs/uk/libguestfs-test-tool.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "libguestfs-test-tool 1"
-.TH libguestfs-test-tool 1 "2011-11-03" "libguestfs-1.15.2" "Virtualization Support"
+.TH libguestfs-test-tool 1 "2011-11-09" "libguestfs-1.15.3" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -178,4 +178,4 @@ any later version.
.PP
Ви маєте отримати копію \s-1GNU\s0 General Public License разом з цією програмою;
якщо це не так, повідомте про факт за адресою Free Software Foundation,
-Inc., 675 Mass Ave, Cambridge, \s-1MA\s0 02139, \s-1USA\s0.
+Inc., 51 Franklin Street, Fifth Floor, Boston, \s-1MA\s0 02110\-1301 \s-1USA\s0.
diff --git a/po-docs/uk/libguestfs-test-tool.pod b/po-docs/uk/libguestfs-test-tool.pod
index fc612f2..2d9d8d0 100644
--- a/po-docs/uk/libguestfs-test-tool.pod
+++ b/po-docs/uk/libguestfs-test-tool.pod
@@ -121,5 +121,5 @@ any later version.
Ви маєте отримати копію GNU General Public License разом з цією програмою;
якщо це не так, повідомте про факт за адресою Free Software Foundation,
-Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/po-docs/uk/virt-alignment-scan.1 b/po-docs/uk/virt-alignment-scan.1
index 3b39c39..c742f20 100644
--- a/po-docs/uk/virt-alignment-scan.1
+++ b/po-docs/uk/virt-alignment-scan.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-alignment-scan 1"
-.TH virt-alignment-scan 1 "2011-11-03" "libguestfs-1.15.2" "Virtualization Support"
+.TH virt-alignment-scan 1 "2011-11-09" "libguestfs-1.15.3" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -420,4 +420,4 @@ any later version.
.PP
Ви маєте отримати копію \s-1GNU\s0 General Public License разом з цією програмою;
якщо це не так, повідомте про факт за адресою Free Software Foundation,
-Inc., 675 Mass Ave, Cambridge, \s-1MA\s0 02139, \s-1USA\s0.
+Inc., 51 Franklin Street, Fifth Floor, Boston, \s-1MA\s0 02110\-1301 \s-1USA\s0.
diff --git a/po-docs/uk/virt-alignment-scan.pod b/po-docs/uk/virt-alignment-scan.pod
index eaf6a3d..96b675c 100644
--- a/po-docs/uk/virt-alignment-scan.pod
+++ b/po-docs/uk/virt-alignment-scan.pod
@@ -371,5 +371,5 @@ any later version.
Ви маєте отримати копію GNU General Public License разом з цією програмою;
якщо це не так, повідомте про факт за адресою Free Software Foundation,
-Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/po-docs/uk/virt-cat.1 b/po-docs/uk/virt-cat.1
index 977e013..352b285 100644
--- a/po-docs/uk/virt-cat.1
+++ b/po-docs/uk/virt-cat.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-cat 1"
-.TH virt-cat 1 "2011-11-03" "libguestfs-1.15.2" "Virtualization Support"
+.TH virt-cat 1 "2011-11-09" "libguestfs-1.15.3" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -326,4 +326,4 @@ any later version.
.PP
Ви маєте отримати копію \s-1GNU\s0 General Public License разом з цією програмою;
якщо це не так, повідомте про факт за адресою Free Software Foundation,
-Inc., 675 Mass Ave, Cambridge, \s-1MA\s0 02139, \s-1USA\s0.
+Inc., 51 Franklin Street, Fifth Floor, Boston, \s-1MA\s0 02110\-1301 \s-1USA\s0.
diff --git a/po-docs/uk/virt-cat.pod b/po-docs/uk/virt-cat.pod
index da4d1f3..eb2fee3 100644
--- a/po-docs/uk/virt-cat.pod
+++ b/po-docs/uk/virt-cat.pod
@@ -262,5 +262,5 @@ any later version.
Ви маєте отримати копію GNU General Public License разом з цією програмою;
якщо це не так, повідомте про факт за адресою Free Software Foundation,
-Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/po-docs/uk/virt-copy-in.1 b/po-docs/uk/virt-copy-in.1
index 8944e7e..36af0d7 100644
--- a/po-docs/uk/virt-copy-in.1
+++ b/po-docs/uk/virt-copy-in.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-copy-in 1"
-.TH virt-copy-in 1 "2011-11-03" "libguestfs-1.15.2" "Virtualization Support"
+.TH virt-copy-in 1 "2011-11-09" "libguestfs-1.15.3" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -136,4 +136,4 @@ any later version.
.PP
Ви маєте отримати копію \s-1GNU\s0 General Public License разом з цією програмою;
якщо це не так, повідомте про факт за адресою Free Software Foundation,
-Inc., 675 Mass Ave, Cambridge, \s-1MA\s0 02139, \s-1USA\s0.
+Inc., 51 Franklin Street, Fifth Floor, Boston, \s-1MA\s0 02110\-1301 \s-1USA\s0.
diff --git a/po-docs/uk/virt-copy-in.pod b/po-docs/uk/virt-copy-in.pod
index aa65eec..8fc26c8 100644
--- a/po-docs/uk/virt-copy-in.pod
+++ b/po-docs/uk/virt-copy-in.pod
@@ -72,5 +72,5 @@ any later version.
Ви маєте отримати копію GNU General Public License разом з цією програмою;
якщо це не так, повідомте про факт за адресою Free Software Foundation,
-Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/po-docs/uk/virt-copy-out.1 b/po-docs/uk/virt-copy-out.1
index 00491ba..476d3a2 100644
--- a/po-docs/uk/virt-copy-out.1
+++ b/po-docs/uk/virt-copy-out.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-copy-out 1"
-.TH virt-copy-out 1 "2011-11-03" "libguestfs-1.15.2" "Virtualization Support"
+.TH virt-copy-out 1 "2011-11-09" "libguestfs-1.15.3" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -125,4 +125,4 @@ any later version.
.PP
Ви маєте отримати копію \s-1GNU\s0 General Public License разом з цією програмою;
якщо це не так, повідомте про факт за адресою Free Software Foundation,
-Inc., 675 Mass Ave, Cambridge, \s-1MA\s0 02139, \s-1USA\s0.
+Inc., 51 Franklin Street, Fifth Floor, Boston, \s-1MA\s0 02110\-1301 \s-1USA\s0.
diff --git a/po-docs/uk/virt-copy-out.pod b/po-docs/uk/virt-copy-out.pod
index 17c1a0f..6b4c6da 100644
--- a/po-docs/uk/virt-copy-out.pod
+++ b/po-docs/uk/virt-copy-out.pod
@@ -62,5 +62,5 @@ any later version.
Ви маєте отримати копію GNU General Public License разом з цією програмою;
якщо це не так, повідомте про факт за адресою Free Software Foundation,
-Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/po-docs/uk/virt-df.1 b/po-docs/uk/virt-df.1
index ef5f2f3..6f828e0 100644
--- a/po-docs/uk/virt-df.1
+++ b/po-docs/uk/virt-df.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-df 1"
-.TH virt-df 1 "2011-11-03" "libguestfs-1.15.2" "Virtualization Support"
+.TH virt-df 1 "2011-11-09" "libguestfs-1.15.3" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -315,4 +315,4 @@ any later version.
.PP
Ви маєте отримати копію \s-1GNU\s0 General Public License разом з цією програмою;
якщо це не так, повідомте про факт за адресою Free Software Foundation,
-Inc., 675 Mass Ave, Cambridge, \s-1MA\s0 02139, \s-1USA\s0.
+Inc., 51 Franklin Street, Fifth Floor, Boston, \s-1MA\s0 02110\-1301 \s-1USA\s0.
diff --git a/po-docs/uk/virt-df.pod b/po-docs/uk/virt-df.pod
index 38dc661..fea0f95 100644
--- a/po-docs/uk/virt-df.pod
+++ b/po-docs/uk/virt-df.pod
@@ -246,5 +246,5 @@ any later version.
Ви маєте отримати копію GNU General Public License разом з цією програмою;
якщо це не так, повідомте про факт за адресою Free Software Foundation,
-Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/po-docs/uk/virt-edit.1 b/po-docs/uk/virt-edit.1
index 28ba846..98954d7 100644
--- a/po-docs/uk/virt-edit.1
+++ b/po-docs/uk/virt-edit.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-edit 1"
-.TH virt-edit 1 "2011-11-03" "libguestfs-1.15.2" "Virtualization Support"
+.TH virt-edit 1 "2011-11-09" "libguestfs-1.15.3" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -438,4 +438,4 @@ any later version.
.PP
Ви маєте отримати копію \s-1GNU\s0 General Public License разом з цією програмою;
якщо це не так, повідомте про факт за адресою Free Software Foundation,
-Inc., 675 Mass Ave, Cambridge, \s-1MA\s0 02139, \s-1USA\s0.
+Inc., 51 Franklin Street, Fifth Floor, Boston, \s-1MA\s0 02110\-1301 \s-1USA\s0.
diff --git a/po-docs/uk/virt-edit.pod b/po-docs/uk/virt-edit.pod
index 64b3bea..1366d39 100644
--- a/po-docs/uk/virt-edit.pod
+++ b/po-docs/uk/virt-edit.pod
@@ -370,5 +370,5 @@ any later version.
Ви маєте отримати копію GNU General Public License разом з цією програмою;
якщо це не так, повідомте про факт за адресою Free Software Foundation,
-Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/po-docs/uk/virt-filesystems.1 b/po-docs/uk/virt-filesystems.1
index 002e997..29463d1 100644
--- a/po-docs/uk/virt-filesystems.1
+++ b/po-docs/uk/virt-filesystems.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-filesystems 1"
-.TH virt-filesystems 1 "2011-11-03" "libguestfs-1.15.2" "Virtualization Support"
+.TH virt-filesystems 1 "2011-11-09" "libguestfs-1.15.3" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -472,4 +472,4 @@ any later version.
.PP
Ви маєте отримати копію \s-1GNU\s0 General Public License разом з цією програмою;
якщо це не так, повідомте про факт за адресою Free Software Foundation,
-Inc., 675 Mass Ave, Cambridge, \s-1MA\s0 02139, \s-1USA\s0.
+Inc., 51 Franklin Street, Fifth Floor, Boston, \s-1MA\s0 02110\-1301 \s-1USA\s0.
diff --git a/po-docs/uk/virt-filesystems.pod b/po-docs/uk/virt-filesystems.pod
index 7a3efe2..7f82339 100644
--- a/po-docs/uk/virt-filesystems.pod
+++ b/po-docs/uk/virt-filesystems.pod
@@ -403,5 +403,5 @@ any later version.
Ви маєте отримати копію GNU General Public License разом з цією програмою;
якщо це не так, повідомте про факт за адресою Free Software Foundation,
-Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/po-docs/uk/virt-inspector.1 b/po-docs/uk/virt-inspector.1
index db180bf..2ad0329 100644
--- a/po-docs/uk/virt-inspector.1
+++ b/po-docs/uk/virt-inspector.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-inspector 1"
-.TH virt-inspector 1 "2011-11-03" "libguestfs-1.15.2" "Virtualization Support"
+.TH virt-inspector 1 "2011-11-09" "libguestfs-1.15.3" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -480,4 +480,4 @@ any later version.
.PP
Ви маєте отримати копію \s-1GNU\s0 General Public License разом з цією програмою;
якщо це не так, повідомте про факт за адресою Free Software Foundation,
-Inc., 675 Mass Ave, Cambridge, \s-1MA\s0 02139, \s-1USA\s0.
+Inc., 51 Franklin Street, Fifth Floor, Boston, \s-1MA\s0 02110\-1301 \s-1USA\s0.
diff --git a/po-docs/uk/virt-inspector.pod b/po-docs/uk/virt-inspector.pod
index 58cb089..ac437a9 100644
--- a/po-docs/uk/virt-inspector.pod
+++ b/po-docs/uk/virt-inspector.pod
@@ -413,5 +413,5 @@ any later version.
Ви маєте отримати копію GNU General Public License разом з цією програмою;
якщо це не так, повідомте про факт за адресою Free Software Foundation,
-Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/po-docs/uk/virt-list-filesystems.1 b/po-docs/uk/virt-list-filesystems.1
index 1a2fd11..886563e 100644
--- a/po-docs/uk/virt-list-filesystems.1
+++ b/po-docs/uk/virt-list-filesystems.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-list-filesystems.pl 1"
-.TH virt-list-filesystems.pl 1 "2011-11-03" "libguestfs-1.15.2" "Virtualization Support"
+.TH virt-list-filesystems.pl 1 "2011-11-09" "libguestfs-1.15.3" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -164,4 +164,4 @@ any later version.
.PP
Ви маєте отримати копію \s-1GNU\s0 General Public License разом з цією програмою;
якщо це не так, повідомте про факт за адресою Free Software Foundation,
-Inc., 675 Mass Ave, Cambridge, \s-1MA\s0 02139, \s-1USA\s0.
+Inc., 51 Franklin Street, Fifth Floor, Boston, \s-1MA\s0 02110\-1301 \s-1USA\s0.
diff --git a/po-docs/uk/virt-list-filesystems.pl b/po-docs/uk/virt-list-filesystems.pl
index 9167546..5ccc521 100644
--- a/po-docs/uk/virt-list-filesystems.pl
+++ b/po-docs/uk/virt-list-filesystems.pl
@@ -105,5 +105,5 @@ any later version.
Ви маєте отримати копію GNU General Public License разом з цією програмою;
якщо це не так, повідомте про факт за адресою Free Software Foundation,
-Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/po-docs/uk/virt-list-partitions.1 b/po-docs/uk/virt-list-partitions.1
index 87a02ed..3543216 100644
--- a/po-docs/uk/virt-list-partitions.1
+++ b/po-docs/uk/virt-list-partitions.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-list-partitions.pl 1"
-.TH virt-list-partitions.pl 1 "2011-11-03" "libguestfs-1.15.2" "Virtualization Support"
+.TH virt-list-partitions.pl 1 "2011-11-09" "libguestfs-1.15.3" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -171,4 +171,4 @@ any later version.
.PP
Ви маєте отримати копію \s-1GNU\s0 General Public License разом з цією програмою;
якщо це не так, повідомте про факт за адресою Free Software Foundation,
-Inc., 675 Mass Ave, Cambridge, \s-1MA\s0 02139, \s-1USA\s0.
+Inc., 51 Franklin Street, Fifth Floor, Boston, \s-1MA\s0 02110\-1301 \s-1USA\s0.
diff --git a/po-docs/uk/virt-list-partitions.pl b/po-docs/uk/virt-list-partitions.pl
index d2ceffc..c51d78b 100644
--- a/po-docs/uk/virt-list-partitions.pl
+++ b/po-docs/uk/virt-list-partitions.pl
@@ -111,5 +111,5 @@ any later version.
Ви маєте отримати копію GNU General Public License разом з цією програмою;
якщо це не так, повідомте про факт за адресою Free Software Foundation,
-Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/po-docs/uk/virt-ls.1 b/po-docs/uk/virt-ls.1
index 181d4ee..2706f75 100644
--- a/po-docs/uk/virt-ls.1
+++ b/po-docs/uk/virt-ls.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-ls 1"
-.TH virt-ls 1 "2011-11-03" "libguestfs-1.15.2" "Virtualization Support"
+.TH virt-ls 1 "2011-11-09" "libguestfs-1.15.3" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -567,4 +567,4 @@ any later version.
.PP
Ви маєте отримати копію \s-1GNU\s0 General Public License разом з цією програмою;
якщо це не так, повідомте про факт за адресою Free Software Foundation,
-Inc., 675 Mass Ave, Cambridge, \s-1MA\s0 02139, \s-1USA\s0.
+Inc., 51 Franklin Street, Fifth Floor, Boston, \s-1MA\s0 02110\-1301 \s-1USA\s0.
diff --git a/po-docs/uk/virt-ls.pod b/po-docs/uk/virt-ls.pod
index 2b2b70b..8e4f4d6 100644
--- a/po-docs/uk/virt-ls.pod
+++ b/po-docs/uk/virt-ls.pod
@@ -508,5 +508,5 @@ any later version.
Ви маєте отримати копію GNU General Public License разом з цією програмою;
якщо це не так, повідомте про факт за адресою Free Software Foundation,
-Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/po-docs/uk/virt-make-fs.1 b/po-docs/uk/virt-make-fs.1
index f5e643b..511f5e5 100644
--- a/po-docs/uk/virt-make-fs.1
+++ b/po-docs/uk/virt-make-fs.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-make-fs.pl 1"
-.TH virt-make-fs.pl 1 "2011-11-03" "libguestfs-1.15.2" "Virtualization Support"
+.TH virt-make-fs.pl 1 "2011-11-09" "libguestfs-1.15.3" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -317,4 +317,4 @@ any later version.
.PP
Ви маєте отримати копію \s-1GNU\s0 General Public License разом з цією програмою;
якщо це не так, повідомте про факт за адресою Free Software Foundation,
-Inc., 675 Mass Ave, Cambridge, \s-1MA\s0 02139, \s-1USA\s0.
+Inc., 51 Franklin Street, Fifth Floor, Boston, \s-1MA\s0 02110\-1301 \s-1USA\s0.
diff --git a/po-docs/uk/virt-make-fs.pl b/po-docs/uk/virt-make-fs.pl
index 892108a..e499d56 100644
--- a/po-docs/uk/virt-make-fs.pl
+++ b/po-docs/uk/virt-make-fs.pl
@@ -249,5 +249,5 @@ any later version.
Ви маєте отримати копію GNU General Public License разом з цією програмою;
якщо це не так, повідомте про факт за адресою Free Software Foundation,
-Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/po-docs/uk/virt-rescue.1 b/po-docs/uk/virt-rescue.1
index 2a886ea..244d635 100644
--- a/po-docs/uk/virt-rescue.1
+++ b/po-docs/uk/virt-rescue.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-rescue 1"
-.TH virt-rescue 1 "2011-11-03" "libguestfs-1.15.2" "Virtualization Support"
+.TH virt-rescue 1 "2011-11-09" "libguestfs-1.15.3" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -411,4 +411,4 @@ any later version.
.PP
Ви маєте отримати копію \s-1GNU\s0 General Public License разом з цією програмою;
якщо це не так, повідомте про факт за адресою Free Software Foundation,
-Inc., 675 Mass Ave, Cambridge, \s-1MA\s0 02139, \s-1USA\s0.
+Inc., 51 Franklin Street, Fifth Floor, Boston, \s-1MA\s0 02110\-1301 \s-1USA\s0.
diff --git a/po-docs/uk/virt-rescue.pod b/po-docs/uk/virt-rescue.pod
index b82a2e1..a28288f 100644
--- a/po-docs/uk/virt-rescue.pod
+++ b/po-docs/uk/virt-rescue.pod
@@ -344,5 +344,5 @@ any later version.
Ви маєте отримати копію GNU General Public License разом з цією програмою;
якщо це не так, повідомте про факт за адресою Free Software Foundation,
-Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/po-docs/uk/virt-resize.1 b/po-docs/uk/virt-resize.1
index 0f58cbf..195e82f 100644
--- a/po-docs/uk/virt-resize.1
+++ b/po-docs/uk/virt-resize.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-resize 1"
-.TH virt-resize 1 "2011-11-03" "libguestfs-1.15.2" "Virtualization Support"
+.TH virt-resize 1 "2011-11-09" "libguestfs-1.15.3" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -736,4 +736,4 @@ any later version.
.PP
Ви маєте отримати копію \s-1GNU\s0 General Public License разом з цією програмою;
якщо це не так, повідомте про факт за адресою Free Software Foundation,
-Inc., 675 Mass Ave, Cambridge, \s-1MA\s0 02139, \s-1USA\s0.
+Inc., 51 Franklin Street, Fifth Floor, Boston, \s-1MA\s0 02110\-1301 \s-1USA\s0.
diff --git a/po-docs/uk/virt-resize.pod b/po-docs/uk/virt-resize.pod
index 43ce3ef..edadbc7 100644
--- a/po-docs/uk/virt-resize.pod
+++ b/po-docs/uk/virt-resize.pod
@@ -696,5 +696,5 @@ any later version.
Ви маєте отримати копію GNU General Public License разом з цією програмою;
якщо це не так, повідомте про факт за адресою Free Software Foundation,
-Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/po-docs/uk/virt-sparsify.1 b/po-docs/uk/virt-sparsify.1
index eb27bfe..2f765d2 100644
--- a/po-docs/uk/virt-sparsify.1
+++ b/po-docs/uk/virt-sparsify.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-sparsify 1"
-.TH virt-sparsify 1 "2011-11-03" "libguestfs-1.15.2" "Virtualization Support"
+.TH virt-sparsify 1 "2011-11-09" "libguestfs-1.15.3" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -304,4 +304,4 @@ any later version.
.PP
Ви маєте отримати копію \s-1GNU\s0 General Public License разом з цією програмою;
якщо це не так, повідомте про факт за адресою Free Software Foundation,
-Inc., 675 Mass Ave, Cambridge, \s-1MA\s0 02139, \s-1USA\s0.
+Inc., 51 Franklin Street, Fifth Floor, Boston, \s-1MA\s0 02110\-1301 \s-1USA\s0.
diff --git a/po-docs/uk/virt-sparsify.pod b/po-docs/uk/virt-sparsify.pod
index 9774ed1..875750b 100644
--- a/po-docs/uk/virt-sparsify.pod
+++ b/po-docs/uk/virt-sparsify.pod
@@ -267,5 +267,5 @@ any later version.
Ви маєте отримати копію GNU General Public License разом з цією програмою;
якщо це не так, повідомте про факт за адресою Free Software Foundation,
-Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/po-docs/uk/virt-sysprep.1 b/po-docs/uk/virt-sysprep.1
index 1c8dee3..f99da68 100644
--- a/po-docs/uk/virt-sysprep.1
+++ b/po-docs/uk/virt-sysprep.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-sysprep 1"
-.TH virt-sysprep 1 "2011-11-03" "libguestfs-1.15.2" "Virtualization Support"
+.TH virt-sysprep 1 "2011-11-09" "libguestfs-1.15.3" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -529,4 +529,4 @@ any later version.
.PP
Ви маєте отримати копію \s-1GNU\s0 General Public License разом з цією програмою;
якщо це не так, повідомте про факт за адресою Free Software Foundation,
-Inc., 675 Mass Ave, Cambridge, \s-1MA\s0 02139, \s-1USA\s0.
+Inc., 51 Franklin Street, Fifth Floor, Boston, \s-1MA\s0 02110\-1301 \s-1USA\s0.
diff --git a/po-docs/uk/virt-sysprep.pod b/po-docs/uk/virt-sysprep.pod
index 7728d6a..0225b77 100644
--- a/po-docs/uk/virt-sysprep.pod
+++ b/po-docs/uk/virt-sysprep.pod
@@ -502,5 +502,5 @@ any later version.
Ви маєте отримати копію GNU General Public License разом з цією програмою;
якщо це не так, повідомте про факт за адресою Free Software Foundation,
-Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/po-docs/uk/virt-tar-in.1 b/po-docs/uk/virt-tar-in.1
index b86d3ec..9342275 100644
--- a/po-docs/uk/virt-tar-in.1
+++ b/po-docs/uk/virt-tar-in.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-tar-in 1"
-.TH virt-tar-in 1 "2011-11-03" "libguestfs-1.15.2" "Virtualization Support"
+.TH virt-tar-in 1 "2011-11-09" "libguestfs-1.15.3" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -132,4 +132,4 @@ any later version.
.PP
Ви маєте отримати копію \s-1GNU\s0 General Public License разом з цією програмою;
якщо це не так, повідомте про факт за адресою Free Software Foundation,
-Inc., 675 Mass Ave, Cambridge, \s-1MA\s0 02139, \s-1USA\s0.
+Inc., 51 Franklin Street, Fifth Floor, Boston, \s-1MA\s0 02110\-1301 \s-1USA\s0.
diff --git a/po-docs/uk/virt-tar-in.pod b/po-docs/uk/virt-tar-in.pod
index 2ee6fe3..16a54e6 100644
--- a/po-docs/uk/virt-tar-in.pod
+++ b/po-docs/uk/virt-tar-in.pod
@@ -70,5 +70,5 @@ any later version.
Ви маєте отримати копію GNU General Public License разом з цією програмою;
якщо це не так, повідомте про факт за адресою Free Software Foundation,
-Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/po-docs/uk/virt-tar-out.1 b/po-docs/uk/virt-tar-out.1
index 54c91a1..ddb96e2 100644
--- a/po-docs/uk/virt-tar-out.1
+++ b/po-docs/uk/virt-tar-out.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-tar-out 1"
-.TH virt-tar-out 1 "2011-11-03" "libguestfs-1.15.2" "Virtualization Support"
+.TH virt-tar-out 1 "2011-11-09" "libguestfs-1.15.3" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -125,4 +125,4 @@ any later version.
.PP
Ви маєте отримати копію \s-1GNU\s0 General Public License разом з цією програмою;
якщо це не так, повідомте про факт за адресою Free Software Foundation,
-Inc., 675 Mass Ave, Cambridge, \s-1MA\s0 02139, \s-1USA\s0.
+Inc., 51 Franklin Street, Fifth Floor, Boston, \s-1MA\s0 02110\-1301 \s-1USA\s0.
diff --git a/po-docs/uk/virt-tar-out.pod b/po-docs/uk/virt-tar-out.pod
index b40b488..a84f88e 100644
--- a/po-docs/uk/virt-tar-out.pod
+++ b/po-docs/uk/virt-tar-out.pod
@@ -62,5 +62,5 @@ any later version.
Ви маєте отримати копію GNU General Public License разом з цією програмою;
якщо це не так, повідомте про факт за адресою Free Software Foundation,
-Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/po-docs/uk/virt-tar.1 b/po-docs/uk/virt-tar.1
index 2d81ed0..27ac26c 100644
--- a/po-docs/uk/virt-tar.1
+++ b/po-docs/uk/virt-tar.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-tar.pl 1"
-.TH virt-tar.pl 1 "2011-11-03" "libguestfs-1.15.2" "Virtualization Support"
+.TH virt-tar.pl 1 "2011-11-09" "libguestfs-1.15.3" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -224,4 +224,4 @@ any later version.
.PP
Ви маєте отримати копію \s-1GNU\s0 General Public License разом з цією програмою;
якщо це не так, повідомте про факт за адресою Free Software Foundation,
-Inc., 675 Mass Ave, Cambridge, \s-1MA\s0 02139, \s-1USA\s0.
+Inc., 51 Franklin Street, Fifth Floor, Boston, \s-1MA\s0 02110\-1301 \s-1USA\s0.
diff --git a/po-docs/uk/virt-tar.pl b/po-docs/uk/virt-tar.pl
index 8f103f6..7b2b273 100644
--- a/po-docs/uk/virt-tar.pl
+++ b/po-docs/uk/virt-tar.pl
@@ -164,5 +164,5 @@ any later version.
Ви маєте отримати копію GNU General Public License разом з цією програмою;
якщо це не так, повідомте про факт за адресою Free Software Foundation,
-Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/po-docs/uk/virt-win-reg.1 b/po-docs/uk/virt-win-reg.1
index a42666b..cf5b0aa 100644
--- a/po-docs/uk/virt-win-reg.1
+++ b/po-docs/uk/virt-win-reg.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-win-reg.pl 1"
-.TH virt-win-reg.pl 1 "2011-11-03" "libguestfs-1.15.2" "Virtualization Support"
+.TH virt-win-reg.pl 1 "2011-11-09" "libguestfs-1.15.3" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -456,4 +456,4 @@ any later version.
.PP
Ви маєте отримати копію \s-1GNU\s0 General Public License разом з цією програмою;
якщо це не так, повідомте про факт за адресою Free Software Foundation,
-Inc., 675 Mass Ave, Cambridge, \s-1MA\s0 02139, \s-1USA\s0.
+Inc., 51 Franklin Street, Fifth Floor, Boston, \s-1MA\s0 02110\-1301 \s-1USA\s0.
diff --git a/po-docs/uk/virt-win-reg.pl b/po-docs/uk/virt-win-reg.pl
index 23ad0d5..f58c777 100644
--- a/po-docs/uk/virt-win-reg.pl
+++ b/po-docs/uk/virt-win-reg.pl
@@ -394,5 +394,5 @@ any later version.
Ви маєте отримати копію GNU General Public License разом з цією програмою;
якщо це не так, повідомте про факт за адресою Free Software Foundation,
-Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/po/en_GB.gmo b/po/en_GB.gmo
index a65f600..a5d9a17 100644
Binary files a/po/en_GB.gmo and b/po/en_GB.gmo differ
diff --git a/po/en_GB.po b/po/en_GB.po
index d7d7934..4228f3f 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2011-11-03 14:10+0000\n"
+"POT-Creation-Date: 2011-11-09 22:24+0000\n"
"PO-Revision-Date: 2011-10-27 09:11+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: English (United Kingdom) (http://www.transifex.net/projects/p/"
diff --git a/po/es.gmo b/po/es.gmo
index 01e5881..919fb92 100644
Binary files a/po/es.gmo and b/po/es.gmo differ
diff --git a/po/es.po b/po/es.po
index 1ede021..2720b63 100644
--- a/po/es.po
+++ b/po/es.po
@@ -10,7 +10,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2011-11-03 14:10+0000\n"
+"POT-Creation-Date: 2011-11-09 22:24+0000\n"
"PO-Revision-Date: 2011-10-27 09:11+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Spanish (Castilian) <trans-es at lists.fedoraproject.org>\n"
diff --git a/po/gu.gmo b/po/gu.gmo
index a9f071c..7d517c9 100644
Binary files a/po/gu.gmo and b/po/gu.gmo differ
diff --git a/po/gu.po b/po/gu.po
index d04204f..5b1b54e 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -10,7 +10,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2011-11-03 14:10+0000\n"
+"POT-Creation-Date: 2011-11-09 22:24+0000\n"
"PO-Revision-Date: 2011-10-27 09:11+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Gujarati <trans-gu at lists.fedoraproject.org>\n"
diff --git a/po/hi.gmo b/po/hi.gmo
index 88215a9..39db7ad 100644
Binary files a/po/hi.gmo and b/po/hi.gmo differ
diff --git a/po/hi.po b/po/hi.po
index b51da58..c373d1a 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -10,7 +10,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2011-11-03 14:10+0000\n"
+"POT-Creation-Date: 2011-11-09 22:24+0000\n"
"PO-Revision-Date: 2011-10-27 09:11+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Hindi <indlinux-hindi at lists.sourceforge.net>\n"
diff --git a/po/kn.gmo b/po/kn.gmo
index 2bb90eb..474fb60 100644
Binary files a/po/kn.gmo and b/po/kn.gmo differ
diff --git a/po/kn.po b/po/kn.po
index 9f3053c..2419c21 100644
--- a/po/kn.po
+++ b/po/kn.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2011-11-03 14:10+0000\n"
+"POT-Creation-Date: 2011-11-09 22:24+0000\n"
"PO-Revision-Date: 2011-10-27 09:11+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Kannada (http://www.transifex.net/projects/p/fedora/team/"
diff --git a/po/libguestfs.pot b/po/libguestfs.pot
index 0bb8ef7..85c426c 100644
--- a/po/libguestfs.pot
+++ b/po/libguestfs.pot
@@ -6,10 +6,10 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: libguestfs 1.15.2\n"
+"Project-Id-Version: libguestfs 1.15.3\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2011-11-03 14:10+0000\n"
+"POT-Creation-Date: 2011-11-09 22:24+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
diff --git a/po/ml.gmo b/po/ml.gmo
index c71d191..bfeca78 100644
Binary files a/po/ml.gmo and b/po/ml.gmo differ
diff --git a/po/ml.po b/po/ml.po
index 0679b84..536b09a 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2011-11-03 14:10+0000\n"
+"POT-Creation-Date: 2011-11-09 22:24+0000\n"
"PO-Revision-Date: 2011-10-27 09:11+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Malayalam <discuss at lists.smc.org.in>\n"
diff --git a/po/mr.gmo b/po/mr.gmo
index 5acb88f..042f415 100644
Binary files a/po/mr.gmo and b/po/mr.gmo differ
diff --git a/po/mr.po b/po/mr.po
index d2149f8..804cf67 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -10,7 +10,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2011-11-03 14:10+0000\n"
+"POT-Creation-Date: 2011-11-09 22:24+0000\n"
"PO-Revision-Date: 2011-10-27 09:11+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Marathi (http://www.transifex.net/projects/p/fedora/team/"
diff --git a/po/nl.gmo b/po/nl.gmo
index d67a4db..d6ec098 100644
Binary files a/po/nl.gmo and b/po/nl.gmo differ
diff --git a/po/nl.po b/po/nl.po
index 3e1bddd..df536b1 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -11,7 +11,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2011-11-03 14:10+0000\n"
+"POT-Creation-Date: 2011-11-09 22:24+0000\n"
"PO-Revision-Date: 2011-10-27 09:11+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Dutch (http://www.transifex.net/projects/p/fedora/team/nl/)\n"
diff --git a/po/or.gmo b/po/or.gmo
index 0f15442..89270b9 100644
Binary files a/po/or.gmo and b/po/or.gmo differ
diff --git a/po/or.po b/po/or.po
index 7f23c3e..4e54d54 100644
--- a/po/or.po
+++ b/po/or.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2011-11-03 14:10+0000\n"
+"POT-Creation-Date: 2011-11-09 22:24+0000\n"
"PO-Revision-Date: 2011-10-27 09:11+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Oriya (http://www.transifex.net/projects/p/fedora/team/or/)\n"
diff --git a/po/pa.gmo b/po/pa.gmo
index 9c310a1..4a809b1 100644
Binary files a/po/pa.gmo and b/po/pa.gmo differ
diff --git a/po/pa.po b/po/pa.po
index f824234..a20b13c 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -10,7 +10,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2011-11-03 14:10+0000\n"
+"POT-Creation-Date: 2011-11-09 22:24+0000\n"
"PO-Revision-Date: 2011-10-27 09:11+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Panjabi (Punjabi) <punjabi-users at lists.sf.net>\n"
diff --git a/po/pl.gmo b/po/pl.gmo
index c2fd88d..7c5c397 100644
Binary files a/po/pl.gmo and b/po/pl.gmo differ
diff --git a/po/pl.po b/po/pl.po
index ee6b419..4381b0e 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -10,7 +10,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2011-11-03 14:10+0000\n"
+"POT-Creation-Date: 2011-11-09 22:24+0000\n"
"PO-Revision-Date: 2011-10-27 09:11+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Polish (http://www.transifex.net/projects/p/fedora/team/pl/)\n"
diff --git a/po/ta.gmo b/po/ta.gmo
index 068a292..a4f3c46 100644
Binary files a/po/ta.gmo and b/po/ta.gmo differ
diff --git a/po/ta.po b/po/ta.po
index c47da42..aa250e6 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2011-11-03 14:10+0000\n"
+"POT-Creation-Date: 2011-11-09 22:24+0000\n"
"PO-Revision-Date: 2011-10-27 09:11+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Tamil <tamil-users at lists.fedoraproject.org>\n"
diff --git a/po/te.gmo b/po/te.gmo
index 17ebc13..6ba8eb7 100644
Binary files a/po/te.gmo and b/po/te.gmo differ
diff --git a/po/te.po b/po/te.po
index 4e140be..9009897 100644
--- a/po/te.po
+++ b/po/te.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2011-11-03 14:10+0000\n"
+"POT-Creation-Date: 2011-11-09 22:24+0000\n"
"PO-Revision-Date: 2011-10-27 09:11+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Telugu (http://www.transifex.net/projects/p/fedora/team/te/)\n"
diff --git a/po/uk.gmo b/po/uk.gmo
index a7d96e6..47d8ca8 100644
Binary files a/po/uk.gmo and b/po/uk.gmo differ
diff --git a/po/uk.po b/po/uk.po
index 534c9b8..d1c728a 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2011-11-03 14:10+0000\n"
+"POT-Creation-Date: 2011-11-09 22:24+0000\n"
"PO-Revision-Date: 2011-10-27 09:11+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Ukrainian <trans-uk at lists.fedoraproject.org>\n"
diff --git a/podwrapper.sh.in b/podwrapper.sh.in
index 9accaf9..967f44c 100755
--- a/podwrapper.sh.in
+++ b/podwrapper.sh.in
@@ -15,7 +15,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# Wrapper script around POD utilities which can include files in the
# POD and controls HTML generation.
diff --git a/python/Makefile.am b/python/Makefile.am
index 2f543e7..bbccb1a 100644
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# Old RHEL 5 autoconf doesn't have builddir.
builddir ?= $(top_builddir)/python
diff --git a/python/Makefile.in b/python/Makefile.in
index 1115be2..60c0c14 100644
--- a/python/Makefile.in
+++ b/python/Makefile.in
@@ -30,7 +30,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# libguestfs
# Copyright (C) 2009 Red Hat Inc.
@@ -47,7 +47,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
VPATH = @srcdir@
diff --git a/python/examples/Makefile.am b/python/examples/Makefile.am
index 434c8f7..efd634c 100644
--- a/python/examples/Makefile.am
+++ b/python/examples/Makefile.am
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
EXTRA_DIST = \
LICENSE \
diff --git a/python/examples/Makefile.in b/python/examples/Makefile.in
index 919ad15..7eddafb 100644
--- a/python/examples/Makefile.in
+++ b/python/examples/Makefile.in
@@ -30,7 +30,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
diff --git a/python/run-bindtests b/python/run-bindtests
index cf28bb6..8670387 100755
--- a/python/run-bindtests
+++ b/python/run-bindtests
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
set -e
diff --git a/python/run-python-tests b/python/run-python-tests
index f82dc10..528dc2e 100755
--- a/python/run-python-tests
+++ b/python/run-python-tests
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
set -e
diff --git a/python/t/005-import.py b/python/t/005-import.py
index 5896d15..36accf8 100644
--- a/python/t/005-import.py
+++ b/python/t/005-import.py
@@ -13,6 +13,6 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
import guestfs
diff --git a/python/t/010-basic.py b/python/t/010-basic.py
index db2d950..e123f29 100644
--- a/python/t/010-basic.py
+++ b/python/t/010-basic.py
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
import os
import guestfs
diff --git a/python/t/060-optargs.py b/python/t/060-optargs.py
index 78d07c8..aae343d 100644
--- a/python/t/060-optargs.py
+++ b/python/t/060-optargs.py
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
import os
import guestfs
diff --git a/python/t/400-events.py b/python/t/400-events.py
index 1c29b00..9f96fb0 100644
--- a/python/t/400-events.py
+++ b/python/t/400-events.py
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
import os
import guestfs
diff --git a/python/t/800-explicit-close.py b/python/t/800-explicit-close.py
index 291534d..4ed6774 100644
--- a/python/t/800-explicit-close.py
+++ b/python/t/800-explicit-close.py
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# Test implicit vs explicit closes of the handle (RHBZ#717786).
diff --git a/regressions/Makefile.am b/regressions/Makefile.am
index 250fd64..0af7e8c 100644
--- a/regressions/Makefile.am
+++ b/regressions/Makefile.am
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# Regression tests and other important tests which are not
# specific to the C API. We can write these more easily in
diff --git a/regressions/Makefile.in b/regressions/Makefile.in
index 18ed706..3872653 100644
--- a/regressions/Makefile.in
+++ b/regressions/Makefile.in
@@ -30,7 +30,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# Regression tests and other important tests which are not
# specific to the C API. We can write these more easily in
@@ -53,7 +53,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
diff --git a/regressions/rhbz501893.c b/regressions/rhbz501893.c
index aa75271..86e85e5 100644
--- a/regressions/rhbz501893.c
+++ b/regressions/rhbz501893.c
@@ -14,7 +14,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/regressions/rhbz503169c13.sh b/regressions/rhbz503169c13.sh
index a1a84c6..f1cfa5e 100755
--- a/regressions/rhbz503169c13.sh
+++ b/regressions/rhbz503169c13.sh
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# Regression test for:
# https://bugzilla.redhat.com/show_bug.cgi?id=503169#c13
diff --git a/regressions/rhbz557655.sh b/regressions/rhbz557655.sh
index 2bc10cd..df3ceaa 100755
--- a/regressions/rhbz557655.sh
+++ b/regressions/rhbz557655.sh
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# Regression test for:
# https://bugzilla.redhat.com/show_bug.cgi?id=557655
diff --git a/regressions/rhbz576879.sh b/regressions/rhbz576879.sh
index d3db55b..6b7219c 100755
--- a/regressions/rhbz576879.sh
+++ b/regressions/rhbz576879.sh
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# Regression test for:
# https://bugzilla.redhat.com/show_bug.cgi?id=576879#c0
diff --git a/regressions/rhbz578407.sh b/regressions/rhbz578407.sh
index 6ab2d5d..cc010b7 100755
--- a/regressions/rhbz578407.sh
+++ b/regressions/rhbz578407.sh
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# Regression test for:
# https://bugzilla.redhat.com/show_bug.cgi?id=578407
diff --git a/regressions/rhbz580246.sh b/regressions/rhbz580246.sh
index 707231e..0e5dbc6 100755
--- a/regressions/rhbz580246.sh
+++ b/regressions/rhbz580246.sh
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# Test tar_in call when we upload something which is larger than
# available space.
diff --git a/regressions/rhbz602997.sh b/regressions/rhbz602997.sh
index 42fd3cb..61b9df6 100755
--- a/regressions/rhbz602997.sh
+++ b/regressions/rhbz602997.sh
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# https://bugzilla.redhat.com/show_bug.cgi?id=602997
# Fix part-get-bootable to work with missing/unordered partitions.
diff --git a/regressions/rhbz690819.sh b/regressions/rhbz690819.sh
index f4c10ed..251cc8d 100755
--- a/regressions/rhbz690819.sh
+++ b/regressions/rhbz690819.sh
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# https://bugzilla.redhat.com/show_bug.cgi?id=690819
# mkfs fails creating a filesytem on a disk device when using a disk
diff --git a/regressions/tell-user-to-ignore-errors.sh b/regressions/tell-user-to-ignore-errors.sh
index b17bf75..6564288 100755
--- a/regressions/tell-user-to-ignore-errors.sh
+++ b/regressions/tell-user-to-ignore-errors.sh
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
echo
echo '*****'
diff --git a/regressions/test-add-domain.sh b/regressions/test-add-domain.sh
index 7616c38..6154a75 100755
--- a/regressions/test-add-domain.sh
+++ b/regressions/test-add-domain.sh
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# Test add-domain command.
diff --git a/regressions/test-bootbootboot.sh b/regressions/test-bootbootboot.sh
index d3a30a3..476cfdb 100755
--- a/regressions/test-bootbootboot.sh
+++ b/regressions/test-bootbootboot.sh
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# Some versions of qemu can be flakey and can hang occasionally
# during boot (particularly KVM if the BIOS is the qemu version
diff --git a/regressions/test-both-ends-cancel.sh b/regressions/test-both-ends-cancel.sh
index 817e098..aa39226 100755
--- a/regressions/test-both-ends-cancel.sh
+++ b/regressions/test-both-ends-cancel.sh
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# Regression test for:
# https://bugzilla.redhat.com/show_bug.cgi?id=576879#c5
diff --git a/regressions/test-cancellation-download-librarycancels.sh b/regressions/test-cancellation-download-librarycancels.sh
index 5f6ebf1..117794d 100755
--- a/regressions/test-cancellation-download-librarycancels.sh
+++ b/regressions/test-cancellation-download-librarycancels.sh
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# Test download where the library cancels.
#
diff --git a/regressions/test-cancellation-upload-daemoncancels.sh b/regressions/test-cancellation-upload-daemoncancels.sh
index 605d70f..179ea30 100755
--- a/regressions/test-cancellation-upload-daemoncancels.sh
+++ b/regressions/test-cancellation-upload-daemoncancels.sh
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# Test upload where the daemon cancels.
#
diff --git a/regressions/test-copy.sh b/regressions/test-copy.sh
index 22e5c90..ea6a4cc 100755
--- a/regressions/test-copy.sh
+++ b/regressions/test-copy.sh
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# Test guestfish copy-in and copy-out commands.
diff --git a/regressions/test-find0.sh b/regressions/test-find0.sh
index e2bd89e..726469c 100755
--- a/regressions/test-find0.sh
+++ b/regressions/test-find0.sh
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# Test find0 call.
diff --git a/regressions/test-guestfish-a.sh b/regressions/test-guestfish-a.sh
index 064b268..4fd45f7 100755
--- a/regressions/test-guestfish-a.sh
+++ b/regressions/test-guestfish-a.sh
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# Test guestfish -a option.
diff --git a/regressions/test-guestfish-d.sh b/regressions/test-guestfish-d.sh
index ab03944..41f1609 100755
--- a/regressions/test-guestfish-d.sh
+++ b/regressions/test-guestfish-d.sh
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# Test guestfish -d option.
diff --git a/regressions/test-guestfish-escapes.sh b/regressions/test-guestfish-escapes.sh
index 3ba37d2..73f41d5 100755
--- a/regressions/test-guestfish-escapes.sh
+++ b/regressions/test-guestfish-escapes.sh
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# Test guestfish string escapes.
diff --git a/regressions/test-guestfish-tilde.sh b/regressions/test-guestfish-tilde.sh
index 8ba5904..aed4431 100755
--- a/regressions/test-guestfish-tilde.sh
+++ b/regressions/test-guestfish-tilde.sh
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# Test guestfish tilde expansion.
# RHBZ#617440 guestfish: fails to tilde expand '~' when the $HOME env is unset
diff --git a/regressions/test-inspect-fstab.sh b/regressions/test-inspect-fstab.sh
index 26ea10f..332cde0 100755
--- a/regressions/test-inspect-fstab.sh
+++ b/regressions/test-inspect-fstab.sh
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# Test various aspects of core inspection of /etc/fstab.
# This also tests: https://bugzilla.redhat.com/668574
diff --git a/regressions/test-launch-race.pl b/regressions/test-launch-race.pl
index 892353e..297c1b6 100755
--- a/regressions/test-launch-race.pl
+++ b/regressions/test-launch-race.pl
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# Test that 2 simultaneous launches in a clean cache directory will both succeed
diff --git a/regressions/test-luks-list.sh b/regressions/test-luks-list.sh
index 9c51464..9385a4c 100755
--- a/regressions/test-luks-list.sh
+++ b/regressions/test-luks-list.sh
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# Test LUKS devices appear in the output of list-dm-devices.
diff --git a/regressions/test-luks.sh b/regressions/test-luks.sh
index 5b53bc8..fcf9d70 100755
--- a/regressions/test-luks.sh
+++ b/regressions/test-luks.sh
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# Test LUKS device creation, opening, key slots.
diff --git a/regressions/test-lvm-filtering.sh b/regressions/test-lvm-filtering.sh
index d7c4e7c..7644bbe 100755
--- a/regressions/test-lvm-filtering.sh
+++ b/regressions/test-lvm-filtering.sh
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# Test LVM device filtering.
diff --git a/regressions/test-lvm-mapping.pl b/regressions/test-lvm-mapping.pl
index 7af2842..3e6faa5 100755
--- a/regressions/test-lvm-mapping.pl
+++ b/regressions/test-lvm-mapping.pl
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# Test the discovery of relationships between LVM PVs, VGs and LVs.
diff --git a/regressions/test-noexec-stack.pl b/regressions/test-noexec-stack.pl
index 3bdfc16..6de0b57 100755
--- a/regressions/test-noexec-stack.pl
+++ b/regressions/test-noexec-stack.pl
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
use strict;
use warnings;
diff --git a/regressions/test-qemudie-killsub.sh b/regressions/test-qemudie-killsub.sh
index 9f78953..8ee7ae8 100755
--- a/regressions/test-qemudie-killsub.sh
+++ b/regressions/test-qemudie-killsub.sh
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# Test if we can handle qemu death from the kill-subprocess command.
diff --git a/regressions/test-qemudie-launchfail.sh b/regressions/test-qemudie-launchfail.sh
index 15e62fb..e3fcb82 100755
--- a/regressions/test-qemudie-launchfail.sh
+++ b/regressions/test-qemudie-launchfail.sh
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# Test if we can handle qemu failure during launch.
diff --git a/regressions/test-qemudie-midcommand.sh b/regressions/test-qemudie-midcommand.sh
index 47cad04..cdf3f03 100755
--- a/regressions/test-qemudie-midcommand.sh
+++ b/regressions/test-qemudie-midcommand.sh
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# Test if we can handle qemu death in the middle of a command.
diff --git a/regressions/test-qemudie-synch.sh b/regressions/test-qemudie-synch.sh
index fcc2e50..697c83b 100755
--- a/regressions/test-qemudie-synch.sh
+++ b/regressions/test-qemudie-synch.sh
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# Test if we can handle qemu death synchronously.
diff --git a/regressions/test-read_file.sh b/regressions/test-read_file.sh
index 71b8957..cd016e3 100755
--- a/regressions/test-read_file.sh
+++ b/regressions/test-read_file.sh
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# Test read_file call.
diff --git a/regressions/test-remote.sh b/regressions/test-remote.sh
index 40c2ee9..ff5b85a 100755
--- a/regressions/test-remote.sh
+++ b/regressions/test-remote.sh
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# Test remote control of guestfish.
diff --git a/regressions/test-reopen.sh b/regressions/test-reopen.sh
index 90774c9..321f2a0 100755
--- a/regressions/test-reopen.sh
+++ b/regressions/test-reopen.sh
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# Test reopening the handle in the same process. This used to fail
# but was corrected in 03e1f74ee08dc71bc09cc7655bf4732685f80b43.
diff --git a/regressions/test-stringlist.sh b/regressions/test-stringlist.sh
index 06b5bc2..1aa953b 100755
--- a/regressions/test-stringlist.sh
+++ b/regressions/test-stringlist.sh
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# Test remote control of guestfish.
diff --git a/regressions/test-upload-to-dir.sh b/regressions/test-upload-to-dir.sh
index 03cce5b..41ce5e5 100755
--- a/regressions/test-upload-to-dir.sh
+++ b/regressions/test-upload-to-dir.sh
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# If you used the guestfish command 'upload' and accidentally set the
# target to a directory instead of the full filename, then previously
diff --git a/rescue/Makefile.am b/rescue/Makefile.am
index 85a70f9..cf173ce 100644
--- a/rescue/Makefile.am
+++ b/rescue/Makefile.am
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
include $(top_srcdir)/subdir-rules.mk
diff --git a/rescue/Makefile.in b/rescue/Makefile.in
index 60bd3c8..e5d2293 100644
--- a/rescue/Makefile.in
+++ b/rescue/Makefile.in
@@ -30,7 +30,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# libguestfs
# Copyright (C) 2009 Red Hat Inc.
@@ -47,7 +47,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
VPATH = @srcdir@
diff --git a/rescue/virt-rescue.c b/rescue/virt-rescue.c
index 0c00364..9a354b8 100644
--- a/rescue/virt-rescue.c
+++ b/rescue/virt-rescue.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/rescue/virt-rescue.pod b/rescue/virt-rescue.pod
index dc139dc..050db48 100755
--- a/rescue/virt-rescue.pod
+++ b/rescue/virt-rescue.pod
@@ -351,4 +351,4 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/resize/Makefile.am b/resize/Makefile.am
index 69103d6..5046a8c 100644
--- a/resize/Makefile.am
+++ b/resize/Makefile.am
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
include $(top_srcdir)/subdir-rules.mk
diff --git a/resize/Makefile.in b/resize/Makefile.in
index d91cc1d..26312a9 100644
--- a/resize/Makefile.in
+++ b/resize/Makefile.in
@@ -30,7 +30,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# libguestfs
# Copyright (C) 2009 Red Hat Inc.
@@ -47,7 +47,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
VPATH = @srcdir@
diff --git a/resize/progress_c.c b/resize/progress_c.c
index 52e653b..2f25bbc 100644
--- a/resize/progress_c.c
+++ b/resize/progress_c.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/resize/test-virt-resize.sh b/resize/test-virt-resize.sh
index 2d5cce9..2b76e0b 100755
--- a/resize/test-virt-resize.sh
+++ b/resize/test-virt-resize.sh
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
export LANG=C
set -e
diff --git a/resize/virt-resize.pod b/resize/virt-resize.pod
index 65bb257..abf190e 100644
--- a/resize/virt-resize.pod
+++ b/resize/virt-resize.pod
@@ -728,4 +728,4 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/ruby/Makefile.am b/ruby/Makefile.am
index a2e962d..88d3323 100644
--- a/ruby/Makefile.am
+++ b/ruby/Makefile.am
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
include $(top_srcdir)/subdir-rules.mk
diff --git a/ruby/Makefile.in b/ruby/Makefile.in
index 3c1a989..33da059 100644
--- a/ruby/Makefile.in
+++ b/ruby/Makefile.in
@@ -30,7 +30,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# libguestfs
# Copyright (C) 2009 Red Hat Inc.
@@ -47,7 +47,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
diff --git a/ruby/Rakefile.in b/ruby/Rakefile.in
index ccbcae1..7c5a63a 100644
--- a/ruby/Rakefile.in
+++ b/ruby/Rakefile.in
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
require 'rake/clean'
require 'rake/rdoctask'
diff --git a/ruby/examples/Makefile.am b/ruby/examples/Makefile.am
index 7183e80..1e0e5a4 100644
--- a/ruby/examples/Makefile.am
+++ b/ruby/examples/Makefile.am
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
EXTRA_DIST = \
LICENSE \
diff --git a/ruby/examples/Makefile.in b/ruby/examples/Makefile.in
index 6cd0ff0..910b208 100644
--- a/ruby/examples/Makefile.in
+++ b/ruby/examples/Makefile.in
@@ -30,7 +30,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
diff --git a/ruby/ext/guestfs/extconf.rb b/ruby/ext/guestfs/extconf.rb
index cc053aa..d86e26d 100644
--- a/ruby/ext/guestfs/extconf.rb
+++ b/ruby/ext/guestfs/extconf.rb
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
require 'mkmf'
diff --git a/ruby/run-bindtests b/ruby/run-bindtests
index 3bfa226..a78b5f6 100755
--- a/ruby/run-bindtests
+++ b/ruby/run-bindtests
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
set -e
diff --git a/ruby/run-ruby-tests b/ruby/run-ruby-tests
index 643bff9..e21899a 100755
--- a/ruby/run-ruby-tests
+++ b/ruby/run-ruby-tests
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
set -e
diff --git a/ruby/tests/tc_010_load.rb b/ruby/tests/tc_010_load.rb
index 6d882db..80c1e03 100644
--- a/ruby/tests/tc_010_load.rb
+++ b/ruby/tests/tc_010_load.rb
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
require 'test/unit'
$:.unshift(File::join(File::dirname(__FILE__), "..", "lib"))
diff --git a/ruby/tests/tc_050_lvcreate.rb b/ruby/tests/tc_050_lvcreate.rb
index 37ae94d..4e9c957 100644
--- a/ruby/tests/tc_050_lvcreate.rb
+++ b/ruby/tests/tc_050_lvcreate.rb
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
require 'test/unit'
$:.unshift(File::join(File::dirname(__FILE__), "..", "lib"))
diff --git a/ruby/tests/tc_060_optargs.rb b/ruby/tests/tc_060_optargs.rb
index 232286a..de411d6 100644
--- a/ruby/tests/tc_060_optargs.rb
+++ b/ruby/tests/tc_060_optargs.rb
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
require 'test/unit'
$:.unshift(File::join(File::dirname(__FILE__), "..", "lib"))
diff --git a/ruby/tests/tc_400_events.rb b/ruby/tests/tc_400_events.rb
index 612dc92..4e04570 100644
--- a/ruby/tests/tc_400_events.rb
+++ b/ruby/tests/tc_400_events.rb
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
require 'test/unit'
$:.unshift(File::join(File::dirname(__FILE__), "..", "lib"))
diff --git a/ruby/tests/tc_rhbz507346.rb b/ruby/tests/tc_rhbz507346.rb
index 8c5b34f..6082201 100644
--- a/ruby/tests/tc_rhbz507346.rb
+++ b/ruby/tests/tc_rhbz507346.rb
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
require 'test/unit'
$:.unshift(File::join(File::dirname(__FILE__), "..", "lib"))
diff --git a/ruby/tests/tc_rhbz664558c6.rb b/ruby/tests/tc_rhbz664558c6.rb
index ec5cf49..290deac 100644
--- a/ruby/tests/tc_rhbz664558c6.rb
+++ b/ruby/tests/tc_rhbz664558c6.rb
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# Test that throwing an exception in a callback doesn't cause
# the interpreter to segfault. See:
diff --git a/run b/run
index 10a516c..d3ad1db 100755
--- a/run
+++ b/run
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#----------------------------------------------------------------------
diff --git a/run.in b/run.in
index d7b91d4..9388398 100755
--- a/run.in
+++ b/run.in
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#----------------------------------------------------------------------
diff --git a/sparsify/Makefile.am b/sparsify/Makefile.am
index ab90818..973bcb5 100644
--- a/sparsify/Makefile.am
+++ b/sparsify/Makefile.am
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
include $(top_srcdir)/subdir-rules.mk
diff --git a/sparsify/Makefile.in b/sparsify/Makefile.in
index 2cc989e..d11e272 100644
--- a/sparsify/Makefile.in
+++ b/sparsify/Makefile.in
@@ -30,7 +30,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# libguestfs
# Copyright (C) 2009 Red Hat Inc.
@@ -47,7 +47,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
VPATH = @srcdir@
diff --git a/sparsify/progress_c.c b/sparsify/progress_c.c
index 046ed34..8113728 100644
--- a/sparsify/progress_c.c
+++ b/sparsify/progress_c.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/sparsify/test-virt-sparsify.sh b/sparsify/test-virt-sparsify.sh
index 1fad58b..8d38775 100755
--- a/sparsify/test-virt-sparsify.sh
+++ b/sparsify/test-virt-sparsify.sh
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
export LANG=C
set -e
diff --git a/sparsify/virt-sparsify.pod b/sparsify/virt-sparsify.pod
index fc7fde1..9579640 100644
--- a/sparsify/virt-sparsify.pod
+++ b/sparsify/virt-sparsify.pod
@@ -281,4 +281,4 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/src/Makefile.am b/src/Makefile.am
index a5d7322..761fcb6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
include $(top_srcdir)/subdir-rules.mk
diff --git a/src/Makefile.in b/src/Makefile.in
index 25cd69e..750c910 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -30,7 +30,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# libguestfs
# Copyright (C) 2009 Red Hat Inc.
@@ -47,7 +47,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/src/api-support/update-from-tarballs.sh b/src/api-support/update-from-tarballs.sh
index 241cd16..cd797e4 100755
--- a/src/api-support/update-from-tarballs.sh
+++ b/src/api-support/update-from-tarballs.sh
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
if [ ! -f BUGS ]; then
echo "You should run this script from the top source directory."
diff --git a/subdir-rules.mk b/subdir-rules.mk
index bcfa9a5..d7c0dff 100644
--- a/subdir-rules.mk
+++ b/subdir-rules.mk
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# Define a force dependency which will always be rebuilt
.PHONY: force
diff --git a/test-tool/Makefile.am b/test-tool/Makefile.am
index 16daa7f..9ce5d4e 100644
--- a/test-tool/Makefile.am
+++ b/test-tool/Makefile.am
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
include $(top_srcdir)/subdir-rules.mk
diff --git a/test-tool/Makefile.in b/test-tool/Makefile.in
index d50db0d..fd98c04 100644
--- a/test-tool/Makefile.in
+++ b/test-tool/Makefile.in
@@ -30,7 +30,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# libguestfs
# Copyright (C) 2009 Red Hat Inc.
@@ -47,7 +47,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
diff --git a/test-tool/libguestfs-test-tool.pod b/test-tool/libguestfs-test-tool.pod
index c267484..9a92861 100644
--- a/test-tool/libguestfs-test-tool.pod
+++ b/test-tool/libguestfs-test-tool.pod
@@ -124,4 +124,4 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/test-tool/test-tool.c b/test-tool/test-tool.c
index e058dbc..27d66f7 100644
--- a/test-tool/test-tool.c
+++ b/test-tool/test-tool.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 5586bf8..2ecd0ee 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
include $(top_srcdir)/subdir-rules.mk
diff --git a/tools/Makefile.in b/tools/Makefile.in
index 51910c1..780dcff 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -30,7 +30,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# libguestfs
# Copyright (C) 2009 Red Hat Inc.
@@ -47,7 +47,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
VPATH = @srcdir@
diff --git a/tools/test-virt-make-fs.sh b/tools/test-virt-make-fs.sh
index e049dfe..072269c 100755
--- a/tools/test-virt-make-fs.sh
+++ b/tools/test-virt-make-fs.sh
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
export LANG=C
set -e
diff --git a/tools/virt-list-filesystems b/tools/virt-list-filesystems
index 50f95f2..6638e62 100755
--- a/tools/virt-list-filesystems
+++ b/tools/virt-list-filesystems
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
use warnings;
use strict;
@@ -225,4 +225,4 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/tools/virt-list-partitions b/tools/virt-list-partitions
index 496116f..3b8ee4b 100755
--- a/tools/virt-list-partitions
+++ b/tools/virt-list-partitions
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
use warnings;
use strict;
@@ -294,4 +294,4 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/tools/virt-make-fs b/tools/virt-make-fs
index d97d262..d4e231b 100755
--- a/tools/virt-make-fs
+++ b/tools/virt-make-fs
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
use warnings;
use strict;
@@ -599,4 +599,4 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/tools/virt-tar b/tools/virt-tar
index 6b7fcd8..39a12cb 100755
--- a/tools/virt-tar
+++ b/tools/virt-tar
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
use warnings;
use strict;
@@ -328,4 +328,4 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/tools/virt-win-reg b/tools/virt-win-reg
index 1063617..ab5daa7 100755
--- a/tools/virt-win-reg
+++ b/tools/virt-win-reg
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
use warnings;
use strict;
@@ -800,4 +800,4 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/update-bugs.sh b/update-bugs.sh
index 7d50ae4..8b14b6e 100755
--- a/update-bugs.sh
+++ b/update-bugs.sh
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# In 'make dist' this is used to update the top level 'BUGS' file with
# the current bug list from Red Hat Bugzilla (bugzilla.redhat.com).
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libguestfs.git
More information about the Pkg-libvirt-commits
mailing list