add missing 'mounted' as lock type for containers

[pve-container.git] / src / Makefile

diff --git a/src/Makefile b/src/Makefile
index f69dda2f34eb2ac2dcaf3fe91cf83cb96a1ba95a..f68eb5d1eab08492ae1a4ccead7ea0567776312a 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -9,7 +9,8 @@ DOCDIR=${PREFIX}/share/doc/${PACKAGE}
 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
+LXC_CONFIG_DIR=${LXC_SCRIPT_DIR}/config
+LXC_COMMON_CONFIG_DIR=${LXC_CONFIG_DIR}/common.conf.d
 SERVICEDIR=${DESTDIR}/lib/systemd/system
 PODDIR=${DOCDIR}/pod
 MAN1DIR=${MANDIR}/man1/
@@ -32,23 +33,22 @@ 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
+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-userns.seccomp
        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 lxc-pve-reboot-trigger ${LXC_SCRIPT_DIR}
        install -m 0755 pve-container-stop-wrapper ${LXC_SCRIPT_DIR}
-       install -d -m0755 ${SERVICEDIR}/lxc@.service.d
-       install -m0644 pve-reboot.conf ${SERVICEDIR}/lxc@.service.d/
+       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}
        install -m 0755 lxc-pve-poststop-hook ${LXC_HOOK_DIR}
+       install -d ${LXC_CONFIG_DIR}
+       install -m 0644 pve-userns.seccomp ${LXC_CONFIG_DIR}/pve-userns.seccomp
        install -d ${LXC_COMMON_CONFIG_DIR}
        install -m 0644 lxc-pve.conf ${LXC_COMMON_CONFIG_DIR}/01-pve.conf
        install -m 0644 -D pct.bash-completion ${BASHCOMPLDIR}/pct
@@ -60,6 +60,17 @@ 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@.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}
+
+pve-userns.seccomp: /usr/share/lxc/config/common.seccomp
+       cp $< $@
+       echo 'keyctl errno 38' >> $@
+
 
 .PHONY: test
 test: