From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jonatan Schlag To: network@lists.ipfire.org Subject: [PATCH 3/3] We need to change the path of the image in the settings file to Date: Mon, 25 Jun 2018 11:01:43 +0200 Message-ID: <20180625090143.31218-3-jonatan.schlag@ipfire.org> In-Reply-To: <20180625090143.31218-1-jonatan.schlag@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3383343849678690711==" List-Id: --===============3383343849678690711== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable When we do not change this path accordingly to the place where we store our images the copy in feature does not work. Signed-off-by: Jonatan Schlag --- Makefile.am | 6 ++++-- test/nitsi/virtual-environment/basic/.gitignore | 1 + test/nitsi/virtual-environment/basic/{settings =3D> settings.in} | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 test/nitsi/virtual-environment/basic/.gitignore rename test/nitsi/virtual-environment/basic/{settings =3D> settings.in} (84%) diff --git a/Makefile.am b/Makefile.am index f11c721..b976da6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -563,13 +563,15 @@ EXTRA_DIST +=3D \ test/nitsi/virtual-environment/basic/machines/alice/machine.xml.in \ test/nitsi/virtual-environment/basic/machines/alice/snapshot.xml.in \ test/nitsi/virtual-environment/basic/machines/bob/machine.xml.in \ - test/nitsi/virtual-environment/basic/machines/bob/snapshot.xml.in + test/nitsi/virtual-environment/basic/machines/bob/snapshot.xml.in \ + test/nitsi/virtual-environment/basic/settings.in =20 CLEANFILES +=3D \ test/nitsi/virtual-environment/basic/machines/alice/machine.xml \ test/nitsi/virtual-environment/basic/machines/alice/snapshot.xml \ test/nitsi/virtual-environment/basic/machines/bob/machine.xml \ - test/nitsi/virtual-environment/basic/machines/bob/snapshot.xml + test/nitsi/virtual-environment/basic/machines/bob/snapshot.xml \ + test/nitsi/virtual-environment/basic/settings =20 # Virtual Machine Images VIRTUAL_ENVIRONMENT_IMAGES =3D \ diff --git a/test/nitsi/virtual-environment/basic/.gitignore b/test/nitsi/vir= tual-environment/basic/.gitignore new file mode 100644 index 0000000..308ef0b --- /dev/null +++ b/test/nitsi/virtual-environment/basic/.gitignore @@ -0,0 +1 @@ +/settings diff --git a/test/nitsi/virtual-environment/basic/settings b/test/nitsi/virtu= al-environment/basic/settings.in similarity index 84% rename from test/nitsi/virtual-environment/basic/settings rename to test/nitsi/virtual-environment/basic/settings.in index 44805ae..94d2090 100644 --- a/test/nitsi/virtual-environment/basic/settings +++ b/test/nitsi/virtual-environment/basic/settings.in @@ -7,7 +7,7 @@ uri =3D qemu:///system [alice] xml_file =3D machines/alice/machine.xml snapshot_xml_file =3D machines/alice/snapshot.xml -image =3D /var/lib/libvirt/images/ipfire-alice.qcow2 +image =3D @VIRTUAL_ENVIRONMENT_IMAGES_DIR@/ipfire-alice-2.qcow2 root_uid =3D 1efb5389-0949-46bb-b688-5246acba9f6d username =3D root password =3D root @@ -15,7 +15,7 @@ password =3D root [bob] xml_file =3D machines/bob/machine.xml snapshot_xml_file =3D machines/bob/snapshot.xml -image =3D /var/lib/libvirt/images/ipfire-bob.qcow2 +image =3D @VIRTUAL_ENVIRONMENT_IMAGES_DIR@/ipfire-bob.qcow2 root_uid =3D 1efb5389-0949-46bb-b688-5246acba9f6d username =3D root password =3D root --=20 2.11.0 --===============3383343849678690711==--