From: Ian Kelling <ian@iankelling.org>
Date: Mon, 1 Feb 2016 04:06:38 +0000 (-0800)
Subject: small fixes. httpredir is not fast,and requires a noreuseconnection in apt cacher... 
X-Git-Url: https://iankelling.org/git/?a=commitdiff_plain;h=d329f65c81ce7e906d82c4e8dcf5b985f718ab4e;p=automated-distro-installer

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

diff --git a/fai/config/distro-install-common/end b/fai/config/distro-install-common/end
index 61b99ac..4855999 100755
--- 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 2877f34..6a76884 100644
--- 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 0b406ec..1943804 100755
--- 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 9f8cf68..d9534b0 100755
--- 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