Merge pull request #965 from rallytime/fix-956

Change /pkg/rpm/ to /pkg/deb/ in install_ubuntu_git_post func
This commit is contained in:
Nicole Thomas 2016-10-10 08:52:20 -06:00 committed by GitHub
commit 8827b130f9

View file

@ -2611,7 +2611,7 @@ install_ubuntu_git_post() {
[ $fname = "syndic" ] && [ "$_INSTALL_SYNDIC" -eq $BS_FALSE ] && continue
if [ -f /bin/systemctl ] && [ "$DISTRO_MAJOR_VERSION" -ge 15 ]; then
__copyfile "${_SALT_GIT_CHECKOUT_DIR}/pkg/rpm/salt-${fname}.service" "/lib/systemd/system/salt-${fname}.service"
__copyfile "${_SALT_GIT_CHECKOUT_DIR}/pkg/deb/salt-${fname}.service" "/lib/systemd/system/salt-${fname}.service"
# Skip salt-api since the service should be opt-in and not necessarily started on boot
[ $fname = "api" ] && continue