Merge remote-tracking branch 'ArrayBolt3/arraybolt3/privleap'

Author: adrelanos

etc/privleap/conf.d/usability-misc.conf

@@ -0,0 +1,3 @@
+[apt-get-update-plus-dist-upgrade]
+Command=apt-get-update-plus dist-upgrade
+AuthorizedUser=sysmaint

etc/sudoers.d/upgrade-passwordless

@@ -8,6 +8,7 @@ set -e
 [ -n "$apt_get_update_wrapper" ] || apt_get_update_wrapper="apt-get update"
 [ -n "$apt_bin" ] || apt_bin=apt-get
 
+export DEBIAN_FRONTEND='noninteractive'
 $apt_get_wrapper_pre $apt_get_update_wrapper $apt_get_wrapper_post
 
 $apt_get_pre $apt_bin $apt_get_post "$@"

usr/bin/apt-get-update-plus

@@ -5,4 +5,19 @@
 
 set -e
 
-sudo /usr/bin/apt-get-update-plus dist-upgrade
+# shellcheck source=../../../helper-scripts/usr/libexec/helper-scripts/as_root.sh
+source /usr/libexec/helper-scripts/as-root.sh
+
+leaprun_exe="$(which leaprun)"
+# If privleap is installed and usable by the current user, use that, otherwise
+# try to run the script directly. This allows upgrade-nonroot to work even if
+# privleapd isn't running or the root user has no privleap socket.
+if [ -n "${leaprun_exe}" ] \
+  && [ -f "/etc/privleapd/pid" ] \
+  && [ -d "/proc/$(cat /etc/privleapd/pid)" ] \
+  && [ -e "/etc/privleapd/comm/$(id -nu)" ]; then
+  "${leaprun_exe}" apt-get-update-plus-dist-upgrade
+else
+  as_root
+  /usr/bin/apt-get-update-plus dist-upgrade
+fi