diff mbox

[OSSTEST] standalone-reset: Fix when TftpDiVersion not set in config

Message ID 20161018145351.27429-1-ian.jackson@eu.citrix.com (mailing list archive)
State New, archived
Headers show

Commit Message

Ian Jackson Oct. 18, 2016, 2:53 p.m. UTC
In b8134c7fa60d "mg-debian-installer-update: Print the correct value
for TftpDiVersion", the output of mg-debian-installer-update was
changed to be a config fragment.  But standalone-reset expected it to
be just the date value, and was not updated.

Update it now.  And leave a comment in mg-debian-installer-update to
stop this happening again.

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
CC: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
CC: Marcos Matsunaga <Marcos.Matsunaga@oracle.com>
---
 standalone-reset | 3 +++
 1 file changed, 3 insertions(+)
diff mbox

Patch

diff --git a/standalone-reset b/standalone-reset
index bd34782..dece71a 100755
--- a/standalone-reset
+++ b/standalone-reset
@@ -109,6 +109,9 @@  else
 			echo "** need to generate d-i with firmware for $arch"
 			div=`./mg-debian-installer-update \
 					$suite $arch $firmware`
+			div="${div%
+*}"
+			div="${div#* }"
 			if [ -n "$div" ] ; then
 			    rm -f "$tftp/$dibase/$arch/current-$suite"
 			    ln -s $div "$tftp/$dibase/$arch/current-$suite"