minor fixes

diff --git a/distro-begin b/distro-begin
index 222eb5ceca2ece5b8b9cccacce59bac8368b051e..17b45c239db7e0b1b0524d9c17861aef07d550ad 100755 (executable)
--- a/distro-begin
+++ b/distro-begin
@@ -371,7 +371,12 @@ case $(distro-name) in
         ;;&
     ubuntu|debian)
         if has_x; then
-            pi xmacro gtk-redshift xinput
+            if isdebian-stable; then
+                pi xmacro
+            else
+                pi xmacro/unstable # has no unstable deps
+            fi
+            pi gtk-redshift xinput
         fi
         ;;&
     fedora)

diff --git a/distro-end b/distro-end
index 897e4e95bd2bce1480f472091031ce6771410e2c..77588bf57c44a76f632bbf396d5b7db45a014f08 100755 (executable)
--- a/distro-end
+++ b/distro-end
@@ -197,7 +197,10 @@ case $(distro-name) in
         # this says disabling the service, it will still get restarted
         # but this script doesn't do anything on restart, so it should be fine
         s dd of=/var/run/motd.dynamic if=/dev/null
-        s update-rc.d motd disable
+        # stretch doesn't have initscripts pkg installed by default
+        if [[ $(debian-codename) == jessie ]]; then
+            s update-rc.d motd disable
+        fi
         ;;
     ubuntu)
         # this isn't a complete solution. It still shows me when updates are available,
@@ -720,6 +723,8 @@ Accept=false
 [Install]
 WantedBy=sockets.target
 EOF
+        # had this fail with 'Failed to connect to bus: No such file or directory'
+        # then when I tried it manually, it worked fine...
         systemctl --user daemon-reload
         ;;&
     *)
@@ -800,8 +805,8 @@ DEVICESCAN -a -o on -S on -n standby,q $sched\
 ########### misc stuff
 
 
-if ! sudo test -e /etc/openvpn/client.key; then
-    /a/bin/vpn-setup/vpn-mk-client-cert
+if [[ $HOSTNAME == frodo ]] && ! sudo test -e /etc/openvpn/client.key; then
+    /a/bin/vpn-setup/vpn-mk-client-cert dopub
 fi