diff options
| author |   Bruce Ashfield <bruce.ashfield@windriver.com> | 2013-09-15 21:50:54 -0400 |
|---|---|---|
| committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2013-10-03 01:15:42 -0400 |
| commit | 2defbdf3d84d044f841ebb5e6695fdaee40b922d (patch) | |
| tree | 2610fa52fef405ef095faaa86f3db903587e248d | |
| parent | d7b1ddd9c176a9920d94ad2eab66f66badff780e (diff) | |
| download | meta-cloud-services-2defbdf3d84d044f841ebb5e6695fdaee40b922d.tar.gz meta-cloud-services-2defbdf3d84d044f841ebb5e6695fdaee40b922d.tar.bz2 meta-cloud-services-2defbdf3d84d044f841ebb5e6695fdaee40b922d.zip | |
nova-common: adapt to non /home/root directory structures
/home/root was hardcoded as the location for root's .bashrc. With this change
we'll update .bashrc in /home/root or /root.
We also add the $D prefix to the paths, to ensure there is no chance of clobbering
the build machines /root/.bashrc.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
| -rw-r--r-- | meta-openstack/recipes-devtools/python/python-nova_2013.1.3.bb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-nova_2013.1.3.bb b/meta-openstack/recipes-devtools/python/python-nova_2013.1.3.bb index bd54d4e9..e7f844a2 100644 --- a/meta-openstack/recipes-devtools/python/python-nova_2013.1.3.bb +++ b/meta-openstack/recipes-devtools/python/python-nova_2013.1.3.bb @@ -7,7 +7,11 @@ pkg_postinst_${SRCNAME}-common () { exit 1 fi - echo "source /etc/nova/openrc" > /home/root/.bashrc + if [ -d $D/home/root/ ]; then + echo "source /etc/nova/openrc" >> $D/home/root/.bashrc + elif [ -d $D/root/ ]; then + echo "source /etc/nova/openrc" >> $D/root/.bashrc + fi } PACKAGES += "${SRCNAME}-common ${SRCNAME}-common-misc" |