mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-18 00:10:04 +00:00
Code Issues Releases Activity

net/cloud-init,-devel: use corrected path for /home dirs from 14.0-RELEASE

Browse Source 
the softlinked home -> /usr/home has been removed in FreeBSD
14.0-RELEASE and upwards, as the mountpoints are now /home.

Sponsored by:	SkunkWerks, GmbH
Approved by:	maintainer
Differential Revision:	https://reviews.freebsd.org/D47338
Upstream Issue: https://github.com/canonical/cloud-init/issues/5850
This commit is contained in:
Dave Cottlehuber 2024-11-06 09:29:19 +00:00
parent 5c41197fdf
commit 00a3688180
4 changed files with 36 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
net/cloud-init-devel/Makefile
View File

@ -1,7 +1,7 @@
PORTNAME= cloud-init
DISTVERSION= 23.4-319
DISTVERSIONSUFFIX= -gec384da45
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= net python
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
PKGNAMESUFFIX= -devel
@ -51,6 +51,12 @@ CONFLICTS_INSTALL= cloud-init
# Standard bsd.port.mk variables
ETCDIR= ${PREFIX}/etc/cloud
.include <bsd.port.options.mk>
.if ${OPSYS} == FreeBSD && ${OSVERSION} > 1400000
EXTRA_PATCHES= ${PATCHDIR}/extra-cloudinit_distros_freebsd.py
.endif
NO_ARCH= yes
post-patch:

11
net/cloud-init-devel/files/extra-cloudinit_distros_freebsd.py Normal file
View File

@ -0,0 +1,11 @@
--- cloudinit/distros/freebsd.py.orig 2024-10-30 12:25:07 UTC
+++ cloudinit/distros/freebsd.py
@@ -35,7 +35,7 @@ class Distro(cloudinit.distros.bsd.BSD):
pkg_cmd_update_prefix = ["pkg", "update"]
pkg_cmd_upgrade_prefix = ["pkg", "upgrade"]
prefer_fqdn = True # See rc.conf(5) in FreeBSD
- home_dir = "/usr/home"
+ home_dir = "/home"
# FreeBSD has the following dhclient lease path:
# /var/db/dhclient.leases.<iface_name>
dhclient_lease_directory = "/var/db"

8
net/cloud-init/Makefile
View File

@ -1,6 +1,6 @@
PORTNAME= cloud-init
DISTVERSION= 24.1.4
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= net python
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@ -41,6 +41,12 @@ CONFLICTS_INSTALL= cloud-init-devel
# Standard bsd.port.mk variables
ETCDIR= ${PREFIX}/etc/cloud
.include <bsd.port.options.mk>
.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400000
EXTRA_PATCHES= ${PATCHDIR}/extra-cloudinit_distros_freebsd.py
.endif
NO_ARCH= yes
post-patch:

11
net/cloud-init/files/extra-cloudinit_distros_freebsd.py Normal file
View File

@ -0,0 +1,11 @@
--- cloudinit/distros/freebsd.py.orig 2024-10-25 15:58:28 UTC
+++ cloudinit/distros/freebsd.py
@@ -35,7 +35,7 @@ class Distro(cloudinit.distros.bsd.BSD):
pkg_cmd_update_prefix = ["pkg", "update"]
pkg_cmd_upgrade_prefix = ["pkg", "upgrade"]
prefer_fqdn = True # See rc.conf(5) in FreeBSD
- home_dir = "/usr/home"
+ home_dir = "/home"
# FreeBSD has the following dhclient lease path:
# /var/db/dhclient.leases.<iface_name>
dhclient_lease_directory = "/var/db"