From 3024b7cceb31418712c0ccdbe9edc5bbab9291e9 Mon Sep 17 00:00:00 2001 From: Ian Kelling Date: Sun, 4 Sep 2016 19:33:20 -0700 Subject: [PATCH] minor fixes --- distro-begin | 7 ++++++- distro-end | 11 ++++++++--- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/distro-begin b/distro-begin index 222eb5c..17b45c2 100755 --- 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 897e4e9..77588bf 100755 --- 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 -- 2.30.2