[Fai-commit] r2966 - in people/lazyboy/bugfixes/320024: debian scripts

[fai-repository at svn.debian.org]

Author: lazyboy-guest
Date: 2005-10-20 11:36:42 +0000 (Thu, 20 Oct 2005)
New Revision: 2966

Modified:
   people/lazyboy/bugfixes/320024/debian/changelog
   people/lazyboy/bugfixes/320024/scripts/fai-cd
Log:
fixing bug #320024 and partly #329547 in a nice and flexible way found by Michael Tautschnig

Modified: people/lazyboy/bugfixes/320024/debian/changelog
===================================================================
--- people/lazyboy/bugfixes/320024/debian/changelog	2005-10-19 22:06:54 UTC (rev 2965)
+++ people/lazyboy/bugfixes/320024/debian/changelog	2005-10-20 11:36:42 UTC (rev 2966)
@@ -1,8 +1,7 @@
-fai (2.8.4.lazyboy.bugfix.320024.07) unstable; urgency=low
-  * fixed fai-cd hardcoded sources.list for the install client to not included
-    contrib and nonfree packages because fai-mirror doesn't create such
-    repository parts - this is a fix for the bug #320024, but fixes also the
-    worst symptoms of #328547.
+fai (2.8.4.lazyboy.bugfix.320024.08) unstable; urgency=low
+  * fixed fai-cd hardcoded sources.list for the install client to be generated
+    more flexible -fixes #320024 and at least party #329547.
+    Code by Michael Tautschnig
 
  -- Henning Sprang <henning at sprang.de>  Sun, 16 Oct 2005 21:36:28 +0200
 

Modified: people/lazyboy/bugfixes/320024/scripts/fai-cd
===================================================================
--- people/lazyboy/bugfixes/320024/scripts/fai-cd	2005-10-19 22:06:54 UTC (rev 2965)
+++ people/lazyboy/bugfixes/320024/scripts/fai-cd	2005-10-20 11:36:42 UTC (rev 2966)
@@ -210,10 +210,13 @@
     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
+    done  
 
-deb file:/media/mirror stable main updates/main
-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."