small fixes. httpredir is not fast,and requires a noreuseconnection in apt cacher...

diff --git a/fai/config/distro-install-common/end b/fai/config/distro-install-common/end
index 61b99ac0fa1e8c8edd5f37972a1ea674d0e2b90c..48559992f3a6ebcce5e6193a841c50fbb045d428 100755 (executable)
--- a/fai/config/distro-install-common/end
+++ b/fai/config/distro-install-common/end
@@ -21,7 +21,6 @@ $ROOTCMD mkdir -p $dir
 $ROOTCMD rm -rf /root/.unison
 $ROOTCMD ln -s $dir /root
 $ROOTCMD ln -s /q/p /
-$ROOTCMD ln -s /q/a /
 
 # kvm is normally created by some package,
 # but unison doesn't like unknown groups, so make it now so initial sync works.

diff --git a/fai/config/files/etc/apt/sources.list/DEFAULT b/fai/config/files/etc/apt/sources.list/DEFAULT
index 2877f34a6d8c7410bd5b4a8d8a77dcc7aeacd4a9..6a768849d17b35722822395b09ad7e40e77903ea 100644 (file)
--- a/fai/config/files/etc/apt/sources.list/DEFAULT
+++ b/fai/config/files/etc/apt/sources.list/DEFAULT
@@ -1,9 +1,9 @@
-deb http://httpredir.debian.org/debian testing main
+deb http://http.us.debian.org/debian testing main
 deb-src http://http.us.debian.org/debian testing main
 
 deb http://security.debian.org/ testing/updates main
 deb-src http://security.debian.org/ testing/updates main
 
 # jessie-updates, previously known as 'volatile'
-deb http://httpredir.debian.org/debian testing-updates main
+deb http://http.us.debian.org/debian testing-updates main
 deb-src http://http.us.debian.org/debian testing-updates main

diff --git a/fai/config/hooks/partition.DEFAULT b/fai/config/hooks/partition.DEFAULT
index 0b406ecea6f7e3224c08e0188ce243a11423aad2..19438042a79c5baa9f5a171b89e62e7eee6b41ce 100755 (executable)
--- a/fai/config/hooks/partition.DEFAULT
+++ b/fai/config/hooks/partition.DEFAULT
@@ -30,8 +30,7 @@ skiptask partition ||: # for running out of fai
 devs=(${letters[@]/#//dev/${d}})
 crypt_devs=(${letters[@]/#//dev/mapper/crypt_dev_${d}})
 
-# we can set this manually to force partitioning
-#partition=false
+partition=false
 
 # somewhat crude detection of whether to partition
 for dev in ${devs[@]}; do

diff --git a/fai/config/scripts/GRUB_PC/11-ian b/fai/config/scripts/GRUB_PC/11-ian
index 9f8cf68e622c2b1df57cc3d6938aa7f935bb7ab3..d9534b024f40dd96bd912aa53b03d04a14c5c588 100755 (executable)
--- a/fai/config/scripts/GRUB_PC/11-ian
+++ b/fai/config/scripts/GRUB_PC/11-ian
@@ -10,7 +10,6 @@ $ROOTCMD usermod -p "$ROOTPW" ian
 fcopy -rM -i /home/ian/.ssh
 /var/lib/fai/config/distro-install-common/end
 
-
 $ROOTCMD chown -R 1000:1000 /home/ian/.ssh
 $ROOTCMD chmod -R u=Xrw,og= /home/ian/.ssh
 $ROOTCMD cp -ar /home/ian/.ssh /root