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

Obscure the PKG configuration function and use copyfile.

Browse source
This commit is contained in:
Pedro Algarvio 2014-01-09 19:31:42 +00:00
parent fc128eefb9
commit e962d0c2c9
1 changed files with 10 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
bootstrap-salt.sh
View file

@ -2342,18 +2342,18 @@ __freebsd_get_packagesite() {
# failure
set +o nounset
#ABI is a std format for identifying release / architecture combos
# ABI is a std format for identifying release / architecture combos
ABI="freebsd:${DISTRO_MAJOR_VERSION}:${BSD_ARCH}"
_PACKAGESITE="http://pkg.freebsd.org/${ABI}/latest"
#awkwardly, we want the `${ABI}` to be in conf file without escaping
# Awkwardly, we want the `${ABI}` to be in conf file without escaping
PKGCONFURL="pkg+http://pkg.freebsd.org/\${ABI}/latest"
# Treat unset variables as errors once more
set -o nounset
}
#Using a seperate conf step to head for idempotent install...
configure_freebsd_pkg_details(){
# Using a seperate conf step to head for idempotent install...
__configure_freebsd_pkg_details() {
## pkg.conf is deprecated.
## We use conf files in /usr/local or /etc instead
@ -2367,7 +2367,7 @@ configure_freebsd_pkg_details(){
echo " mirror_type: \"SRV\"," >> $conf_file
echo " enabled: true" >> $conf_file
echo "}" >> $conf_file
cp $conf_file /etc/pkg/FreeBSD.conf
copyfile $conf_file /etc/pkg/FreeBSD.conf
SALT_PKG_FLAGS="-r FreeBSD"
## ensure future ports builds use pkgng
echo "WITH_PKGNG= yes" >> /etc/make.conf
@ -2385,17 +2385,12 @@ install_freebsd_9_stable_deps() {
tar xf ./pkg.txz -s ",/.*/,,g" "*/pkg-static" || return 1
./pkg-static add ./pkg.txz || return 1
/usr/local/sbin/pkg2ng || return 1
#configure the pkg repository using new approach
configure_freebsd_pkg_details || return 1
else
#configure the pkg repository using new approach
configure_freebsd_pkg_details || return 1
fi
#now install swig
# Configure the pkg repository using new approach
__configure_freebsd_pkg_details || return 1
# Now install swig
/usr/local/sbin/pkg install ${SALT_PKG_FLAGS} -y swig || return 1
return 0