Move independent repo myunison into this repo

[distro-setup] / distro-begin

diff --git a/distro-begin b/distro-begin
index aa19cfabc8189dea6d685da71e146d012043648e..71e2a56d80c7e26bda12ee316b7b433061730d97 100755 (executable)
--- a/distro-begin
+++ b/distro-begin
@@ -186,20 +186,8 @@ if [[ $EUID == 0 ]]; then
 fi
 
 
-#### begin link bashrc repo for all users ######
-for x in /a/c/repos/bash/!(.git|..|.); do
-    lnf "$x" /home/ian
-    sudo -u traci -i <<EOF
-PATH="/a/exe:$PATH"
-lnf "$x" /home/traci
-EOF
-    sudo -i <<EOF
-PATH="/a/exe:$PATH"
-lnf $x /root
-EOF
-done
-#### end link bashrc repo for all users ######
-
+# this needs to be before installing pacserve so we have gpg conf.
+conflink
 
 set +x
 errallow
@@ -219,9 +207,6 @@ EOF
 isfedora && tu /etc/sysctl.conf 'kernel.sysrq = 1'
 
 
-# this needs to be before installing pacserve so we have gpg conf.
-conflink
-
 if isdebian; then
     codename=$(debian-codename)
     if isdebian-stable && has_x; then
@@ -325,6 +310,11 @@ case $(distro-name) in
                 # I switch to using firefox-esr. note: They seem
                 # to release a new esr version every 9 months or so.
                 pi firefox/unstable
+                s dd of=/etc/apt/preferences.d/firefox <<'EOF'
+Package: firefox
+Pin: release a=unstable
+Pin-Priority: 500
+EOF
             fi
         fi
         # for hosts which require nonfree drivers