From patchwork Mon Jun 25 19:01:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonatan Schlag X-Patchwork-Id: 1840 Return-Path: Received: from mail01.ipfire.org (unknown [172.28.1.200]) by web02.i.ipfire.org (Postfix) with ESMTP id 4A2E46095C for ; Mon, 25 Jun 2018 11:02:01 +0200 (CEST) Received: from mail01.i.ipfire.org (localhost [127.0.0.1]) by mail01.ipfire.org (Postfix) with ESMTP id 1C2A911490CC; Mon, 25 Jun 2018 10:02:01 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201801; t=1529917321; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:in-reply-to: references:references:list-id:list-unsubscribe:list-subscribe:list-post; bh=3WH37oPk5SFvpMHaTakwPBQGx38I7WVdE4H1OTgMgAQ=; b=LZ42U4ZIzMd0CJ6q5EWayhxffesFaZ6BRevqwGCLbxw3fsWRnoujXtUbL3RGYlpKdtPdNX JoqU/WR70lt6AhB2VX8iqrmDyemp1izM1w+63loAQICZeWvOoLVU6dc3nXZV5/o1M/ct7E jofdsDQvwkdyLWX25UQwX9P9p0dddlQC8rvFNQrDa8o1xr9S/rFudcH9mt/3sobRWDApWH cHJsysz6Li+YEGj554EXIom0P/alzTQW38bygrKYgO3ed7X6YAGcOR+DfIs79EsYZDMNLr 84KyLo79twMJkiP8B0JuNRYF49i4TT/NDMTaOxkPlo3VWxW8geUBlHqAR57yzQ== Received: from bockland.local.familyschlag (fw-1.cvjm.hk-net.de [95.129.212.34]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 83972115A622; Mon, 25 Jun 2018 10:01:57 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201801; t=1529917317; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:in-reply-to: references:references; bh=3WH37oPk5SFvpMHaTakwPBQGx38I7WVdE4H1OTgMgAQ=; b=o+iCr7nyVFxjWOU6xY9M1KgI2ZelQzeomDl8Ax1c/RQ7nwl5cnp7GebT+McVwIbB+LHXnn /uu6/atZBhoi1yowhNwpG5GDf2ddDO9aA0UZ5fhS67pDjrTMjksLZOo2JfiIfX7OL+Zylj M81hoSwoWszmuNoqP4PIbic33lC1tMgavf/GJg9+oekDGr6EZkErERcQt+XasuaOmlx108 rsC3vPzJiiYeoITdXOwVv2UgNe0KxfpHjWZKo3jX05QaSELQyAjHOhsMjjtBVmXy0HsHsX A+AlZkER7jjzei/erftFpO3R1UdD9RNVtMq1QsEnR54EBJ52CUh4RYREaiOLqA== 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> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180625090143.31218-1-jonatan.schlag@ipfire.org> References: <20180625090143.31218-1-jonatan.schlag@ipfire.org> Authentication-Results: mail01.ipfire.org; auth=pass smtp.auth=jschlag smtp.mailfrom=jonatan.schlag@ipfire.org X-Spamd-Result: default: False [-6.10 / 11.00]; FROM_EQ_ENVFROM(0.00)[]; RCVD_TLS_ALL(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TO_DN_SOME(0.00)[]; BAYES_HAM(-3.00)[100.00%]; ARC_NA(0.00)[]; RCPT_COUNT_TWO(0.00)[2]; MIME_GOOD(-0.10)[text/plain]; REPLY(-4.00)[]; MID_CONTAINS_FROM(1.00)[]; RCVD_COUNT_ZERO(0.00)[0]; DKIM_SIGNED(0.00)[]; FROM_HAS_DN(0.00)[]; ASN(0.00)[asn:44700, ipnet:95.129.208.0/21, country:DE] X-Spam-Status: No, score=-6.10 X-Rspamd-Server: mail01.i.ipfire.org X-BeenThere: network@lists.ipfire.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List for the network package List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: network-bounces@lists.ipfire.org Sender: "network" 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 => 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 => 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 += \ 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 CLEANFILES += \ 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 # Virtual Machine Images VIRTUAL_ENVIRONMENT_IMAGES = \ diff --git a/test/nitsi/virtual-environment/basic/.gitignore b/test/nitsi/virtual-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/virtual-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 = qemu:///system [alice] xml_file = machines/alice/machine.xml snapshot_xml_file = machines/alice/snapshot.xml -image = /var/lib/libvirt/images/ipfire-alice.qcow2 +image = @VIRTUAL_ENVIRONMENT_IMAGES_DIR@/ipfire-alice-2.qcow2 root_uid = 1efb5389-0949-46bb-b688-5246acba9f6d username = root password = root @@ -15,7 +15,7 @@ password = root [bob] xml_file = machines/bob/machine.xml snapshot_xml_file = machines/bob/snapshot.xml -image = /var/lib/libvirt/images/ipfire-bob.qcow2 +image = @VIRTUAL_ENVIRONMENT_IMAGES_DIR@/ipfire-bob.qcow2 root_uid = 1efb5389-0949-46bb-b688-5246acba9f6d username = root password = root