openstack/devstack
Code Issues Proposed changes

Merge "Fix path setup in add_sudo_secure_path"

Browse Source
This commit is contained in:
Jenkins 2015-12-06 13:34:19 +00:00 committed by Gerrit Code Review
commit 563c68f3cd
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
inc/rootwrap
View File

@ -22,14 +22,14 @@ function add_sudo_secure_path {
local line local line
# This is pretty simplistic for now - assume only the first line is used # This is pretty simplistic for now - assume only the first line is used
if [[ -r SUDO_SECURE_PATH_FILE ]]; then if [[ -r $SUDO_SECURE_PATH_FILE ]]; then
line=$(head -1 $SUDO_SECURE_PATH_FILE) line=$(head -1 $SUDO_SECURE_PATH_FILE)
else else
line="Defaults:$STACK_USER secure_path=/usr/local/sbin:/usr/local/bin:/usr/sbin:/sbin:/usr/bin:/bin" line="Defaults:$STACK_USER secure_path=/usr/local/sbin:/usr/local/bin:/usr/sbin:/sbin:/usr/bin:/bin"
fi fi
# Only add ``dir`` if it is not already present # Only add ``dir`` if it is not already present
if [[ $line =~ $dir ]]; then if [[ ! $line =~ $dir ]]; then
echo "${line}:$dir" | sudo tee $SUDO_SECURE_PATH_FILE echo "${line}:$dir" | sudo tee $SUDO_SECURE_PATH_FILE
sudo chmod 400 $SUDO_SECURE_PATH_FILE sudo chmod 400 $SUDO_SECURE_PATH_FILE
sudo chown root:root $SUDO_SECURE_PATH_FILE sudo chown root:root $SUDO_SECURE_PATH_FILE