Debian: Provide cfg_tftp_di_version

And a shell function to do the same thing.

No callers yet.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>

diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm
index d3eff1eb0718d9b4a103401997bf796d19cc3a1c..f3c2f63d995e81bc4e68db4197eab70b47b73bf6 100644 (file)
--- a/Osstest/Debian.pm
+++ b/Osstest/Debian.pm
@@ -46,6 +46,7 @@ BEGIN {
                       preseed_hook_cmds
                       di_installcmdline_core
                       di_vg_name
+                      cfg_tftp_di_version
                       );
     %EXPORT_TAGS = ( );
 
@@ -1358,6 +1359,12 @@ sub preseed_hook_cmds () {
     return $preseed;
 }
 
+sub cfg_tftp_di_version ($) {
+    my ($suite) = @_;
+    $suite //= 'x def suite'; # will not find $c{...}
+    return $c{"TftpDiVersion_$suite"} // $c{TftpDiVersion};
+}
+
 sub debian_guest_suite ($) {
     my ($gho) = @_;
 

diff --git a/cri-getconfig b/cri-getconfig
index 7b75700e5e06a9f8e56811aa0ca2dbd6de8a5369..8b76f3238065f5180c2fb713e92e196970c18f81 100644 (file)
--- a/cri-getconfig
+++ b/cri-getconfig
@@ -25,6 +25,15 @@ getconfig () {
         '
 }
 
+getconfig_TftpDiVersion_suite () {
+       perl -e '
+               use Osstest;
+               use Osstest::Debian;
+               readglobalconfig();
+               print cfg_tftp_di_version($ARGV[0]) or die $!;
+       ' "$1"
+}
+
 getrepos() {
        local repos=`getconfig Repos`
        if [ -z "$repos" ] ; then