summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard W.M. Jones <rjones@redhat.com>2012-07-19 14:28:15 +0100
committerRichard W.M. Jones <rjones@redhat.com>2012-08-05 22:48:51 +0100
commit23beb95042ddaa38da74d34b0d43bb5e760cb782 (patch)
tree47a24a9b5a9a4c11bc3ca6547eed91407ee98010
parent022757ea0bb220a2af33fba6ba49d2e35661380b (diff)
downloadlibguestfs-23beb95042ddaa38da74d34b0d43bb5e760cb782.tar.gz
libguestfs-23beb95042ddaa38da74d34b0d43bb5e760cb782.tar.xz
libguestfs-23beb95042ddaa38da74d34b0d43bb5e760cb782.zip
fish: Rename fish/virt.c to fish/domain.c
This file handles the -d option for guestfish and other C command line utilities. Renaming this file makes it less confusing. (cherry picked from commit 6054051a9d8a5eee4141ca4b12aa5b7d1f36f56d)
-rw-r--r--align/Makefile.am4
-rw-r--r--cat/Makefile.am4
-rw-r--r--df/Makefile.am4
-rw-r--r--edit/Makefile.am4
-rw-r--r--fish/Makefile.am4
-rw-r--r--fish/domain.c (renamed from fish/virt.c)0
-rw-r--r--format/Makefile.am4
-rw-r--r--fuse/Makefile.am4
-rw-r--r--inspector/Makefile.am4
-rw-r--r--po/POTFILES.in2
-rw-r--r--rescue/Makefile.am4
11 files changed, 19 insertions, 19 deletions
diff --git a/align/Makefile.am b/align/Makefile.am
index e74b4dfc..4b5f8014 100644
--- a/align/Makefile.am
+++ b/align/Makefile.am
@@ -26,11 +26,11 @@ bin_PROGRAMS = virt-alignment-scan
SHARED_SOURCE_FILES = \
../fish/config.c \
+ ../fish/domain.c \
../fish/inspect.c \
../fish/keys.c \
../fish/options.h \
- ../fish/options.c \
- ../fish/virt.c
+ ../fish/options.c
virt_alignment_scan_SOURCES = \
$(SHARED_SOURCE_FILES) \
diff --git a/cat/Makefile.am b/cat/Makefile.am
index d2660c7a..8e7b44e8 100644
--- a/cat/Makefile.am
+++ b/cat/Makefile.am
@@ -31,11 +31,11 @@ bin_PROGRAMS = virt-cat virt-filesystems virt-ls
SHARED_SOURCE_FILES = \
../fish/config.c \
+ ../fish/domain.c \
../fish/inspect.c \
../fish/keys.c \
../fish/options.h \
- ../fish/options.c \
- ../fish/virt.c
+ ../fish/options.c
virt_cat_SOURCES = \
$(SHARED_SOURCE_FILES) \
diff --git a/df/Makefile.am b/df/Makefile.am
index fc08ee8c..3d334041 100644
--- a/df/Makefile.am
+++ b/df/Makefile.am
@@ -28,11 +28,11 @@ bin_PROGRAMS = virt-df
SHARED_SOURCE_FILES = \
../fish/config.c \
+ ../fish/domain.c \
../fish/inspect.c \
../fish/keys.c \
../fish/options.h \
- ../fish/options.c \
- ../fish/virt.c
+ ../fish/options.c
virt_df_SOURCES = \
$(SHARED_SOURCE_FILES) \
diff --git a/edit/Makefile.am b/edit/Makefile.am
index 26876a92..d5911a89 100644
--- a/edit/Makefile.am
+++ b/edit/Makefile.am
@@ -27,11 +27,11 @@ bin_PROGRAMS = virt-edit
SHARED_SOURCE_FILES = \
../fish/config.c \
+ ../fish/domain.c \
../fish/inspect.c \
../fish/keys.c \
../fish/options.h \
- ../fish/options.c \
- ../fish/virt.c
+ ../fish/options.c
virt_edit_SOURCES = \
$(SHARED_SOURCE_FILES) \
diff --git a/fish/Makefile.am b/fish/Makefile.am
index a69dc4d1..c679242e 100644
--- a/fish/Makefile.am
+++ b/fish/Makefile.am
@@ -64,13 +64,13 @@ EXTRA_DIST = \
# files must not include other guestfish files.
SHARED_SOURCE_FILES = \
config.c \
+ domain.c \
inspect.c \
keys.c \
options.h \
options.c \
progress.h \
- progress.c \
- virt.c
+ progress.c
guestfish_SOURCES = \
$(generator_built) \
diff --git a/fish/virt.c b/fish/domain.c
index 083ea656..083ea656 100644
--- a/fish/virt.c
+++ b/fish/domain.c
diff --git a/format/Makefile.am b/format/Makefile.am
index 5d1dfb00..634d0f9f 100644
--- a/format/Makefile.am
+++ b/format/Makefile.am
@@ -26,11 +26,11 @@ bin_PROGRAMS = virt-format
SHARED_SOURCE_FILES = \
../fish/config.c \
+ ../fish/domain.c \
../fish/inspect.c \
../fish/keys.c \
../fish/options.h \
- ../fish/options.c \
- ../fish/virt.c
+ ../fish/options.c
virt_format_SOURCES = \
$(SHARED_SOURCE_FILES) \
diff --git a/fuse/Makefile.am b/fuse/Makefile.am
index 32df4e8a..09d886ad 100644
--- a/fuse/Makefile.am
+++ b/fuse/Makefile.am
@@ -29,11 +29,11 @@ bin_PROGRAMS = guestmount
# between guestfish and guestmount.
SHARED_SOURCE_FILES = \
../fish/config.c \
+ ../fish/domain.c \
../fish/inspect.c \
../fish/keys.c \
../fish/options.h \
- ../fish/options.c \
- ../fish/virt.c
+ ../fish/options.c
guestmount_SOURCES = \
$(SHARED_SOURCE_FILES) \
diff --git a/inspector/Makefile.am b/inspector/Makefile.am
index 20d64094..cb50fdb9 100644
--- a/inspector/Makefile.am
+++ b/inspector/Makefile.am
@@ -51,11 +51,11 @@ bin_PROGRAMS = virt-inspector
SHARED_SOURCE_FILES = \
../fish/config.c \
+ ../fish/domain.c \
../fish/inspect.c \
../fish/keys.c \
../fish/options.h \
- ../fish/options.c \
- ../fish/virt.c
+ ../fish/options.c
virt_inspector_SOURCES = \
$(SHARED_SOURCE_FILES) \
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 4fa609b7..63527544 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -96,6 +96,7 @@ fish/config.c
fish/copy.c
fish/destpaths.c
fish/display.c
+fish/domain.c
fish/echo.c
fish/edit.c
fish/event-names.c
@@ -124,7 +125,6 @@ fish/setenv.c
fish/supported.c
fish/tilde.c
fish/time.c
-fish/virt.c
format/format.c
fuse/dircache.c
fuse/guestmount.c
diff --git a/rescue/Makefile.am b/rescue/Makefile.am
index 328df7e6..af2d1965 100644
--- a/rescue/Makefile.am
+++ b/rescue/Makefile.am
@@ -26,11 +26,11 @@ bin_PROGRAMS = virt-rescue
SHARED_SOURCE_FILES = \
../fish/config.c \
+ ../fish/domain.c \
../fish/inspect.c \
../fish/keys.c \
../fish/options.h \
- ../fish/options.c \
- ../fish/virt.c
+ ../fish/options.c
virt_rescue_SOURCES = \
$(SHARED_SOURCE_FILES) \