* Only include a symlink for the suite actually specified in the

Release file. Closes: #590993

debian/changelog

@@ -9,6 +9,8 @@ debian-cd (3.1.4) UNRELEASED; urgency=low
   * Exclude udebs for X.Org-based version of the Graphical Installer.
   * Excluding reiserfs4 udebs is not needed for Squeeze.
   * Include pciutils on installation CDs.
+  * Only include a symlink for the suite actually specified in the
+    Release file. Closes: #590993
 
   [ Karl Goetz ]
   * Rename log.sort_deps* to sort_deps*.log for better consistency.

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