[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#590993: installation-reports: netboot install report broken mirror if installation CD is used as mirror



tags 590993 patch
thanks

> It would be better if debian-cd was modified to only include the symlink
> for the suite actually specified in the Release file.

The attached patch (tested) implements this.

diff --git a/tools/start_new_disc b/tools/start_new_disc
index cf00344..779f242 100755
--- a/tools/start_new_disc
+++ b/tools/start_new_disc
@@ -66,9 +66,6 @@ fi
 
 if [ ! -d $CDDIR/dists/$CODENAME ] ; then
     mkdir -p $CDDIR/dists/$CODENAME
-    for name in stable unstable frozen testing; do
-	ln -sf $CODENAME $CDDIR/dists/$name
-    done
 fi
 
 # Commodity link for tools which want local in dists/local/local ...
@@ -336,6 +333,12 @@ if [ -e "$MIRROR/dists/$CODENAME/Release" ] ; then
 	    sed -i -e "s/^Suite: .*$/Suite: stable/" dists/$CODENAME/Release
 	    sed -i -e "s/^Description: .*$/Description: Debian $DEBVERSION Released $RDATE/" dists/$CODENAME/Release
 	fi
+
+	# Create the suite symlink
+	SUITE=$(sed -n "/^Suite:/ s/.*: //p" dists/$CODENAME/Release)
+	if [ -n "$SUITE" ] && [ x"$SUITE" != x"$CODENAME" ]; then
+		ln -sf $CODENAME dists/$SUITE
+	fi
 else
 	echo "ERROR: Release file ($MIRROR/dists/$CODENAME/Release) is missing !"
 	exit 1

Reply to: