]> xenbits.xensource.com Git - people/aperard/osstest.git/commitdiff
standalone-reset: Use suite-specific TftpDiVersion
authorIan Jackson <ian.jackson@eu.citrix.com>
Fri, 18 Mar 2016 15:21:27 +0000 (15:21 +0000)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Fri, 18 Mar 2016 15:21:27 +0000 (15:21 +0000)
If the config specifies a specific d-i version for the suite in use,
it should be honoured.

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

index e58ba68e3c8b47d3dfc28d6a303ae144c5126708..bd347829acfc942f23db1956bf7eb12a851433fc 100755 (executable)
@@ -97,8 +97,8 @@ else
        ensure_dir "$tftp$tftptmp"
 
        dibase=`getconfig TftpDiBase`
-       diver=`getconfig TftpDiVersion`
        suite=`getconfig DebianSuite`
+       diver=`getconfig_TftpDiVersion_suite $suite`
        firmware=`getconfig DebianNonfreeFirmware`
 
        if [ "x$diver" = xcurrent ]; then