various fixes and improvements

[distro-setup] / distro-begin

diff --git a/distro-begin b/distro-begin
index 904bc7908efb4b3a9203ad8a40676922a6f1ffe1..5ae900f8b122d296cc511598e25b9bcddb857f8f 100755 (executable)
--- a/distro-begin
+++ b/distro-begin
@@ -193,6 +193,11 @@ lnf $x /root
 EOF
 done
 #### end link bashrc repo for root ######
+
+# li needs the bind group before conflink
+if [[ $HOSTNAME == li ]]; then
+    getent group bind &>/dev/null || sudo groupadd -r bind
+fi
 # this needs to be before installing pacserve so we have gpg conf.
 conflink
 
@@ -219,23 +224,19 @@ isfedora && tu /etc/sysctl.conf 'kernel.sysrq = 1'
 
 
 if isdeb; then
-    if isdebian-stable && has_x; then
-        codename=$(debian-codename)
-        s dd of=/etc/apt/sources.list.d/mozilla-iceweasel.list <<EOF
-deb http://mozilla.debian.net/ $codename-backports firefox-release
-deb-src http://mozilla.debian.net/ $codename-backports firefox-release
-EOF
-        p update
-        # take care of mozilla signing errors in previous command
-        pi pkg-mozilla-archive-keyring
-        p update
-    else
-        :
-        # this would change stable to testing, but I set that up already.
-        # It\'s just a no-op if its already testing.
-        # sudo sed -ri 's!^( *[^ #]+ +[^ ]+ +)[[:alpha:]]+(.*)!\1testing\2!' /etc/apt/sources.list
-        p update
-    fi
+    codename=$(debian-codename)
+    ## ian: disabled. backports are not being published atm due to rust packaging issue
+    #     if isdebian-stable && has_x; then
+    #         s dd of=/etc/apt/sources.list.d/mozilla-iceweasel.list <<EOF
+    # deb http://mozilla.debian.net/ $codename-backports firefox-release
+    # deb-src http://mozilla.debian.net/ $codename-backports firefox-release
+    # EOF
+    #         p update
+    #         # take care of mozilla signing errors in previous command
+    #         pi pkg-mozilla-archive-keyring
+    #     fi
+    p update
+
 fi
 
 if isarch; then
@@ -303,39 +304,11 @@ if has_p; then
 fi
 
 
-# basic needed packages
+##### basic needed packages
+
+### begin setup for keyboard and redshift ###
 case $(distro-name) in
-    debian)
-        if has_x; then
-            if isdebian-stable; then
-                pi firefox/$codename-backports
-            else
-                # for a while, firefox/unstable did not have
-                # dependencies satisfied by testing packages, and i hit
-                # a conflict, it wanted a newer libfontconfig1, but
-                # emacs build-deps wanted an older one. In this case,
-                # 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
-        # # no hosts have nonfree firmware anymore, yay. but leaving commented,
-        # # as i might run into one for a little while still.
-        # p=firmware-linux-nonfree
-        # if apt-cache show $p &>/dev/null; then
-        #     pi $p
-        # fi
-        ;;&
-    trisquel|ubuntu)
-        if has_x; then
-            pi abrowser
-        fi
-        ;;&
+
     trisquel|ubuntu|debian)
         if has_x; then
             if isdebian-testing; then
@@ -520,10 +493,12 @@ EOF
         fi
         ;;&
 esac
-
 if has_x; then
     pi xbindkeys
 fi
+### end setup for keyboard and redshift ###
+
+
 pi cryptsetup lvm2
 # enables trim for volume delete, other rare commands.
 sudo $sed -ri 's/( *issue_discards\b).*/\1 = 1/' /etc/lvm/lvm.conf