[Fai-commit] r3029 - in people/Mrfai/2.8.4-sarge-fixes: debian scripts

[fai-repository at svn.debian.org]

Author: lange
Date: 2005-11-10 23:03:42 +0000 (Thu, 10 Nov 2005)
New Revision: 3029

Modified:
   people/Mrfai/2.8.4-sarge-fixes/debian/changelog
   people/Mrfai/2.8.4-sarge-fixes/scripts/fai-cd
Log:
merge people/lazyboy/bugfixes/320024 in here


Modified: people/Mrfai/2.8.4-sarge-fixes/debian/changelog
===================================================================
--- people/Mrfai/2.8.4-sarge-fixes/debian/changelog	2005-11-10 22:49:58 UTC (rev 3028)
+++ people/Mrfai/2.8.4-sarge-fixes/debian/changelog	2005-11-10 23:03:42 UTC (rev 3029)
@@ -1,3 +1,11 @@
+fai (2.8.4sarge1) sarge-proposed-updates; urgency=low
+
+   * fixed fai-cd hardcoded sources.list for the install client to be
+    generated, code by Michael Tautschnig (cloeses: #320024) and at least
+    partially #329547
+
+ -- Thomas Lange <lange at debian.org>  Thu, 10 Nov 2005 23:58:47 +0100
+
 fai (2.8.4) unstable; urgency=high
 
   * fix important bug: remove non-US entry (closes: #310392)

Modified: people/Mrfai/2.8.4-sarge-fixes/scripts/fai-cd
===================================================================
--- people/Mrfai/2.8.4-sarge-fixes/scripts/fai-cd	2005-11-10 22:49:58 UTC (rev 3028)
+++ people/Mrfai/2.8.4-sarge-fixes/scripts/fai-cd	2005-11-10 23:03:42 UTC (rev 3029)
@@ -210,10 +210,14 @@
     tmp1=$(mktemp)
     cat > $tmp1 <<EOF
 # mirror location for fai CD, file generated by fai-cd
+EOF
+    for i in $mirrordir/dists/* ; do
+      echo -n "deb file:/media/mirror `basename $i` ">>$tmp1
+      find $i -name "Packages*" | grep binary | \
+        sed 's/\/binary-.*$//' | uniq | sed "s#$i/##" | tr '\n' " " >>$tmp1
+      echo "">>$tmp1
+    done  
 
-deb file:/media/mirror testing main contrib non-free
-deb file:/fai/files packages/
-EOF
     mount --bind $tmp1 $NFSROOT/etc/apt/sources.list
     customize_nfsroot
     echo "Writing FAI CD-ROM image to $isoname. This may need some time."