saltstack/salt-bootstrap
1
0
Fork 0
mirror of https://github.com/saltstack/salt-bootstrap.git synced 2025-04-16 09:40:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1076 from Ch3LL/freebsd_repo

Browse source 
Use freebsd repo to query for salt dependencies
This commit is contained in:
Nicole Thomas 2017-05-23 11:16:37 -06:00 • committed by GitHub
commit 8adc35e6f7
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bootstrap-salt.sh
View file

@ -4909,6 +4909,8 @@ __configure_freebsd_pkg_details() {
## ensure future ports builds use pkgng
echo "WITH_PKGNG= yes" >> /etc/make.conf
/usr/local/sbin/pkg update -f || return 1
}
install_freebsd_9_stable_deps() {
@ -4965,7 +4967,7 @@ install_freebsd_git_deps() {
install_freebsd_9_stable_deps || return 1
# shellcheck disable=SC2086
SALT_DEPENDENCIES=$(/usr/local/sbin/pkg search ${FROM_SALTSTACK} -R -d sysutils/py-salt | grep -i origin | sed -e 's/^[[:space:]]*//' | tail -n +2 | awk -F\" '{print $2}' | tr '\n' ' ')
SALT_DEPENDENCIES=$(/usr/local/sbin/pkg search ${FROM_FREEBSD} -R -d sysutils/py-salt | grep -i origin | sed -e 's/^[[:space:]]*//' | tail -n +2 | awk -F\" '{print $2}' | tr '\n' ' ')
# shellcheck disable=SC2086
/usr/local/sbin/pkg install ${FROM_FREEBSD} -y ${SALT_DEPENDENCIES} || return 1