X-Git-Url: https://iankelling.org/git/?p=distro-setup;a=blobdiff_plain;f=distro-end;h=52199b8216d2167f6ee6acd6aa9aa4ff93dadfa1;hp=fe3ebcf43b3458ef24a8e0acd561ca7b9882c8ad;hb=6f1f8a104c9b38936ade2d27e835479523985133;hpb=1a9542b37443a84e55e175db8ddef4e99f434fb5

diff --git a/distro-end b/distro-end
index fe3ebcf..52199b8 100755
--- a/distro-end
+++ b/distro-end
@@ -93,7 +93,7 @@ case $distro in
   trisquel|ubuntu)
     # this isn't a complete solution. It still shows me when updates are available,
     # but it's no big deal.
-    s t /etc/update-motd.d/10-help-text /etc/update-motd.d/00-header
+    s rm -f /etc/update-motd.d/10-help-text /etc/update-motd.d/00-header
     ;;
 esac
 
@@ -434,7 +434,7 @@ EOF
 
         s dd of=/etc/apt/preferences.d/debian-goodies <<EOF
 Package: debian-goodies
-Pin: release n=buster
+Pin: release n=etiona
 Pin-Priority: 1005
 EOF
 
@@ -443,32 +443,43 @@ EOF
 Package: *
 Pin: release n=buster
 Pin-Priority: -100
-EOF
 
-        # stupid buster uses some key algorithm not supported by flidas gpg that apt uses.
-        s dd of=/etc/apt/apt.conf.d/01iank <<'EOF'
-Acquire::AllowInsecureRepositories "true";
+Package: *
+Pin: release n=buster-updates
+Pin-Priority: -100
 EOF
 
-        t=$(mktemp)
-        cat >$t <<EOF
-deb http://http.us.debian.org/debian buster main
-deb-src http://http.us.debian.org/debian buster main
-
-deb http://security.debian.org/ buster/updates main
-deb-src http://security.debian.org/ buster/updates main
+        # dont use buster because it causes dist-upgrade to think its downgrading
+        # packages while really just reinstalling the same version.
+        f=/etc/apt/apt.conf.d/01iank
+        rm -f $f
+#         # stupid buster uses some key algorithm not supported by flidas gpg that apt uses.
+#         s dd of=/etc/apt/apt.conf.d/01iank <<'EOF'
+# Acquire::AllowInsecureRepositories "true";
+# EOF
 
-deb http://http.us.debian.org/debian buster-updates main
-deb-src http://http.us.debian.org/debian buster-updates main
-EOF
         f=/etc/apt/sources.list.d/buster.list
-        if ! diff -q $t $f; then
-          s cp $t $f
-          s chmod 644 $f
-          p update
-        fi
+        rm -f $f
+#         t=$(mktemp)
+#         cat >$t <<EOF
+# deb http://http.us.debian.org/debian buster main
+# deb-src http://http.us.debian.org/debian buster main
+
+# deb http://security.debian.org/ buster/updates main
+# deb-src http://security.debian.org/ buster/updates main
 
-        # newer version needed for false positive in checkrestart
+# deb http://http.us.debian.org/debian buster-updates main
+# deb-src http://http.us.debian.org/debian buster-updates main
+# EOF
+#         if ! diff -q $t $f; then
+#           s cp $t $f
+#           s chmod 644 $f
+#           p update
+#         fi
+
+        # newer version needed for false positive in checkrestart.
+        # I did buster at first, but other problem above with having
+        # buster repos. not sure if the false positive exists in etiona.
         p install -y --allow-unauthenticated debian-goodies
 
         s dd of=/etc/apt/preferences.d/shellcheck <<EOF
@@ -485,6 +496,20 @@ Pin: release a=etiona-security
 Pin-Priority: 1005
 EOF
 
+        s dd of=/etc/apt/preferences.d/bash <<EOF
+Package: bash
+Pin: release a=etiona
+Pin-Priority: 1005
+
+Package: bash
+Pin: release a=etiona-updates
+Pin-Priority: 1005
+
+Package: bash
+Pin: release a=etiona-security
+Pin-Priority: 1005
+EOF
+
 
         ;;
       *)