[Fai-commit] r3031 - in trunk: bin debian

[fai-repository at svn.debian.org]

Author: lange
Date: 2005-11-10 23:10:43 +0000 (Thu, 10 Nov 2005)
New Revision: 3031

Modified:
   trunk/bin/fai-cd
   trunk/debian/changelog
Log:
merge people/lazyboy/bugfixes/320024 in here


Modified: trunk/bin/fai-cd
===================================================================
--- trunk/bin/fai-cd	2005-11-10 23:05:47 UTC (rev 3030)
+++ trunk/bin/fai-cd	2005-11-10 23:10:43 UTC (rev 3031)
@@ -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."

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2005-11-10 23:05:47 UTC (rev 3030)
+++ trunk/debian/changelog	2005-11-10 23:10:43 UTC (rev 3031)
@@ -6,8 +6,12 @@
   * remove beowulf and advanced examples
   * increase compat level to 4
   * delete sunos code from source
+  * scripts/ directory is now bin/
+  * fixed fai-cd hardcoded sources.list for the install client to be
+    generated, code by Michael Tautschnig (closes: #320024) and at least
+    partially #329547
 
- -- Thomas Lange <lange at debian.org>  Thu, 20 Oct 2005 22:45:39 +0200
+ -- Thomas Lange <lange at debian.org>  Fri, 11 Nov 2005 00:07:40 +0100
 
 fai (2.8.4) unstable; urgency=high