openstack/deb-python-diskimage-builder
Code Issues Proposed changes

Merge "Fix race in svc-map"

Browse Source
This commit is contained in:
Jenkins
2015-03-05 00:11:19 +00:00
committed by Gerrit Code Review
parent d3324cbb69 e88be20f1d
commit 4074851682
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
elements/svc-map/extra-data.d/10-merge-svc-map-files
View File

@@ -81,7 +81,9 @@ def main():
" service name." % (err, element)) " service name." % (err, element))
sys.exit(1) sys.exit(1)
write_data_to_file(service_names, os.path.join("/tmp", 'svc-map-services')) write_data_to_file(
service_names,
os.path.join(os.environ['TMP_MOUNT_PATH'], 'tmp', 'svc-map-services'))
if __name__ == "__main__": if __name__ == "__main__":

2
elements/svc-map/extra-data.d/11-copy-svc-map-file
View File

@@ -6,4 +6,4 @@ fi
set -eu set -eu
set -o pipefail set -o pipefail
sudo install -D -o root -g root -m 0644 /tmp/svc-map-services "$TMP_MOUNT_PATH/usr/share/svc-map/services" sudo install -D -o root -g root -m 0644 "$TMP_MOUNT_PATH/tmp/svc-map-services" "$TMP_MOUNT_PATH/usr/share/svc-map/services"