Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 1 Jan 2018 12:14:13 +0000 (UTC)
From:      Tobias Kortkamp <tobik@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r457768 - in head/net/cloud-init: . files
Message-ID:  <201801011214.w01CED7U024090@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tobik
Date: Mon Jan  1 12:14:13 2018
New Revision: 457768
URL: https://svnweb.freebsd.org/changeset/ports/457768

Log:
  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

Added:
  head/net/cloud-init/files/
  head/net/cloud-init/files/patch-sysvinit_freebsd_cloudinit   (contents, props changed)
Modified:
  head/net/cloud-init/Makefile

Modified: head/net/cloud-init/Makefile
==============================================================================
--- head/net/cloud-init/Makefile	Mon Jan  1 12:06:46 2018	(r457767)
+++ head/net/cloud-init/Makefile	Mon Jan  1 12:14:13 2018	(r457768)
@@ -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
@@ -38,6 +39,9 @@ PYDISTUTILS_INSTALLARGS+=	"--init-system=sysvinit_free
 
 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

Added: head/net/cloud-init/files/patch-sysvinit_freebsd_cloudinit
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/cloud-init/files/patch-sysvinit_freebsd_cloudinit	Mon Jan  1 12:14:13 2018	(r457768)
@@ -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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201801011214.w01CED7U024090>