standalone-reset: Fix when TftpDiVersion not set in config

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.

CC: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
CC: Marcos Matsunaga <Marcos.Matsunaga@oracle.com>
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>

diff --git a/mg-debian-installer-update b/mg-debian-installer-update
index 38ae782b85cd596615f310435349edd475bea4c9..bb1ae629ca402112014b41714ffb317947d6a7f6 100755 (executable)
--- a/mg-debian-installer-update
+++ b/mg-debian-installer-update
@@ -183,4 +183,5 @@ fi
 
 echo "TftpDiVersion $date"
 echo "TftpDiVersion_$suite $date"
+# ^ above two lines parsed ad-hoc by standalone-reset
 echo >&2 "downloaded $dstroot/$dst"

diff --git a/standalone-reset b/standalone-reset
index bd347829acfc942f23db1956bf7eb12a851433fc..dece71ad2c5c92d2da9b443216f292e1ff6142c5 100755 (executable)
--- 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"