Merge "Rename dockerctl functions.sh to functions"

This commit is contained in:
Jenkins 2015-04-24 10:03:12 +00:00 committed by Gerrit Code Review
commit 33fcf33ffb
2 changed files with 4 additions and 3 deletions

View File

@ -16,7 +16,7 @@
confdir="/etc/dockerctl"
. "$confdir/config"
. "/usr/share/dockerctl/functions.sh"
. "/usr/share/dockerctl/functions"
DEBUG=true
#Sets var nonopts

View File

@ -43,7 +43,7 @@ install -m 0644 %{dockerctl_source}/dockerctl-alias.sh %{buildroot}/etc/profile.
install -m 0755 %{dockerctl_source}/dockerctl %{buildroot}/usr/bin
install -m 0755 %{dockerctl_source}/get_service_credentials.py %{buildroot}/usr/bin
install -m 0644 %{dockerctl_source}/dockerctl_config %{buildroot}/etc/dockerctl/config
install -m 0644 %{dockerctl_source}/functions.sh %{buildroot}/usr/share/dockerctl/
install -m 0644 %{dockerctl_source}/functions.sh %{buildroot}/usr/share/dockerctl/functions
#fuel-misc
install -m 0755 %{files_source}/fuel-misc/centos_ifdown-local %{buildroot}/sbin/ifup-local
install -m 0755 %{files_source}/fuel-misc/centos_ifup-local %{buildroot}/sbin/ifdown-local
@ -110,7 +110,8 @@ during Fuel All-in-One deployment toolkit installation
/etc/profile.d/dockerctl.sh
/usr/bin/dockerctl
/usr/bin/get_service_credentials.py
/usr/share/dockerctl/functions.sh
/usr/share/dockerctl/functions
%config(noreplace) /etc/dockerctl/config
%package -n fuel-misc