[Fai-commit] r2971 - in people/lazyboy/r-2_8_4-fai-cd_sarge_fixes: debian scripts

[fai-repository at svn.debian.org]

Author: lazyboy-guest
Date: 2005-10-20 20:53:54 +0000 (Thu, 20 Oct 2005)
New Revision: 2971

Modified:
   people/lazyboy/r-2_8_4-fai-cd_sarge_fixes/debian/changelog
   people/lazyboy/r-2_8_4-fai-cd_sarge_fixes/debian/rules
   people/lazyboy/r-2_8_4-fai-cd_sarge_fixes/scripts/fai-cd
Log:
merging /tags/r-2_8_4 at 2910 /people/lazyboy/bugfixes/320024 at 2968 in here

Modified: people/lazyboy/r-2_8_4-fai-cd_sarge_fixes/debian/changelog
===================================================================
--- people/lazyboy/r-2_8_4-fai-cd_sarge_fixes/debian/changelog	2005-10-20 20:48:26 UTC (rev 2970)
+++ people/lazyboy/r-2_8_4-fai-cd_sarge_fixes/debian/changelog	2005-10-20 20:53:54 UTC (rev 2971)
@@ -1,3 +1,22 @@
+fai (2.8.4.lazyboy.bugfix.320024.09) unstable; urgency=low
+
+  * add small fix from Michael 
+
+ -- Henning Sprang <henning at sprang.de>  Thu, 20 Oct 2005 16:37:54 +0200
+
+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
+
+fai (2.8.4.lazyboy.bugfix.320024.01) unstable; urgency=low
+
+  *  fixing fai-cd bug - changed string testing to stable in fai-cd script
+
+ -- Henning Sprang <henning at sprang.de>  Sat, 15 Oct 2005 21:50:34 +0200
+
 fai (2.8.4) unstable; urgency=high
 
   * fix important bug: remove non-US entry (closes: #310392)

Modified: people/lazyboy/r-2_8_4-fai-cd_sarge_fixes/debian/rules
===================================================================
--- people/lazyboy/r-2_8_4-fai-cd_sarge_fixes/debian/rules	2005-10-20 20:48:26 UTC (rev 2970)
+++ people/lazyboy/r-2_8_4-fai-cd_sarge_fixes/debian/rules	2005-10-20 20:53:54 UTC (rev 2971)
@@ -4,6 +4,9 @@
 SHAREDIR = $(DESTDIR)/usr/share/fai
 DOCDIR=$(DESTDIR)/usr/share/doc/fai
 
+# we never want CVS and subversion files in our packages
+export DH_ALWAYS_EXCLUDE=CVS:.svn
+
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 

Modified: people/lazyboy/r-2_8_4-fai-cd_sarge_fixes/scripts/fai-cd
===================================================================
--- people/lazyboy/r-2_8_4-fai-cd_sarge_fixes/scripts/fai-cd	2005-10-20 20:48:26 UTC (rev 2970)
+++ people/lazyboy/r-2_8_4-fai-cd_sarge_fixes/scripts/fai-cd	2005-10-20 20:53:54 UTC (rev 2971)
@@ -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."