misc fixes and improvements

[distro-setup] / distro-end

diff --git a/distro-end b/distro-end
index 51f4bc448b2eb41eb5f68bd896c9af97fa5f20f0..ee6693c360dab7b690037dbfa763ca37a1f24326 100755 (executable)
--- a/distro-end
+++ b/distro-end
@@ -633,6 +633,9 @@ EOF
 
     sd /etc/openvpn/client-config-hole/onep9 <<'EOF'
 ifconfig-push 10.5.5.14 255.255.255.0
+EOF
+    sd /etc/openvpn/client-config-hole/bo <<'EOF'
+ifconfig-push 10.5.5.13 255.255.255.0
 EOF
     sd /etc/openvpn/client-config-hole/sy <<'EOF'
 ifconfig-push 10.5.5.12 255.255.255.0
@@ -830,7 +833,7 @@ esac
 
 ### system76 things ###
 case $HOSTNAME in
-  sy)
+  sy|bo)
     # note, i stored the initial popos packages at /a/bin/data/popos-pkgs
     if [[ ! -e /etc/apt/sources.list.d/system76.list ]]; then
       # https://blog.zackad.dev/en/2017/08/17/add-ppa-simple-way.html
@@ -848,7 +851,7 @@ EOF
       # Pin: release o=LP-PPA-system76-dev-stable
       # Pin-Priority: 1001
       # EOF
-      pi system76-driver system76-firmware-cli
+      pi system76-driver system76-firmware
       # if you get a notice about a firmware update, the notifier on i3
       # is too dumb to do anything when you click it. so to see
       # a changelog, cd to
@@ -1179,9 +1182,13 @@ case $HOSTNAME in
 esac
 
 # user for short term use dropping of privileges
-s groupadd -g 1023 zu
-s useradd -g 1023 -u 1023 -c zu -s /bin/bash zu
 
+if ! getent group zu &>/dev/null; then
+  s groupadd -g 1023 zu
+fi
+if ! getent passwd zu &>/dev/null; then
+  s useradd -g 1023 -u 1023 -c zu -s /bin/bash zu
+fi
 
 
 # these things persist in ~/.config/syncthing, which I save in