From 8730d8986b29c6481223b02a85eaf448212a97c1 Mon Sep 17 00:00:00 2001 From: Ian Kelling Date: Thu, 3 Mar 2016 23:44:25 -0800 Subject: [PATCH] fix unison on testing and dir perms --- fai/config/distro-install-common/end | 2 +- fai/config/files/etc/apt/preferences.d/unstable/DEBIAN | 5 ----- fai/config/scripts/GRUB_PC/11-ian | 3 ++- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/fai/config/distro-install-common/end b/fai/config/distro-install-common/end index 9f92418..6bb2880 100755 --- 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 c3e464b..4ae9f6c 100644 --- 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 7cc2341..1bb4fda 100755 --- 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 -- 2.30.2