fix unison on testing and dir perms

[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..1bb4fda2d7e5b60e9b2a4516b7b042734ebfdece 100755 (executable)
--- a/fai/config/scripts/GRUB_PC/11-ian
+++ b/fai/config/scripts/GRUB_PC/11-ian
@@ -6,19 +6,34 @@ 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
 
+if ifclass DEBIAN; then
+    fcopy -M /etc/apt/preferences.d/unstable
+    fcopy -riM /etc/apt/sources.list.d
+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 -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
+rm -f /target/etc/apt/sources.list
+
+chroot /target bash <<'EOF'
+chown -R 1000:1000 /home/ian/.ssh
+chmod -R u=Xrw,og= /home/ian/.ssh
+cp -ar /home/ian/.ssh /root
+chown -R root:root /root/.ssh
+
+# default jessie groups + kvm & systemd-journal
+usermod -aG cdrom,floppy,sudo,audio,dip,video,plugdev,netdev,kvm,systemd-journal ian
+EOF
 
-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 usermod -aG cdrom,floppy,sudo,audio,dip,video,plugdev,netdev ian
+apt-get -y install unison-gtk
+if ifclass STABLE; then
+    apt-get -y install unison-gtk/testing
+fi