various fixes and updates

[distro-setup] / distro-end

diff --git a/distro-end b/distro-end
index 18edaa56b8db4e3485e37f9d327acbdf62c40343..a53c8c8c26c593e236846c38dda1ea0b6eb95002 100755 (executable)
--- a/distro-end
+++ b/distro-end
@@ -181,6 +181,10 @@ Pin-Priority: -100
 Package: *
 Pin: release a=xenial-security
 Pin-Priority: -100
+
+Package: firefox
+Pin: release n=xenial
+Pin-Priority: 500
 EOF
     sd /etc/apt/sources.list.d/xenial.list 2>/dev/null <<EOF
 deb http://us.archive.ubuntu.com/ubuntu/ xenial main
@@ -606,6 +610,11 @@ case $codename_compat in
     ;;
   bionic)
     pi gnome-core
+    # by default, it sleeps when not logged in to x/wayland and on ac power.
+    # stop that.
+    sudo -u gdm dbus-launch gsettings set org.gnome.settings-daemon.plugins.power sleep-inactive-ac-type 'nothing'
+    systemctl --user stop gvfs-daemon
+    systemctl --user disable gvfs-daemon
     ;;
 esac
 
@@ -615,12 +624,12 @@ if [[ $codename_compat == flidas ]]; then
   pi gnupg-doc
 fi
 
-if [[ $codename == flidas ]]; then
-  pi abrowser
-else
-  pi firefox
-  sudo ln -sf /usr/bin/firefox /usr/local/bin/abrowser
-fi
+# abrowser is not in etiona yet, abrowser version is 68,
+# abrowser won't run on a firefox profile that was on firefox
+# version 70. firefox in ubuntu is at version 70.
+# have to rm compabibility.ini to even try downgrade.
+pi firefox
+sudo update-alternatives --set x-www-browser /usr/bin/firefox
 
 # TODO: some of the X programs can be removed from pall when using wayland