[Debconf-video-commits] r269 - in fai-config: files/etc/apt/sources.list scripts/DEBCONF

[holger at alioth.debian.org]

Author: holger
Date: 2008-08-23 16:39:58 +0000 (Sat, 23 Aug 2008)
New Revision: 269

Modified:
   fai-config/files/etc/apt/sources.list/postinst
   fai-config/scripts/DEBCONF/15-apt
Log:
...

Modified: fai-config/files/etc/apt/sources.list/postinst
===================================================================
--- fai-config/files/etc/apt/sources.list/postinst	2008-08-23 16:35:11 UTC (rev 268)
+++ fai-config/files/etc/apt/sources.list/postinst	2008-08-23 16:39:58 UTC (rev 269)
@@ -13,8 +13,8 @@
 
 # either use local mirror or ftp.de.debian.org
 TMPFILE=`mktemp -p /tmp`
-if $( wget -q http://mirror/debian/dists/$DISTRO/Release.gpg -O $TMPFILE && file $TMPFILE | grep PGP > /dev/null ) ; then MIRROR=mirror 
-else MIRROR=ftp.de.debian.org ; fi
+if $( wget -q http://mirror/debian/dists/$DISTRO/Release.gpg -O $TMPFILE && file $TMPFILE | grep PGP > /dev/null ) ; then export MIRROR=mirror 
+else export MIRROR=ftp.de.debian.org ; fi
 rm $TMPFILE 
 
 # modify copied file

Modified: fai-config/scripts/DEBCONF/15-apt
===================================================================
--- fai-config/scripts/DEBCONF/15-apt	2008-08-23 16:35:11 UTC (rev 268)
+++ fai-config/scripts/DEBCONF/15-apt	2008-08-23 16:39:58 UTC (rev 269)
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-fcopy -r -M -i /etc/apt
+fcopy -r -M /etc/apt
 $ROOTCMD apt-get update