]> xenbits.xensource.com Git - people/iwj/osstest.git/commitdiff
wip reorg make installer massage work
authorIan Jackson <iwj@woking.cam.xci-test.com>
Tue, 16 Oct 2012 17:43:50 +0000 (18:43 +0100)
committerIan Jackson <iwj@woking.cam.xci-test.com>
Tue, 16 Oct 2012 17:43:50 +0000 (18:43 +0100)
mg-debian-installer-update
standalone-reset

index 9657a23f1ec32bb928e540343d78f39ec5f72832..916620c7be0cfafb26091c49427c9855c06f000b 100755 (executable)
@@ -27,7 +27,7 @@ mkdir -p $dst
 cd $dst
 
 for f in $files; do
-        echo "fetching $f"
+        echo >&2 "fetching $f"
         curl -s $src/$f >$f.new
 done
 
@@ -35,7 +35,7 @@ curl -s $pfile >Packages.bz2
 
 for p in $packages; do
         set +e
-        echo "collecting $p"
+        echo >&2 "collecting $p"
         pkgfile=`bzcat Packages.bz2 | grep-dctrl -PX $p -nsFilename`
         rc=$?
         set -e
@@ -60,4 +60,5 @@ rm Packages.bz2
 #ln -s $date current.new
 #mv -Tf current.new current
 
-echo "downloaded $dstroot/$arch/$date"
+echo $date
+echo >&2 "downloaded $dstroot/$arch/$date"
index b98fea8d4240803a06f9fd8293ed6cea86101ec6..a42f0951d8156b6ad943ff148a90477222caca6d 100755 (executable)
@@ -72,7 +72,9 @@ if [ "x$diver" = xcurrent ]; then
                if test -d "$tftp/$dibase/$arch/$diver"; then continue; fi
                mkdir -p "$tftp/$dibase/$arch"
                echo "** need to generate d-i with firmware for $arch"
-               ./mg-debian-installer-update $suite $arch $firmware
+               div=`./mg-debian-installer-update $suite $arch $firmware`
+               rm -f "$tftp/$dibase/$arch/current"
+               ln -s $div "$tftp/$dibase/$arch/current"
        done
 fi