openstack/devstack
Code Issues Proposed changes

Merge "Export the 'short_source' function & don't keep PS4 in sudo"

Browse Source
This commit is contained in:
Jenkins 2016-05-10 21:42:54 +00:00 committed by Gerrit Code Review
commit 37f6ea619e
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
functions
View File

@ -41,6 +41,9 @@ function short_source {
file=${file#$RC_DIR/} file=${file#$RC_DIR/}
printf "%-40s " "$file:${called[1]}:${called[0]}" printf "%-40s " "$file:${called[1]}:${called[0]}"
} }
# PS4 is exported to child shells and uses the 'short_source' function, so
# export it so child shells have access to the 'short_source' function also.
export -f short_source
# Retrieve an image from a URL and upload into Glance. # Retrieve an image from a URL and upload into Glance.

1
stack.sh
View File

@ -240,7 +240,6 @@ echo "$STACK_USER ALL=(root) NOPASSWD:ALL" >$TEMPFILE
# see them by forcing ``PATH`` # see them by forcing ``PATH``
echo "Defaults:$STACK_USER secure_path=/sbin:/usr/sbin:/usr/bin:/bin:/usr/local/sbin:/usr/local/bin" >> $TEMPFILE echo "Defaults:$STACK_USER secure_path=/sbin:/usr/sbin:/usr/bin:/bin:/usr/local/sbin:/usr/local/bin" >> $TEMPFILE
echo "Defaults:$STACK_USER !requiretty" >> $TEMPFILE echo "Defaults:$STACK_USER !requiretty" >> $TEMPFILE
echo "Defaults env_keep += PS4" >> $TEMPFILE
chmod 0440 $TEMPFILE chmod 0440 $TEMPFILE
sudo chown root:root $TEMPFILE sudo chown root:root $TEMPFILE
sudo mv $TEMPFILE /etc/sudoers.d/50_stack_sh sudo mv $TEMPFILE /etc/sudoers.d/50_stack_sh

3
tools/create_userrc.sh
View File

@ -22,6 +22,9 @@ function short_source {
file=${file#$RC_DIR/} file=${file#$RC_DIR/}
printf "%-40s " "$file:${called[1]}:${called[0]}" printf "%-40s " "$file:${called[1]}:${called[0]}"
} }
# PS4 is exported to child shells and uses the 'short_source' function, so
# export it so child shells have access to the 'short_source' function also.
export -f short_source
set -o xtrace set -o xtrace