openstack/devstack
Code Issues Proposed changes

Permit use of sudo-ldap instead of sudo package

Browse Source 
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
This commit is contained in:
Alex Monk 2019-06-04 01:21:44 +01:00
parent 9ffa41ac39
commit 5e2d0e0bb5
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
stack.sh
View File

@ -247,7 +247,7 @@ disable_negated_services
# -------------- # --------------
# We're not as **root** so make sure ``sudo`` is available # 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 # UEC images ``/etc/sudoers`` does not have a ``#includedir``, add one
sudo grep -q "^#includedir.*/etc/sudoers.d" /etc/sudoers || sudo grep -q "^#includedir.*/etc/sudoers.d" /etc/sudoers ||

2
tools/create-stack-user.sh
View File

@ -32,7 +32,7 @@ GetDistro
source $TOP_DIR/stackrc source $TOP_DIR/stackrc
# Give the non-root user the ability to run as **root** via ``sudo`` # 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." [[ -z "$STACK_USER" ]] && die "STACK_USER is not set. Exiting."