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

Merge pull request #1283 from sjorge/1237

Browse source 
FIX #1237 SmartOS should use pkgin show-deps
This commit is contained in:
Nicole Thomas 2018-08-28 16:56:08 -04:00 • committed by GitHub
commit a415f43fd3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.rst
View file

@ -322,7 +322,7 @@ UNIX systems
**SunOS**:
- SmartOS
- SmartOS (2015Q4 and later)
Unsupported Distributions
-------------------------

3
bootstrap-salt.sh
View file

@ -5336,7 +5336,8 @@ install_openbsd_restart_daemons() {
# SmartOS Install Functions
#
install_smartos_deps() {
pkgin -y install zeromq py27-crypto py27-m2crypto py27-msgpack py27-yaml py27-jinja2 py27-zmq py27-requests || return 1
smartos_deps="$(pkgin show-deps salt | grep '^\s' | grep -v '\snot' | xargs) py27-m2crypto"
pkgin -y install "${smartos_deps}" || return 1
# Set _SALT_ETC_DIR to SmartOS default if they didn't specify
_SALT_ETC_DIR=${BS_SALT_ETC_DIR:-/opt/local/etc/salt}