[Debconf-video-commits] r529 - fai-config/doc/src

[Holger Levsen]

Author: holger
Date: 2010-07-11 14:33:31 +0000 (Sun, 11 Jul 2010)
New Revision: 529

Modified:
   fai-config/doc/src/final_setup.sh
   fai-config/doc/src/preseed.cfg
Log:
use ftp.us.d.o, no more packages from my repo, dc-repo is signed, finally

Modified: fai-config/doc/src/final_setup.sh
===================================================================
--- fai-config/doc/src/final_setup.sh	2010-07-01 23:13:31 UTC (rev 528)
+++ fai-config/doc/src/final_setup.sh	2010-07-11 14:33:31 UTC (rev 529)
@@ -1,7 +1,7 @@
 #! /bin/bash
 
 #
-# Copyright 2006-2008 Holger Levsen 
+# Copyright 2006-2010 Holger Levsen 
 # released under the GPLv=2
 #
 
@@ -12,7 +12,7 @@
 DISTRO=lenny
 
 # hardcode mirror to use
-MIRROR=ftp.de.debian.org 
+MIRROR=ftp.us.debian.org 
 #
 ## either use local mirror or ftp.de.debian.org
 #apt-get install file
@@ -34,11 +34,6 @@
 deb http://db.debconf.org/dc-admin/archive/ $DISTRO/all/
 " > /etc/apt/sources.list
 
-# /me hates this - we should definitly fix this before DebConf9
-echo 'APT::Get::AllowUnauthenticated "true";
-Aptitude::CmdLine::Ignore-Trust-Violations "true";
-' > /etc/apt/apt.conf.d/7debconf7
-
 # install fai clients and recommended stuff
 apt-get update
 DEBCONF_FRONTEND=noninteractive  DEBIAN_FRONTEND=noninteractive apt-get install fai-client subversion 

Modified: fai-config/doc/src/preseed.cfg
===================================================================
--- fai-config/doc/src/preseed.cfg	2010-07-01 23:13:31 UTC (rev 528)
+++ fai-config/doc/src/preseed.cfg	2010-07-11 14:33:31 UTC (rev 529)
@@ -145,16 +145,16 @@
 #d-i apt-setup/security_host string
 
 # Additional repositories, local[0-9] available
-d-i apt-setup/local0/repository string \
-	http://layer-acht.org/debian lenny fai
-d-i apt-setup/local0/comment string holgers pakete
+#d-i apt-setup/local0/repository string \
+#	http://layer-acht.org/debian lenny fai
+#d-i apt-setup/local0/comment string holgers packages
 
 # Enable deb-src lines
 d-i apt-setup/local0/source boolean true
 # URL to the public key of the local repository; you must provide a key or
 # apt will complain about the unauthenticated repository and so the
 # sources.list line will be left commented out
-d-i apt-setup/local0/key string http://layer-acht.org/ac583520.asc
+#d-i apt-setup/local0/key string http://layer-acht.org/ac583520.asc
 #FIXME: this should work... but the below is secure :)
 #d-i apt-setup/local0/key string file:///hd-media/ac583520.asc