revert removal of pct from installation

[pve-container.git] / src / Makefile

diff --git a/src/Makefile b/src/Makefile
index 8e03ad9ebbe4861669b6edb63a0e4f728949e20b..08d1f4dc107093f8f671ba924ebe146c86a2da1d 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -2,6 +2,7 @@ PACKAGE=pve-container
 
 PREFIX=${DESTDIR}/usr
 BINDIR=${PREFIX}/bin
+LIBDIR=${PREFIX}/lib
 SBINDIR=${PREFIX}/sbin
 MANDIR=${PREFIX}/share/man
 DOCDIR=${PREFIX}/share/doc/${PACKAGE}
@@ -9,6 +10,7 @@ LXC_SCRIPT_DIR=${PREFIX}/share/lxc
 LXC_TMPL_DIR=${LXC_SCRIPT_DIR}/templates
 LXC_HOOK_DIR=${LXC_SCRIPT_DIR}/hooks
 LXC_COMMON_CONFIG_DIR=${LXC_SCRIPT_DIR}/config/common.conf.d
+SERVICEDIR=${DESTDIR}/lib/systemd/system
 PODDIR=${DOCDIR}/pod
 MAN1DIR=${MANDIR}/man1/
 MAN5DIR=${MANDIR}/man5/
@@ -22,17 +24,24 @@ include /usr/share/pve-doc-generator/pve-doc-generator.mk
 all:
 
 pct.bash-completion:
-       perl -I. -T -e "use PVE::CLI::pct; PVE::CLI::pct->generate_bash_completions();" >$@.tmp
+       PVE_GENERATING_DOCS=1 perl -I. -T -e "use PVE::CLI::pct; PVE::CLI::pct->generate_bash_completions();" >$@.tmp
        mv $@.tmp $@
 
+.PHONY: check
+check: test
+       make -C test
+
 .PHONY: install
-install: pct lxc-pve.conf lxc-pve-prestart-hook lxc-pve-autodev-hook lxc-pve-poststop-hook lxcnetaddbr pct.1 pct.conf.5 pve-update-lxc-config pct.bash-completion
-       perl -I. -T -e "use PVE::CLI::pct; PVE::CLI::pct->verify_api();"
+install: pct lxc-pve.conf lxc-pve-prestart-hook lxc-pve-autodev-hook lxc-pve-poststop-hook lxcnetaddbr pct.1 pct.conf.5 pct.bash-completion
+       PVE_GENERATING_DOCS=1 perl -I. -T -e "use PVE::CLI::pct; PVE::CLI::pct->verify_api();"
        install -d ${SBINDIR}
        install -m 0755 pct ${SBINDIR}
-       install -m 0755 pve-update-lxc-config ${SBINDIR}
        install -d ${LXC_SCRIPT_DIR}
        install -m 0755 lxcnetaddbr ${LXC_SCRIPT_DIR}
+       install -m 0755 pve-container-stop-wrapper ${LXC_SCRIPT_DIR}
+       install -d -m0755 ${SERVICEDIR}
+       install -m0644 pve-container@.service ${SERVICEDIR}/
+       install -m0644 'system-pve\x2dcontainer.slice' ${SERVICEDIR}/
        install -d ${LXC_HOOK_DIR}
        install -m 0755 lxc-pve-prestart-hook ${LXC_HOOK_DIR}
        install -m 0755 lxc-pve-autodev-hook ${LXC_HOOK_DIR}
@@ -47,6 +56,13 @@ install: pct lxc-pve.conf lxc-pve-prestart-hook lxc-pve-autodev-hook lxc-pve-pos
        gzip -9 ${MAN1DIR}/pct.1
        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@.service.d, snippet and reboot script can be removed in PVE 6.0
+       install -d -m 0755 ${SERVICEDIR}/lxc@.service.d
+       install -m 0644 pve-reboot.conf ${SERVICEDIR}/lxc@.service.d/
+       install -m 0755 lxc-pve-reboot-trigger ${LXC_SCRIPT_DIR}
 
 .PHONY: test
 test: