From 585b001deaf7a9cd5b3ed088ee470f4e1421348a Mon Sep 17 00:00:00 2001 From: Ian Kelling Date: Sun, 7 Feb 2016 19:58:22 -0800 Subject: [PATCH] small fixes --- fai/config/distro-install-common/end | 1 + fai/config/package_config/DESKTOP | 14 ++++++++++++++ fai/config/scripts/GRUB_PC/11-ian | 4 ++-- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/fai/config/distro-install-common/end b/fai/config/distro-install-common/end index 4855999..28f9d5b 100755 --- 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 8028484..b2d8d1a 100644 --- 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 d9534b0..cca3493 100755 --- 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 -- 2.30.2