Hi,
great to see some progress on this issue.
On Sat, Nov 10, 2012 at 09:03:14PM +0100, Thomas Lange wrote:
>
> This is not a proper way to check if it's an installation from CD:
> grep -q cskoeln $FAI_ETC_DIR/apt/sources.list
>
> It's better to check if /etc/RUNNING_FROM_FAICD exists.
Reworked patch just tested here:
diff --git a/lib/subroutines b/lib/subroutines
index e1da83f..32651f7 100644
--- a/lib/subroutines
+++ b/lib/subroutines
@@ -952,6 +952,11 @@ task_repository () {
fi
fcopy -ir /etc/apt # copy all other apt config files from the config space
+ if [ -f $FAI_ETC_DIR/apt/sources.list ] && [ -e /etc/RUNNING_FROM_FAICD ]
; then
+ echo "We install from a fai-cd image; use mirror from CD:"
+ cp -vr $FAI_ETC_DIR/apt/* $FAI_ROOT/etc/apt/
+ fi
+
if [ X$FAI_ALLOW_UNSIGNED = X1 ]; then
cat <<EOF > $FAI_ROOT/etc/apt/apt.conf.d/10fai
APT::Get::AllowUnauthenticated "true";
Best regards,
Andi
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
