[pve-devel] [PATCH v4 container 4/4] build: mark lxc at .service.d for future removal

Fabian Gr├╝nbichler f.gruenbichler at proxmox.com
Tue Oct 10 09:17:18 CEST 2017


Signed-off-by: Fabian Gr├╝nbichler <f.gruenbichler at proxmox.com>
---
 src/Makefile | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index 109577c..5089fe6 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -40,8 +40,7 @@ install: pct lxc-pve.conf lxc-pve-prestart-hook lxc-pve-autodev-hook lxc-pve-pos
 	install -d ${LXC_SCRIPT_DIR}
 	install -m 0755 lxcnetaddbr ${LXC_SCRIPT_DIR}
 	install -m 0755 lxc-pve-reboot-trigger ${LXC_SCRIPT_DIR}
-	install -d -m0755 ${SERVICEDIR}/lxc at .service.d
-	install -m0644 pve-reboot.conf ${SERVICEDIR}/lxc at .service.d/
+	install -d -m0755 ${SERVICEDIR}
 	install -m0644 pve-container at .service ${SERVICEDIR}/
 	install -m0644 'system-pve\x2dcontainer.slice' ${SERVICEDIR}/
 	install -d ${LXC_HOOK_DIR}
@@ -59,6 +58,11 @@ install: pct lxc-pve.conf lxc-pve-prestart-hook lxc-pve-autodev-hook lxc-pve-pos
 	install -m 0644 pct.conf.5 ${MAN5DIR}
 	gzip -9 ${MAN5DIR}/pct.conf.5
 	cd ${MAN5DIR}; ln -s pct.conf.5.gz ct.conf.5.gz
+	
+	# Note: for backwards compatibility only
+	# lxc at .service.d and snippet can be removed in PVE 6.0
+	install -d -m0755 ${SERVICEDIR}/lxc at .service.d
+	install -m0644 pve-reboot.conf ${SERVICEDIR}/lxc at .service.d/
 
 .PHONY: test
 test:
-- 
2.14.1




More information about the pve-devel mailing list