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

[fai-repository at svn.debian.org]

Author: lange
Date: 2006-01-11 17:35:16 +0000 (Wed, 11 Jan 2006)
New Revision: 3237

Modified:
   trunk/bin/fai-cd
   trunk/debian/changelog
Log:
new code for generating sources.list file


Modified: trunk/bin/fai-cd
===================================================================
--- trunk/bin/fai-cd	2006-01-10 17:02:52 UTC (rev 3236)
+++ trunk/bin/fai-cd	2006-01-11 17:35:16 UTC (rev 3237)
@@ -146,13 +146,16 @@
     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  
 
+    dists=`find $mirrordir -name "Packages*" | grep binary | sed 's/binary-.*//' | \
+         sed "s#$mirrordir/*dists/##" | xargs -n 1 dirname | uniq `
+
+    for i in $dists ; do
+	comp=`find $mirrordir/dists/$i -maxdepth 2 -type d -name "binary-*" | \
+        sed -e "s#$mirrordir/*dists/$i/##" -e 's#/binary-.*##' | tr '\n' " "`
+	echo "deb file:/media/mirror $i $comp" >> $tmp1
+    done
+
     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	2006-01-10 17:02:52 UTC (rev 3236)
+++ trunk/debian/changelog	2006-01-11 17:35:16 UTC (rev 3237)
@@ -15,9 +15,9 @@
   * make-fai-nfsroot: do not try to copy file if resolv.conf does not
     exist
   * menu.lst: add entry for faiserver
-  * fai-cd: adjust space
+  * fai-cd: adjust space, new code for generating sources.list file
 
- -- Thomas Lange <lange at debian.org>  Tue, 10 Jan 2006 17:37:44 +0100
+ -- Thomas Lange <lange at debian.org>  Wed, 11 Jan 2006 18:34:50 +0100
 
 fai (2.9) unstable; urgency=low