fix unison on testing and dir perms

diff --git a/fai/config/distro-install-common/end b/fai/config/distro-install-common/end
index 9f92418102085471491f2e116ea9386040c89ceb..6bb2880ef82a3f160c9cdcf31bed07826929220f 100755 (executable)
--- a/fai/config/distro-install-common/end
+++ b/fai/config/distro-install-common/end
@@ -25,7 +25,7 @@ $ROOTCMD ln -s /q/p /
 
 while true; do
     $ROOTCMD chown 1000:1000 $dir
-    $ROOTCMD chmod 660 $dir
+    $ROOTCMD chmod 700 $dir
     dir=$(dirname $dir)
     [[ $dir != /q ]] || break
 done

diff --git a/fai/config/files/etc/apt/preferences.d/unstable/DEBIAN b/fai/config/files/etc/apt/preferences.d/unstable/DEBIAN
index c3e464bf8fe4d11b68c2e7c56105aba2d179838e..4ae9f6ce53fc0e884366148ee10e5adf0bf3960a 100644 (file)
--- a/fai/config/files/etc/apt/preferences.d/unstable/DEBIAN
+++ b/fai/config/files/etc/apt/preferences.d/unstable/DEBIAN
@@ -14,8 +14,3 @@ Pin-Priority: 30
 Package: *
 Pin: release a=unstable-updates
 Pin-Priority: 30
-
-
-Explanation: Allow this testing package to automatically upgrade.
-Package: unison
-Pin-Piority: 100

diff --git a/fai/config/scripts/GRUB_PC/11-ian b/fai/config/scripts/GRUB_PC/11-ian
index 7cc2341da53ff0234605ab6c460318458a369c88..1bb4fda2d7e5b60e9b2a4516b7b042734ebfdece 100755 (executable)
--- a/fai/config/scripts/GRUB_PC/11-ian
+++ b/fai/config/scripts/GRUB_PC/11-ian
@@ -32,7 +32,8 @@ chown -R root:root /root/.ssh
 usermod -aG cdrom,floppy,sudo,audio,dip,video,plugdev,netdev,kvm,systemd-journal ian
 EOF
 
+
+apt-get -y install unison-gtk
 if ifclass STABLE; then
-    apt-get -y install unison-gtk
     apt-get -y install unison-gtk/testing
 fi