From ecb408afa1104fe49ce6eb1dc5708be56abd5cb2 Mon Sep 17 00:00:00 2001
From: Scott Moser <smoser@brickies.net>
Date: Thu, 15 Jun 2017 10:03:45 -0400
Subject: FreeBSD: Make freebsd a variant, fix unittests and
 tools/build-on-freebsd.

 - Simplify the logic of 'variant' in util.system_info
   much of the data from
   https://github.com/hpcugent/easybuild/wiki/OS_flavor_name_version
 - fix get_resource_disk_on_freebsd when running on a system without
   an Azure resource disk.
 - fix tools/build-on-freebsd to replace oauth with oauthlib and add
   bash which is a dependency for tests.
 - update a fiew places that were checking for freebsd but not using
   the util.is_FreeBSD()
---
 tools/build-on-freebsd | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'tools/build-on-freebsd')

diff --git a/tools/build-on-freebsd b/tools/build-on-freebsd
index ccc10b40..ff9153ad 100755
--- a/tools/build-on-freebsd
+++ b/tools/build-on-freebsd
@@ -8,6 +8,7 @@ fail() { echo "FAILED:" "$@" 1>&2; exit 1; }
 # Check dependencies:
 depschecked=/tmp/c-i.dependencieschecked
 pkgs="
+   bash
    dmidecode
    e2fsprogs
    py27-Jinja2
@@ -16,7 +17,7 @@ pkgs="
    py27-configobj
    py27-jsonpatch
    py27-jsonpointer
-   py27-oauth
+   py27-oauthlib
    py27-prettytable
    py27-requests
    py27-serial
@@ -35,9 +36,6 @@ touch $depschecked
 python setup.py build
 python setup.py install -O1 --skip-build --prefix /usr/local/ --init-system sysvinit_freebsd
 
-# Install the correct config file:
-cp config/cloud.cfg-freebsd /etc/cloud/cloud.cfg
-
 # Enable cloud-init in /etc/rc.conf:
 sed -i.bak -e "/cloudinit_enable=.*/d" /etc/rc.conf
 echo 'cloudinit_enable="YES"' >> /etc/rc.conf
-- 
cgit v1.2.3