various fixes and improvements

[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 221b6d4da9277a9eb8a70dbef7df53052cc7570b..5dc250a74faf494db0fe33cf598c5197ec0b8e5d 100755 (executable)
--- a/fai/config/scripts/GRUB_PC/11-ian
+++ b/fai/config/scripts/GRUB_PC/11-ian
@@ -28,6 +28,8 @@ fi
 f=/target/home/ian/.ssh/authorized_keys
 if [[ ! -L $f || -e $f ]]; then
     fcopy -r -M /home/ian/.ssh
+else
+    echo "$0: info: $f exists"
 fi
 /var/lib/fai/config/distro-install-common/end
 
@@ -40,9 +42,10 @@ chmod -R u=Xrw,og= /home/ian/.ssh
 rm -rf /root/.ssh
 cp -rL /home/ian/.ssh /root
 chown -R root:root /root/.ssh
+chmod 700 /root/.ssh
 
 # default jessie groups + kvm & systemd-journal
-usermod -aG cdrom,floppy,sudo,audio,dip,video,plugdev,netdev,kvm,systemd-journal ian
+usermod -aG cdrom,floppy,sudo,audio,dip,video,plugdev,netdev,systemd-journal ian
 EOF
 
 
@@ -65,7 +68,7 @@ for g in plugdev audio video cdrom; do
 done
 
 if ifclass frodo; then
-    $ROOTCMD usermod -p "$(cat /var/lib/fai/config/distro-install-common/shadow/traci-simple)" traci
+    $ROOTCMD usermod -p "$(cat /var/lib/fai/config/distro-install-common/traci-simple)" traci
 fi