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

[automated-distro-installer] / fai / config / scripts / GRUB_PC / 11-ian

diff --git a/fai/config/scripts/GRUB_PC/11-ian b/fai/config/scripts/GRUB_PC/11-ian
index 0ef4afdc48fb3e1e00f8dd77d95f29276db0af61..d9534b024f40dd96bd912aa53b03d04a14c5c588 100755 (executable)
--- a/fai/config/scripts/GRUB_PC/11-ian
+++ b/fai/config/scripts/GRUB_PC/11-ian
@@ -7,18 +7,13 @@ $ROOTCMD adduser --disabled-password --gecos ian ian
 $ROOTCMD usermod -p "$ROOTPW" ian
 
 
-/var/lib/fai/config/distro-install-common/end
-
 fcopy -rM -i /home/ian/.ssh
-chown -R 1000:1000 $target/home/ian/.ssh
-chmod -R u=Xrw,og= $target/home/ian/.ssh
-cp -ar $target/home/ian/.ssh $target/root
-chown -R root:root $target/root/.ssh
+/var/lib/fai/config/distro-install-common/end
 
-for dir in $target/{a,p}/c/machine_specific/$HOSTNAME/.unison; do
-    [[ -e $dir ]] || continue
-    $ROOTCMD rm -rf $target/root/.unison
-    $ROOTCMD ln -s $dir $target/root
-done
+$ROOTCMD chown -R 1000:1000 /home/ian/.ssh
+$ROOTCMD chmod -R u=Xrw,og= /home/ian/.ssh
+$ROOTCMD cp -ar /home/ian/.ssh /root
+$ROOTCMD chown -R root:root /root/.ssh
 
-$ROOTCMD usermod -aG cdrom,floppy,sudo,audio,dip,video,plugdev,netdev ian
+# default jessie groups + kvm
+$ROOTCMD usermod -aG cdrom,floppy,sudo,audio,dip,video,plugdev,netdev,kvm ian