cloud-init

Merge ~goneri/cloud-init:freebsd_chpasswd into cloud-init:master

  1. Git
  2. lp:~goneri/cloud-init
  3. freebsd_chpasswd
  4. Merge into master
Proposed by Gonéri Le Bouder
Status: Superseded
Proposed branch: ~goneri/cloud-init:freebsd_chpasswd
Merge into: cloud-init:master
Diff against target: 31 lines (+4/-2)
1 file modified
tools/build-on-freebsd (+4/-2)
Reviewer Review Type Date Requested Status
cloud-init Commiters Pending
Review via email: mp+365632@code.launchpad.net

This proposal has been superseded by a proposal from 2019-04-20.

Commit message

freebsd: add chpasswd pkg in the image

cc_set_passwords.py depends on chpasswd binary.

To post a comment you must log in.
~goneri/cloud-init:freebsd_chpasswd updated
6ed0e3e... by Gonéri Le Bouder

freebsd: build-on-freebsd to install py27-jsonschema

jsonschema is also a dependency and is available in pkg repository.

0b16bae... by Gonéri Le Bouder

freebsd: specify python2.7 to avoid any conflict with Python3

In the very last snapshot of FreeBSD 12 VM-IMAGES[1], /usr/local/bin/python
is actually Python 3.6.

[1]: http://ftp.freebsd.org/pub/FreeBSD/snapshots/VM-IMAGES/12.0-STABLE/amd64/

Unmerged commits

6ed0e3e... by Gonéri Le Bouder

freebsd: build-on-freebsd to install py27-jsonschema

jsonschema is also a dependency and is available in pkg repository.

0b16bae... by Gonéri Le Bouder

freebsd: specify python2.7 to avoid any conflict with Python3

In the very last snapshot of FreeBSD 12 VM-IMAGES[1], /usr/local/bin/python
is actually Python 3.6.

[1]: http://ftp.freebsd.org/pub/FreeBSD/snapshots/VM-IMAGES/12.0-STABLE/amd64/

fd34bb5... by Gonéri Le Bouder

freebsd: add chpasswd pkg in the image

cc_set_passwords.py depends on chpasswd binary.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/tools/build-on-freebsd b/tools/build-on-freebsd
2index d23fde2..f25be6f 100755
3--- a/tools/build-on-freebsd
4+++ b/tools/build-on-freebsd
5@@ -9,6 +9,7 @@ fail() { echo "FAILED:" "$@" 1>&2; exit 1; }
6 depschecked=/tmp/c-i.dependencieschecked
7 pkgs="
8 bash
9+ chpasswd
10 dmidecode
11 e2fsprogs
12 py27-Jinja2
13@@ -17,6 +18,7 @@ pkgs="
14 py27-configobj
15 py27-jsonpatch
16 py27-jsonpointer
17+ py27-jsonschema
18 py27-oauthlib
19 py27-requests
20 py27-serial
21@@ -32,8 +34,8 @@ touch $depschecked
22 # Luckily, the install step will take care of this by installing it from pypi...
23
24 # Build the code and install in /usr/local/:
25-python setup.py build
26-python setup.py install -O1 --skip-build --prefix /usr/local/ --init-system sysvinit_freebsd
27+python2.7 setup.py build
28+python2.7 setup.py install -O1 --skip-build --prefix /usr/local/ --init-system sysvinit_freebsd
29
30 # Enable cloud-init in /etc/rc.conf:
31 sed -i.bak -e "/cloudinit_enable=.*/d" /etc/rc.conf

Subscribers

People subscribed via source and target branches