[PATCH OSSTEST] standalone-reset: fix check for existing d-i and creation of symlink

[PATCH OSSTEST] standalone-reset: fix check for existing d-i and creation of symlink

[Ian Campbell]

We need to check for "$diver-$suite" not just "$diver" now

Also when creating the current symlink only do so if
mg-debian-installer-update did something, since it will now silently ignore
unavailable combinations (e.g. armhf on Squeeze)

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---
 standalone-reset |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/standalone-reset b/standalone-reset
index 039dfea..8be7e86 100755
--- a/standalone-reset
+++ b/standalone-reset
@@ -94,14 +94,16 @@ else
 
 	if [ "x$diver" = xcurrent ]; then
 		for arch in i386 amd64 armhf; do
-			if test -d "$tftp/$dibase/$arch/$diver"
+			if test -d "$tftp/$dibase/$arch/$diver-$suite"
 				then continue; fi
 			mkdir -p "$tftp/$dibase/$arch"
 			echo "** need to generate d-i with firmware for $arch"
 			div=`./mg-debian-installer-update \
 					$suite $arch $firmware`
-			rm -f "$tftp/$dibase/$arch/current-$suite"
-			ln -s $div "$tftp/$dibase/$arch/current-$suite"
+			if [ -n "$div" ] ; then
+			    rm -f "$tftp/$dibase/$arch/current-$suite"
+			    ln -s $div "$tftp/$dibase/$arch/current-$suite"
+			fi
 		done
 	fi
 fi
-- 
1.7.10.4

Re: [PATCH OSSTEST] standalone-reset: fix check for existing d-i and creation of symlink

[Ian Jackson]

Ian Campbell writes ("[PATCH OSSTEST] standalone-reset: fix check for existing d-i and creation of symlink"):
> We need to check for "$diver-$suite" not just "$diver" now
> 
> Also when creating the current symlink only do so if
> mg-debian-installer-update did something, since it will now silently ignore
> unavailable combinations (e.g. armhf on Squeeze)

Looks plausible.

Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>

Re: [PATCH OSSTEST] standalone-reset: fix check for existing d-i and creation of symlink

[Ian Campbell]

On Fri, 2013-11-01 at 15:52 +0000, Ian Jackson wrote:
> Ian Campbell writes ("[PATCH OSSTEST] standalone-reset: fix check for existing d-i and creation of symlink"):
> > We need to check for "$diver-$suite" not just "$diver" now
> > 
> > Also when creating the current symlink only do so if
> > mg-debian-installer-update did something, since it will now silently ignore
> > unavailable combinations (e.g. armhf on Squeeze)
> 
> Looks plausible.
> 
> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>

THanks, I've pushed this plus "mg-debian-installer-update: restrict
armhf to Wheezy+" (which you acked on IRC) to pretest.

Ian.