From 5e2d0e0bb5beffc23087383e7923dabaa2004a98 Mon Sep 17 00:00:00 2001 From: Alex Monk Date: Tue, 4 Jun 2019 01:21:44 +0100 Subject: [PATCH] Permit use of sudo-ldap instead of sudo package If the sudo-ldap package is providing the sudo command instead of the plain sudo package, accept that instead of breaking the system and requiring direct root login intervention to fix things. Change-Id: I45d7e4617bd59e72b4f0bf2e91750a6830e2a010 --- stack.sh | 2 +- tools/create-stack-user.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/stack.sh b/stack.sh index fa5b43ce38..9b3097ba23 100755 --- a/stack.sh +++ b/stack.sh @@ -247,7 +247,7 @@ disable_negated_services # -------------- # We're not as **root** so make sure ``sudo`` is available -is_package_installed sudo || install_package sudo +is_package_installed sudo || is_package_installed sudo-ldap || install_package sudo # UEC images ``/etc/sudoers`` does not have a ``#includedir``, add one sudo grep -q "^#includedir.*/etc/sudoers.d" /etc/sudoers || diff --git a/tools/create-stack-user.sh b/tools/create-stack-user.sh index c0b7ac70aa..919cacb036 100755 --- a/tools/create-stack-user.sh +++ b/tools/create-stack-user.sh @@ -32,7 +32,7 @@ GetDistro source $TOP_DIR/stackrc # Give the non-root user the ability to run as **root** via ``sudo`` -is_package_installed sudo || install_package sudo +is_package_installed sudo || is_package_installed sudo-ldap || install_package sudo [[ -z "$STACK_USER" ]] && die "STACK_USER is not set. Exiting."