|
 |
ffd6ed |
From ba229d940e2c2f0faca34194e8cfdabc1fccd16b Mon Sep 17 00:00:00 2001
|
|
|
ffd6ed |
From: "Richard W.M. Jones" <rjones@redhat.com>
|
|
|
ffd6ed |
Date: Wed, 5 Aug 2015 12:55:42 +0100
|
|
|
ffd6ed |
Subject: [PATCH] p2v: Display full package version (including extra string) in
|
|
|
ffd6ed |
p2v.ks file.
|
|
|
ffd6ed |
|
|
|
ffd6ed |
(cherry picked from commit f3ed65525c1b0255463a85e3d459debabfbfcfa9)
|
|
|
ffd6ed |
---
|
|
|
ffd6ed |
p2v/p2v.ks.in | 2 +-
|
|
|
ffd6ed |
p2v/virt-p2v-make-kickstart.in | 1 +
|
|
|
ffd6ed |
2 files changed, 2 insertions(+), 1 deletion(-)
|
|
|
ffd6ed |
|
|
|
ffd6ed |
diff --git a/p2v/p2v.ks.in b/p2v/p2v.ks.in
|
|
|
ffd6ed |
index 94c2dfe..a14ee46 100644
|
|
|
ffd6ed |
--- a/p2v/p2v.ks.in
|
|
|
ffd6ed |
+++ b/p2v/p2v.ks.in
|
|
|
ffd6ed |
@@ -15,7 +15,7 @@
|
|
|
ffd6ed |
# along with this program; if not, write to the Free Software
|
|
|
ffd6ed |
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
|
ffd6ed |
|
|
|
ffd6ed |
-# Generated by virt-p2v-make-kickstart __PACKAGE_VERSION__.
|
|
|
ffd6ed |
+# Generated by virt-p2v-make-kickstart __PACKAGE_VERSION_FULL__
|
|
|
ffd6ed |
|
|
|
ffd6ed |
lang en_US.UTF-8
|
|
|
ffd6ed |
keyboard us
|
|
|
ffd6ed |
diff --git a/p2v/virt-p2v-make-kickstart.in b/p2v/virt-p2v-make-kickstart.in
|
|
|
ffd6ed |
index 70d7782..47afca0 100644
|
|
|
ffd6ed |
--- a/p2v/virt-p2v-make-kickstart.in
|
|
|
ffd6ed |
+++ b/p2v/virt-p2v-make-kickstart.in
|
|
|
ffd6ed |
@@ -157,6 +157,7 @@ done
|
|
|
ffd6ed |
'{
|
|
|
ffd6ed |
gsub (/__PACKAGE_NAME__/, "@PACKAGE_NAME@");
|
|
|
ffd6ed |
gsub (/__PACKAGE_VERSION__/, "@PACKAGE_VERSION@");
|
|
|
ffd6ed |
+ gsub (/__PACKAGE_VERSION_FULL__/, "@PACKAGE_VERSION_FULL@");
|
|
|
ffd6ed |
gsub (/__BASE64_ISSUE__/, base64_issue);
|
|
|
ffd6ed |
gsub (/__BASE64_LAUNCH_VIRT_P2V__/, base64_launch_virt_p2v);
|
|
|
ffd6ed |
gsub (/__BASE64_P2V_SERVICE__/, base64_p2v_service);
|
|
|
ffd6ed |
--
|
|
|
ffd6ed |
1.8.3.1
|
|
|
ffd6ed |
|