On Wed, Feb 12, 2014 at 11:38:22AM +0100, Pino Toscano wrote:
Looks good to me.
Thanks for reviewing this.
I'm going to push this to libguestfs 1.22 1.24 and do new releases
of those branches as well .. coming up later today.
Rich.
--
Richard Jones, Virtualization Group, Red Hat
---
p2v/client/test/cmdline_default | 1 +
p2v/client/test/cmdline_test| 1 +
p2v/client/test/test_newmain.rb | 49 +
3 files changed, 51 insertions(+)
create mode 100644 p2v/client/test/cmdline_default
create mode 100644
This introduces support to run P2V without X server. Runtime parameters
are specified via kernel command line making it hopefully suitable for
automated migration with a little help of PXE boot.
Patchset is not squashed and represents dev. history.
___
/etc/hostname usually has an ending newline, so add it when changing it.
---
mllib/hostname.ml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mllib/hostname.ml b/mllib/hostname.ml
index e1c5d4b..cffba6b 100644
--- a/mllib/hostname.ml
+++ b/mllib/hostname.ml
@@ -79,7 +79,7 @@
---
p2v/client/lib/gtk2.rb | 0
1 file changed, 0 insertions(+), 0 deletions(-)
create mode 100644 p2v/client/lib/gtk2.rb
diff --git a/p2v/client/lib/gtk2.rb b/p2v/client/lib/gtk2.rb
new file mode 100644
index 000..e69de29
--
1.8.3.1
___
---
p2v/client/test/test_newmain_integration.rb | 4
1 file changed, 4 insertions(+)
diff --git a/p2v/client/test/test_newmain_integration.rb
b/p2v/client/test/test_newmain_integration.rb
index 9e96987..ee39a09 100644
--- a/p2v/client/test/test_newmain_integration.rb
+++
---
p2v/client/bin/virt-p2v | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/p2v/client/bin/virt-p2v b/p2v/client/bin/virt-p2v
index 5373cfb..5b294a7 100755
--- a/p2v/client/bin/virt-p2v
+++ b/p2v/client/bin/virt-p2v
@@ -18,7 +18,8 @@
# Let's check if we should run
---
p2v/client/lib/gtk2.rb| 0
p2v/client/lib/virt-p2v/ui/gtk.rb | 0
2 files changed, 0 insertions(+), 0 deletions(-)
delete mode 100644 p2v/client/lib/gtk2.rb
create mode 100644 p2v/client/lib/virt-p2v/ui/gtk.rb
diff --git a/p2v/client/lib/gtk2.rb b/p2v/client/lib/gtk2.rb
deleted
---
p2v/client/lib/virt-p2v/ui/gtk.rb | 52 +++
p2v/client/lib/virt-p2v/ui/main.rb | 64 --
2 files changed, 52 insertions(+), 64 deletions(-)
diff --git a/p2v/client/lib/virt-p2v/ui/gtk.rb
b/p2v/client/lib/virt-p2v/ui/gtk.rb
---
p2v/client/test/test_newmain_integration.rb | 105 +++-
1 file changed, 86 insertions(+), 19 deletions(-)
diff --git a/p2v/client/test/test_newmain_integration.rb
b/p2v/client/test/test_newmain_integration.rb
index ee39a09..f7c59a8 100644
---
---
p2v/client/test/cmdline_test_params | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/p2v/client/test/cmdline_test_params
b/p2v/client/test/cmdline_test_params
index b48f9d2..0c81b58 100644
--- a/p2v/client/test/cmdline_test_params
+++ b/p2v/client/test/cmdline_test_params
---
p2v/client/lib/virt-p2v/ui/main.rb | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/p2v/client/lib/virt-p2v/ui/main.rb
b/p2v/client/lib/virt-p2v/ui/main.rb
index b91225c..2d36028 100644
--- a/p2v/client/lib/virt-p2v/ui/main.rb
+++
---
p2v/client/lib/virt-p2v/ui/main.rb | 76 +-
1 file changed, 74 insertions(+), 2 deletions(-)
diff --git a/p2v/client/lib/virt-p2v/ui/main.rb
b/p2v/client/lib/virt-p2v/ui/main.rb
index 6960183..55cc9f0 100644
--- a/p2v/client/lib/virt-p2v/ui/main.rb
+++
---
p2v/client/lib/virt-p2v/ui/main.rb | 4
1 file changed, 4 insertions(+)
diff --git a/p2v/client/lib/virt-p2v/ui/main.rb
b/p2v/client/lib/virt-p2v/ui/main.rb
index a19520b..361f6ed 100644
--- a/p2v/client/lib/virt-p2v/ui/main.rb
+++ b/p2v/client/lib/virt-p2v/ui/main.rb
@@ -64,6 +64,10
---
p2v/client/bin/virt-p2v-launcher | 29 +++--
1 file changed, 19 insertions(+), 10 deletions(-)
diff --git a/p2v/client/bin/virt-p2v-launcher b/p2v/client/bin/virt-p2v-launcher
index f9bd910..3c4e328 100755
--- a/p2v/client/bin/virt-p2v-launcher
+++
---
p2v/image-builder/common-minimizer.ks | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/p2v/image-builder/common-minimizer.ks
b/p2v/image-builder/common-minimizer.ks
index 9215666..08aac34 100644
--- a/p2v/image-builder/common-minimizer.ks
+++
---
p2v/client/test/cmdline_test_params | 1 +
p2v/client/test/cmdline_test_params_bad | 1 +
p2v/client/test/cmdline_test_params_optional | 1 +
p2v/client/test/test_newmain.rb | 23 +++
4 files changed, 26 insertions(+)
create mode 100644
---
p2v/client/lib/virt-p2v/ui/convert.rb | 2 ++
p2v/client/lib/virt-p2v/ui/main.rb| 2 ++
2 files changed, 4 insertions(+)
diff --git a/p2v/client/lib/virt-p2v/ui/convert.rb
b/p2v/client/lib/virt-p2v/ui/convert.rb
index 405794f..b737c1b 100644
--- a/p2v/client/lib/virt-p2v/ui/convert.rb
---
p2v/image-builder/p2v-systemd.ks | 16 +---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/p2v/image-builder/p2v-systemd.ks b/p2v/image-builder/p2v-systemd.ks
index 33b4716..0ff6ab9 100644
--- a/p2v/image-builder/p2v-systemd.ks
+++
---
p2v/client/test/test_newmain_integration.rb | 45 +
1 file changed, 45 insertions(+)
create mode 100644 p2v/client/test/test_newmain_integration.rb
diff --git a/p2v/client/test/test_newmain_integration.rb
b/p2v/client/test/test_newmain_integration.rb
new file
---
p2v/client/bin/virt-p2v | 13 +++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/p2v/client/bin/virt-p2v b/p2v/client/bin/virt-p2v
index 9bc0965..5373cfb 100755
--- a/p2v/client/bin/virt-p2v
+++ b/p2v/client/bin/virt-p2v
@@ -16,6 +16,11 @@
# with this program; if
---
p2v/client/lib/virt-p2v/converter.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/p2v/client/lib/virt-p2v/converter.rb
b/p2v/client/lib/virt-p2v/converter.rb
index 7cb4e33..eccc436 100644
--- a/p2v/client/lib/virt-p2v/converter.rb
+++
---
p2v/image-builder/p2v-sysv.ks | 10 --
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/p2v/image-builder/p2v-sysv.ks b/p2v/image-builder/p2v-sysv.ks
index 75baff2..294a36d 100644
--- a/p2v/image-builder/p2v-sysv.ks
+++ b/p2v/image-builder/p2v-sysv.ks
@@ -25,7 +25,9 @@
---
p2v/client/lib/virt-p2v/ui/main.rb | 48 +++---
1 file changed, 45 insertions(+), 3 deletions(-)
diff --git a/p2v/client/lib/virt-p2v/ui/main.rb
b/p2v/client/lib/virt-p2v/ui/main.rb
index ccd11b1..aa6f005 100644
--- a/p2v/client/lib/virt-p2v/ui/main.rb
+++
---
p2v/client/lib/virt-p2v/ui/main.rb | 137 ++---
1 file changed, 96 insertions(+), 41 deletions(-)
diff --git a/p2v/client/lib/virt-p2v/ui/main.rb
b/p2v/client/lib/virt-p2v/ui/main.rb
index f2fbc65..15f29c1 100644
--- a/p2v/client/lib/virt-p2v/ui/main.rb
+++
---
p2v/client/lib/virt-p2v/ui/main.rb | 6 ++
1 file changed, 6 insertions(+)
diff --git a/p2v/client/lib/virt-p2v/ui/main.rb
b/p2v/client/lib/virt-p2v/ui/main.rb
index 814533c..0544a8e 100644
--- a/p2v/client/lib/virt-p2v/ui/main.rb
+++ b/p2v/client/lib/virt-p2v/ui/main.rb
@@ -52,6 +52,12
---
MANIFEST| 1 +
p2v/client/Manifest | 1 +
p2v/client/virt-p2v.gemspec | 4 +++-
3 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/MANIFEST b/MANIFEST
index 6b6c694..3fea7f1 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -47,6 +47,7 @@
---
p2v/client/lib/virt-p2v/ui/main.rb | 16
1 file changed, 16 insertions(+)
diff --git a/p2v/client/lib/virt-p2v/ui/main.rb
b/p2v/client/lib/virt-p2v/ui/main.rb
index 891fe99..0d27c08 100644
--- a/p2v/client/lib/virt-p2v/ui/main.rb
+++ b/p2v/client/lib/virt-p2v/ui/main.rb
@@
---
p2v/client/lib/virt-p2v/ui/main.rb | 7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/p2v/client/lib/virt-p2v/ui/main.rb
b/p2v/client/lib/virt-p2v/ui/main.rb
index ac2ef27..e46c70f 100644
--- a/p2v/client/lib/virt-p2v/ui/main.rb
+++
---
rubygem-virt-p2v.spec.PL | 7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/rubygem-virt-p2v.spec.PL b/rubygem-virt-p2v.spec.PL
index 81157c7..65d0486 100644
--- a/rubygem-virt-p2v.spec.PL
+++ b/rubygem-virt-p2v.spec.PL
@@ -89,7 +89,12 @@ BuildRequires: ruby-devel
#
---
p2v/client/lib/virt-p2v/ui/main.rb | 17 +
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/p2v/client/lib/virt-p2v/ui/main.rb
b/p2v/client/lib/virt-p2v/ui/main.rb
index 42716d2..a3e07ab 100644
--- a/p2v/client/lib/virt-p2v/ui/main.rb
+++
---
README-NOGUI | 35 +++
1 file changed, 35 insertions(+)
create mode 100644 README-NOGUI
diff --git a/README-NOGUI b/README-NOGUI
new file mode 100644
index 000..66216ec
--- /dev/null
+++ b/README-NOGUI
@@ -0,0 +1,35 @@
+P2V can run headless without any
---
p2v/client/lib/virt-p2v/ui/main.rb | 36
1 file changed, 24 insertions(+), 12 deletions(-)
diff --git a/p2v/client/lib/virt-p2v/ui/main.rb
b/p2v/client/lib/virt-p2v/ui/main.rb
index a3e07ab..bd0a0f8 100644
--- a/p2v/client/lib/virt-p2v/ui/main.rb
+++
---
p2v/client/Rakefile | 2 +-
p2v/client/bin/virt-p2v | 2 +-
p2v/client/bin/virt-p2v-launcher| 2 +-
p2v/client/lib/virt-p2v/converter.rb| 2 +-
p2v/client/lib/virt-p2v/gtk-queue.rb| 2 +-
---
p2v/client/lib/virt-p2v/ui/main.rb | 7 +++
1 file changed, 7 insertions(+)
diff --git a/p2v/client/lib/virt-p2v/ui/main.rb
b/p2v/client/lib/virt-p2v/ui/main.rb
index 2d36028..75815e0 100644
--- a/p2v/client/lib/virt-p2v/ui/main.rb
+++ b/p2v/client/lib/virt-p2v/ui/main.rb
@@ -383,6
---
p2v/client/lib/virt-p2v/ui/main.rb | 102 +++--
1 file changed, 53 insertions(+), 49 deletions(-)
diff --git a/p2v/client/lib/virt-p2v/ui/main.rb
b/p2v/client/lib/virt-p2v/ui/main.rb
index 55db619..67dd1b1 100644
--- a/p2v/client/lib/virt-p2v/ui/main.rb
+++
---
p2v/client/lib/virt-p2v/ui/main.rb | 20
1 file changed, 16 insertions(+), 4 deletions(-)
diff --git a/p2v/client/lib/virt-p2v/ui/main.rb
b/p2v/client/lib/virt-p2v/ui/main.rb
index 93b2663..f65ff15 100644
--- a/p2v/client/lib/virt-p2v/ui/main.rb
+++
---
p2v/client/lib/virt-p2v/ui/main.rb | 49 ++
1 file changed, 34 insertions(+), 15 deletions(-)
diff --git a/p2v/client/lib/virt-p2v/ui/main.rb
b/p2v/client/lib/virt-p2v/ui/main.rb
index aa6f005..814533c 100644
--- a/p2v/client/lib/virt-p2v/ui/main.rb
+++
---
p2v/client/lib/virt-p2v/ui/gtk.rb | 20 +++-
p2v/client/lib/virt-p2v/ui/main.rb | 8 +++-
2 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/p2v/client/lib/virt-p2v/ui/gtk.rb
b/p2v/client/lib/virt-p2v/ui/gtk.rb
index c52eb11..38b9184 100644
---
---
p2v/client/lib/virt-p2v/ui/main.rb | 7 ---
1 file changed, 7 deletions(-)
diff --git a/p2v/client/lib/virt-p2v/ui/main.rb
b/p2v/client/lib/virt-p2v/ui/main.rb
index 15f29c1..55db619 100644
--- a/p2v/client/lib/virt-p2v/ui/main.rb
+++ b/p2v/client/lib/virt-p2v/ui/main.rb
@@ -341,13
---
p2v/client/lib/virt-p2v/ui/main.rb | 79 ++
1 file changed, 64 insertions(+), 15 deletions(-)
diff --git a/p2v/client/lib/virt-p2v/ui/main.rb
b/p2v/client/lib/virt-p2v/ui/main.rb
index 61df5cd..a19520b 100644
--- a/p2v/client/lib/virt-p2v/ui/main.rb
+++
---
p2v/client/lib/virt-p2v/ui/main.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/p2v/client/lib/virt-p2v/ui/main.rb
b/p2v/client/lib/virt-p2v/ui/main.rb
index 361f6ed..87724da 100644
--- a/p2v/client/lib/virt-p2v/ui/main.rb
+++ b/p2v/client/lib/virt-p2v/ui/main.rb
@@
---
p2v/client/bin/virt-p2v-launcher | 12 ++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/p2v/client/bin/virt-p2v-launcher b/p2v/client/bin/virt-p2v-launcher
index 8b7d9d9..f9bd910 100755
--- a/p2v/client/bin/virt-p2v-launcher
+++ b/p2v/client/bin/virt-p2v-launcher
@@
---
p2v/client/lib/virt-p2v/ui/gtk.rb | 2 +-
p2v/client/lib/virt-p2v/ui/main.rb | 14 +++---
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/p2v/client/lib/virt-p2v/ui/gtk.rb
b/p2v/client/lib/virt-p2v/ui/gtk.rb
index daa9ad8..98adca8 100644
---
---
p2v/image-builder/p2v-sysv.ks | 7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/p2v/image-builder/p2v-sysv.ks b/p2v/image-builder/p2v-sysv.ks
index 31fa8e3..75baff2 100644
--- a/p2v/image-builder/p2v-sysv.ks
+++ b/p2v/image-builder/p2v-sysv.ks
@@ -21,9 +21,14 @@
---
p2v/client/lib/virt-p2v/gtk-queue.rb | 2 +-
p2v/client/lib/virt-p2v/ui/connect.rb | 2 +-
p2v/client/lib/virt-p2v/ui/convert.rb | 2 +-
p2v/client/lib/virt-p2v/ui/gtk.rb | 1 +
p2v/client/lib/virt-p2v/ui/network.rb | 2 +-
5 files changed, 5 insertions(+), 4 deletions(-)
diff --git
---
p2v/client/lib/virt-p2v/ui/main.rb | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/p2v/client/lib/virt-p2v/ui/main.rb
b/p2v/client/lib/virt-p2v/ui/main.rb
index 10dd2d7..61df5cd 100644
--- a/p2v/client/lib/virt-p2v/ui/main.rb
+++ b/p2v/client/lib/virt-p2v/ui/main.rb
---
p2v/client/lib/virt-p2v/ui/gtk.rb | 7 +++
p2v/client/lib/virt-p2v/ui/main.rb | 7 +--
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/p2v/client/lib/virt-p2v/ui/gtk.rb
b/p2v/client/lib/virt-p2v/ui/gtk.rb
index 38b9184..daa9ad8 100644
---
---
p2v/image-builder/p2v-systemd.ks | 2 ++
p2v/image-builder/p2v-sysv.ks| 2 ++
2 files changed, 4 insertions(+)
diff --git a/p2v/image-builder/p2v-systemd.ks b/p2v/image-builder/p2v-systemd.ks
index 0ff6ab9..a1117b4 100644
--- a/p2v/image-builder/p2v-systemd.ks
+++
---
p2v/client/lib/virt-p2v/ui/main.rb | 10 +++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/p2v/client/lib/virt-p2v/ui/main.rb
b/p2v/client/lib/virt-p2v/ui/main.rb
index 75815e0..ecc2ace 100644
--- a/p2v/client/lib/virt-p2v/ui/main.rb
+++
---
p2v/client/lib/virt-p2v/ui/main.rb | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/p2v/client/lib/virt-p2v/ui/main.rb
b/p2v/client/lib/virt-p2v/ui/main.rb
index 87724da..f2fbc65 100644
--- a/p2v/client/lib/virt-p2v/ui/main.rb
+++ b/p2v/client/lib/virt-p2v/ui/main.rb
@@
---
p2v/client/lib/virt-p2v/ui/gtk.rb | 139 +
p2v/client/lib/virt-p2v/ui/main.rb | 122 +---
2 files changed, 141 insertions(+), 120 deletions(-)
diff --git a/p2v/client/lib/virt-p2v/ui/gtk.rb
b/p2v/client/lib/virt-p2v/ui/gtk.rb
---
p2v/client/lib/virt-p2v/ui/main.rb | 3 +++
1 file changed, 3 insertions(+)
diff --git a/p2v/client/lib/virt-p2v/ui/main.rb
b/p2v/client/lib/virt-p2v/ui/main.rb
index 67dd1b1..b91225c 100644
--- a/p2v/client/lib/virt-p2v/ui/main.rb
+++ b/p2v/client/lib/virt-p2v/ui/main.rb
@@ -291,6 +291,9
---
p2v/client/lib/virt-p2v/ui/main.rb | 9 +
1 file changed, 9 insertions(+)
diff --git a/p2v/client/lib/virt-p2v/ui/main.rb
b/p2v/client/lib/virt-p2v/ui/main.rb
index 0544a8e..5717c5d 100644
--- a/p2v/client/lib/virt-p2v/ui/main.rb
+++ b/p2v/client/lib/virt-p2v/ui/main.rb
@@ -270,6
---
p2v/client/test/test_newmain.rb | 17 +
1 file changed, 1 insertion(+), 16 deletions(-)
diff --git a/p2v/client/test/test_newmain.rb b/p2v/client/test/test_newmain.rb
index 26a15a6..cc07f9a 100644
--- a/p2v/client/test/test_newmain.rb
+++ b/p2v/client/test/test_newmain.rb
@@
---
deps.sh | 41 +
1 file changed, 41 insertions(+)
create mode 100644 deps.sh
diff --git a/deps.sh b/deps.sh
new file mode 100644
index 000..9631655
--- /dev/null
+++ b/deps.sh
@@ -0,0 +1,41 @@
+yum -y install git-all
+
+echo 'THESE ARE MISSING IN
---
p2v/client/lib/virt-p2v/ui/main.rb | 46 +-
1 file changed, 40 insertions(+), 6 deletions(-)
diff --git a/p2v/client/lib/virt-p2v/ui/main.rb
b/p2v/client/lib/virt-p2v/ui/main.rb
index f65ff15..ccd11b1 100644
--- a/p2v/client/lib/virt-p2v/ui/main.rb
+++
In Debian/Ubuntu systems, read the previous hostname from /etc/hostname
before replacing it, and try to carefully replace it in /etc/hosts with
the new hostname.
Since Perl_edit to edit /etc/hosts, it is added/changed as dependency
for Hostname.
---
builder/Makefile.am | 2 +-
mllib/Makefile.am
---
NOTES.txt | 49 +
1 file changed, 49 insertions(+)
create mode 100644 NOTES.txt
diff --git a/NOTES.txt b/NOTES.txt
new file mode 100644
index 000..f9f0f91
--- /dev/null
+++ b/NOTES.txt
@@ -0,0 +1,49 @@
+UI duck screen:
+ .get_object/1 ::
---
p2v/client/test/test_newmain.rb | 1 +
1 file changed, 1 insertion(+)
diff --git a/p2v/client/test/test_newmain.rb b/p2v/client/test/test_newmain.rb
index d4f6905..e093303 100644
--- a/p2v/client/test/test_newmain.rb
+++ b/p2v/client/test/test_newmain.rb
@@ -1,4 +1,5 @@
require
On Wed, Feb 12, 2014 at 03:30:52PM +0100, Pino Toscano wrote:
+and replace_host_in_etc_hosts g oldhost newhost =
+ let filename = /etc/hosts in
+ if g#is_file filename then (
+Perl_edit.edit_file ~debug:false g filename
+ (s,(\\s) ^ (Str.quote oldhost) ^ (\\s|\\$),\\1 ^ (Str.quote
On Wed, Feb 12, 2014 at 03:30:53PM +0100, Pino Toscano wrote:
/etc/hostname usually has an ending newline, so add it when changing it.
---
mllib/hostname.ml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mllib/hostname.ml b/mllib/hostname.ml
index e1c5d4b..cffba6b
Heya,
With latest Fedora Rawhide Kernel, I see a nested KVM guest hanging at
boot (not unusual). Rich once suggested this[1] to try to attach gdb to
the nested L2 guest to find out where_ it's stuck, tonight I set out to
try it out (with KVM TCG).
Below is all what I tried.
In guest hypervisor
63 matches
Mail list logo