From 439f9c95f0bd024bbc47e01531c50e45f2d68c2c Mon Sep 17 00:00:00 2001
From: Harm Weites <harm@weites.com>
Date: Wed, 3 Sep 2014 17:19:37 +0000
Subject: fix: Write sudo rules upon user creation.

---
 cloudinit/distros/freebsd.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/cloudinit/distros/freebsd.py b/cloudinit/distros/freebsd.py
index 42ef2290..849834eb 100644
--- a/cloudinit/distros/freebsd.py
+++ b/cloudinit/distros/freebsd.py
@@ -37,6 +37,7 @@ class Distro(distros.Distro):
     login_conf_fn = '/etc/login.conf'
     login_conf_fn_bak = '/etc/login.conf.orig'
     resolv_conf_fn = '/etc/resolv.conf'
+    ci_sudoers_fn = '/usr/local/etc/sudoers.d/90-cloud-init-users'
 
     def __init__(self, name, cfg, paths):
         distros.Distro.__init__(self, name, cfg, paths)
@@ -219,10 +220,6 @@ class Distro(distros.Distro):
             util.logexc(LOG, "Failed to lock user %s", name)
             raise e
 
-    # TODO:
-    def write_sudo_rules(self, name, rules, sudo_file=None):
-        LOG.debug("[write_sudo_rules] Name: %s", name)
-
     def create_user(self, name, **kwargs):
         self.add_user(name, **kwargs)
 
-- 
cgit v1.2.3


From 3bec4688a7001a3ce9bbfd1a82e691ea94884a9e Mon Sep 17 00:00:00 2001
From: Harm Weites <harm@weites.com>
Date: Wed, 3 Sep 2014 17:20:43 +0000
Subject: fix: Since these now actually exist in ports, install them properly
 (with pkg).

---
 tools/build-on-freebsd | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/build-on-freebsd b/tools/build-on-freebsd
index 23bdf487..65d783f7 100755
--- a/tools/build-on-freebsd
+++ b/tools/build-on-freebsd
@@ -17,6 +17,7 @@ pkgs="
    py27-prettytable
    py27-requests py27-six
    python py27-cheetah
+   py27-jsonpointer py27-jsonpatch
 "
 [ -f "$depschecked" ] || pkg install ${pkgs} || fail "install packages"
 touch $depschecked
-- 
cgit v1.2.3