buildsys: improve clean target

[pve-container.git] / src / Makefile

diff --git a/src/Makefile b/src/Makefile
index f68eb5d1eab08492ae1a4ccead7ea0567776312a..5a7a82e13a5a71aed72f4dd6ec849fde7823d415 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -11,11 +11,13 @@ LXC_TMPL_DIR=${LXC_SCRIPT_DIR}/templates
 LXC_HOOK_DIR=${LXC_SCRIPT_DIR}/hooks
 LXC_CONFIG_DIR=${LXC_SCRIPT_DIR}/config
 LXC_COMMON_CONFIG_DIR=${LXC_CONFIG_DIR}/common.conf.d
+LXC_USERNS_CONFIG_DIR=${LXC_CONFIG_DIR}/userns.conf.d
 SERVICEDIR=${DESTDIR}/lib/systemd/system
 PODDIR=${DOCDIR}/pod
 MAN1DIR=${MANDIR}/man1/
 MAN5DIR=${MANDIR}/man5/
 BASHCOMPLDIR=${PREFIX}/share/bash-completion/completions/
+ZSHCOMPLDIR=${PREFIX}/share/zsh/vendor-completions/
 export PERLDIR=${PREFIX}/share/perl5
 
 # this require package pve-doc-generator
@@ -28,12 +30,18 @@ pct.bash-completion:
        PVE_GENERATING_DOCS=1 perl -I. -T -e "use PVE::CLI::pct; PVE::CLI::pct->generate_bash_completions();" >$@.tmp
        mv $@.tmp $@
 
+pct.zsh-completion:
+       PVE_GENERATING_DOCS=1 perl -I. -T -e "use PVE::CLI::pct; PVE::CLI::pct->generate_zsh_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 pct.bash-completion pve-userns.seccomp
+install: pct lxc-pve.conf pct.1 pct.conf.5 pct.bash-completion pct.zsh-completion \
+    pve-userns.seccomp pve-container@.service pve-container-debug@.service \
+    lxc-pve-prestart-hook lxc-pve-autodev-hook lxc-pve-poststop-hook lxcnetaddbr
        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}
@@ -42,6 +50,7 @@ install: pct lxc-pve.conf lxc-pve-prestart-hook lxc-pve-autodev-hook lxc-pve-pos
        install -m 0755 pve-container-stop-wrapper ${LXC_SCRIPT_DIR}
        install -d -m0755 ${SERVICEDIR}
        install -m0644 pve-container@.service ${SERVICEDIR}/
+       install -m0644 pve-container-debug@.service ${SERVICEDIR}/
        install -m0644 'system-pve\x2dcontainer.slice' ${SERVICEDIR}/
        install -d ${LXC_HOOK_DIR}
        install -m 0755 lxc-pve-prestart-hook ${LXC_HOOK_DIR}
@@ -51,7 +60,10 @@ install: pct lxc-pve.conf lxc-pve-prestart-hook lxc-pve-autodev-hook lxc-pve-pos
        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 -d ${LXC_USERNS_CONFIG_DIR}
+       install -m 0644 lxc-pve-userns.conf ${LXC_USERNS_CONFIG_DIR}/01-pve.conf
        install -m 0644 -D pct.bash-completion ${BASHCOMPLDIR}/pct
+       install -m 0644 -D pct.zsh-completion ${ZSHCOMPLDIR}/_pct
        make -C PVE install
        install -d ${MAN1DIR}
        install -d ${MAN5DIR}
@@ -60,18 +72,12 @@ 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}
+       install -D -m 0644 10-pve-ct-inotify-limits.conf ${LIBDIR}/sysctl.d/10-pve-ct-inotify-limits.conf
 
 pve-userns.seccomp: /usr/share/lxc/config/common.seccomp
        cp $< $@
        echo 'keyctl errno 38' >> $@
 
-
 .PHONY: test
 test:
        make -C test test
@@ -80,8 +86,7 @@ test:
 clean:         
        make -C test clean
        make cleanup-docgen
-       rm -rf *.1 *.5 *.tmp *.bash-completion
-       find . -name '*~' -exec rm {} ';'
+       rm -f *.1 *.5 *.tmp *.bash-completion *.bash-completion
 
 .PHONY: distclean
 distclean: clean