disk detection, fixes for deb stable

[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 24a10ae6f476dfba44a332f0c22f8aaac76cdd1a..6823a0bcec29748ffab1986226ee0e901f2803a8 100755 (executable)
--- a/fai/config/scripts/GRUB_PC/11-ian
+++ b/fai/config/scripts/GRUB_PC/11-ian
@@ -6,9 +6,24 @@ trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?"' ERR
 $ROOTCMD adduser --disabled-password --gecos ian ian
 $ROOTCMD usermod -p "$ROOTPW" ian
 
+if ifclass STABLE; then
+    fcopy -M /etc/apt/preferences
+fi
+
+
+# -i, ignore nonmatching class error, always return 0.
+fcopy -r -M -i /home/ian/.ssh
 /var/lib/fai/config/distro-install-common/end
 
-fcopy -r -m 1000,1000,700 -i /home/ian/.ssh
 
-# the defaults in wheezy
-$ROOTCMD usermod -aG cdrom,floppy,sudo,audio,dip,video,plugdev,netdev ian
+# could also use: chroot /target script-file
+$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
+
+# default jessie groups + kvm & systemd-journal
+$ROOTCMD usermod -aG cdrom,floppy,sudo,audio,dip,video,plugdev,netdev,kvm,systemd-journal ian
+
+
+$ROOTCMD apt-get -y install unison/testing