small fixes

diff --git a/fai/config/distro-install-common/end b/fai/config/distro-install-common/end
index 48559992f3a6ebcce5e6193a841c50fbb045d428..28f9d5b5f835eea8d7bbcd63a742383407cf3c44 100755 (executable)
--- a/fai/config/distro-install-common/end
+++ b/fai/config/distro-install-common/end
@@ -18,6 +18,7 @@ echo 'ian  ALL=(ALL)  NOPASSWD: ALL' >> $target/etc/sudoers
 
 dir=/q/p/c/machine_specific/$HOSTNAME/.unison
 $ROOTCMD mkdir -p $dir
+$ROOTCMD chown 1000:1000 $dir
 $ROOTCMD rm -rf /root/.unison
 $ROOTCMD ln -s $dir /root
 $ROOTCMD ln -s /q/p /

diff --git a/fai/config/package_config/DESKTOP b/fai/config/package_config/DESKTOP
index 8028484a7c2b87247a8d57d5b2b9e4bb6f328954..b2d8d1a47d89988ffb30879483be3000d7a35e42 100644 (file)
--- a/fai/config/package_config/DESKTOP
+++ b/fai/config/package_config/DESKTOP
@@ -1,2 +1,16 @@
+# unison version compat:
+# deb/ubuntu, it depends what version they have.
+# arch and fedora have unison240 and unison-240-compat respectively,
+# but that failed to sync with an ubuntu 12.04 which had unson 2.40,
+# so I installed latest stable manualy
+
+# wget http://caml.inria.fr/pub/distrib/ocaml-4.02/ocaml-4.02.3.tar.gz
+# ./configure
+# make world opt
+# s make install
+
+# wget http://www.seas.upenn.edu/~bcpierce/unison//download/releases/stable/unison-2.48.3.tar.gz
+# make
+# s cp unison /usr/local/bin
 PACKAGES install
 unison

diff --git a/fai/config/scripts/GRUB_PC/11-ian b/fai/config/scripts/GRUB_PC/11-ian
index d9534b024f40dd96bd912aa53b03d04a14c5c588..cca34935031e839797eb9c0af08751fa96e5ea14 100755 (executable)
--- a/fai/config/scripts/GRUB_PC/11-ian
+++ b/fai/config/scripts/GRUB_PC/11-ian
@@ -15,5 +15,5 @@ $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
-$ROOTCMD usermod -aG cdrom,floppy,sudo,audio,dip,video,plugdev,netdev,kvm ian
+# default jessie groups + kvm & systemd-journal
+$ROOTCMD usermod -aG cdrom,floppy,sudo,audio,dip,video,plugdev,netdev,kvm,systemd-journal ian