summaryrefslogtreecommitdiff
path: root/net/cloud-init
diff options
context:
space:
mode:
authorTobias Kortkamp <tobik@FreeBSD.org>2018-01-01 12:14:13 +0000
committerTobias Kortkamp <tobik@FreeBSD.org>2018-01-01 12:14:13 +0000
commit4fd6b1be12ac3f58c4daaca11308aca8aaf1b29c (patch)
tree7a601020638ac12b44666e68458547c48f2c62c2 /net/cloud-init
parentwww/mod_md-devel: Update to 1.1.6 (diff)
net/cloud-init: Add ldconfig to rc.d script
rcorder shows that ldconfig is running after cloudinit in some cases. This can lead to problems like the following when running it on OpenStack: Shared object "libpython2.7.so.1" not found, required by "python2.7" - Reset maintainer by request of the current maintainer PR: 224361 Submitted by: thompsa Approved by: maintainer
Diffstat (limited to 'net/cloud-init')
-rw-r--r--net/cloud-init/Makefile6
-rw-r--r--net/cloud-init/files/patch-sysvinit_freebsd_cloudinit11
2 files changed, 16 insertions, 1 deletions
diff --git a/net/cloud-init/Makefile b/net/cloud-init/Makefile
index 39746f431651..c3d2e910907e 100644
--- a/net/cloud-init/Makefile
+++ b/net/cloud-init/Makefile
@@ -2,11 +2,12 @@
PORTNAME= cloud-init
PORTVERSION= 0.7.6
+PORTREVISION= 1
CATEGORIES= net python
MASTER_SITES= http://launchpad.net/${PORTNAME}/trunk/${PORTVERSION}/+download/
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
-MAINTAINER= bertjw@regeer.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Init scripts for use on cloud images
LICENSE= GPLv3
@@ -39,6 +40,9 @@ PYDISTUTILS_INSTALLARGS+= "--init-system=sysvinit_freebsd"
ONLY_FOR_ARCHS= amd64 i386
ONLY_FOR_ARCHS_REASON= currently depends on dmidecode which is x86-only
+post-patch:
+ @${RM} ${WRKSRC}/sysvinit/freebsd/cloudinit.orig
+
post-build:
@cd ${WRKSRC} && ${MV} config/cloud.cfg-freebsd config/cloud.cfg
diff --git a/net/cloud-init/files/patch-sysvinit_freebsd_cloudinit b/net/cloud-init/files/patch-sysvinit_freebsd_cloudinit
new file mode 100644
index 000000000000..4e7c85a26735
--- /dev/null
+++ b/net/cloud-init/files/patch-sysvinit_freebsd_cloudinit
@@ -0,0 +1,11 @@
+--- sysvinit/freebsd/cloudinit.orig 2018-01-01 11:58:33 UTC
++++ sysvinit/freebsd/cloudinit
+@@ -1,7 +1,7 @@
+ #!/bin/sh
+
+ # PROVIDE: cloudinit
+-# REQUIRE: FILESYSTEMS NETWORKING cloudinitlocal
++# REQUIRE: FILESYSTEMS NETWORKING cloudinitlocal ldconfig
+ # BEFORE: cloudconfig cloudfinal
+
+ . /etc/rc.subr