|
 |
e76f14 |
From 4df430d654c0055fe1d726d96b82ef0599a0e047 Mon Sep 17 00:00:00 2001
|
|
|
e76f14 |
From: "Richard W.M. Jones" <rjones@redhat.com>
|
|
|
e76f14 |
Date: Sat, 2 Jul 2016 10:16:55 +0100
|
|
|
e76f14 |
Subject: [PATCH] p2v: Remove p2v.debug option from test command lines.
|
|
|
e76f14 |
|
|
|
e76f14 |
Fixes commit 0c04919f50685c583842b48ca035626753e959e5.
|
|
|
e76f14 |
|
|
|
e76f14 |
(cherry picked from commit d6744dac60be0b99f6b6fcfb6a1209a8cc5faabc)
|
|
|
e76f14 |
---
|
|
|
e76f14 |
p2v/test-virt-p2v-pxe.sh | 2 +-
|
|
|
e76f14 |
p2v/test-virt-p2v.sh | 2 +-
|
|
|
e76f14 |
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
e76f14 |
|
|
|
e76f14 |
diff --git a/p2v/test-virt-p2v-pxe.sh b/p2v/test-virt-p2v-pxe.sh
|
|
|
e76f14 |
index 70bd2e4..334808d 100755
|
|
|
e76f14 |
--- a/p2v/test-virt-p2v-pxe.sh
|
|
|
e76f14 |
+++ b/p2v/test-virt-p2v-pxe.sh
|
|
|
e76f14 |
@@ -97,7 +97,7 @@ username="$(id -un)"
|
|
|
e76f14 |
os="$(cd $d; pwd)"
|
|
|
e76f14 |
|
|
|
e76f14 |
# The Linux kernel command line.
|
|
|
e76f14 |
-cmdline="root=/dev/sda3 ro console=ttyS0 printk.time=1 p2v.debug p2v.server=10.0.2.2 p2v.port=$port p2v.username=$username p2v.identity=file:///var/tmp/id_rsa p2v.name=windows p2v.o=local p2v.os=$os"
|
|
|
e76f14 |
+cmdline="root=/dev/sda3 ro console=ttyS0 printk.time=1 p2v.server=10.0.2.2 p2v.port=$port p2v.username=$username p2v.identity=file:///var/tmp/id_rsa p2v.name=windows p2v.o=local p2v.os=$os"
|
|
|
e76f14 |
|
|
|
e76f14 |
# Run virt-p2v inside qemu.
|
|
|
e76f14 |
$qemu \
|
|
|
e76f14 |
diff --git a/p2v/test-virt-p2v.sh b/p2v/test-virt-p2v.sh
|
|
|
e76f14 |
index e232d42..d464a46 100755
|
|
|
e76f14 |
--- a/p2v/test-virt-p2v.sh
|
|
|
e76f14 |
+++ b/p2v/test-virt-p2v.sh
|
|
|
e76f14 |
@@ -62,7 +62,7 @@ export PATH=$d:$PATH
|
|
|
e76f14 |
# binaries under test (because of the ./run script).
|
|
|
e76f14 |
|
|
|
e76f14 |
# The Linux kernel command line.
|
|
|
e76f14 |
-cmdline="p2v.server=localhost p2v.name=windows p2v.debug p2v.disks=$f1,$f2 p2v.o=local p2v.os=$(pwd)/$d p2v.network=em1:wired,other p2v.post="
|
|
|
e76f14 |
+cmdline="p2v.server=localhost p2v.name=windows p2v.disks=$f1,$f2 p2v.o=local p2v.os=$(pwd)/$d p2v.network=em1:wired,other p2v.post="
|
|
|
e76f14 |
|
|
|
e76f14 |
virt-p2v --cmdline="$cmdline"
|
|
|
e76f14 |
|
|
|
e76f14 |
--
|
|
|
e76f14 |
1.8.3.1
|
|
|
e76f14 |
|