[pve-devel] [PATCH container] remove obsolete lxc at .service.d

Thomas Lamprecht t.lamprecht at proxmox.com
Wed Jul 17 19:03:54 CEST 2019


follow through with the preparations of commit
e407207213f3e23c7f274b101c6e49233b4ff0d2 which was part of the series
cleaning the whole handling up [0]

[0]: https://pve.proxmox.com/pipermail/pve-devel/2017-October/029077.html

Signed-off-by: Thomas Lamprecht <t.lamprecht at proxmox.com>
---
 src/Makefile               |  6 ------
 src/lxc-pve-reboot-trigger | 10 ----------
 src/pve-reboot.conf        |  2 --
 3 files changed, 18 deletions(-)
 delete mode 100755 src/lxc-pve-reboot-trigger
 delete mode 100644 src/pve-reboot.conf

diff --git a/src/Makefile b/src/Makefile
index e930a77..5e32d38 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -68,12 +68,6 @@ install: pct lxc-pve.conf lxc-pve-prestart-hook lxc-pve-autodev-hook lxc-pve-pos
 	gzip -9 ${MAN5DIR}/pct.conf.5
 	cd ${MAN5DIR}; ln -s pct.conf.5.gz ct.conf.5.gz
 	install -D -m 0644 10-pve-ct-inotify-limits.conf ${LIBDIR}/sysctl.d/10-pve-ct-inotify-limits.conf
-	
-	# Note: for backwards compatibility only
-	# lxc at .service.d, snippet and reboot script can be removed in PVE 6.0
-	install -d -m 0755 ${SERVICEDIR}/lxc at .service.d
-	install -m 0644 pve-reboot.conf ${SERVICEDIR}/lxc at .service.d/
-	install -m 0755 lxc-pve-reboot-trigger ${LXC_SCRIPT_DIR}
 
 pve-userns.seccomp: /usr/share/lxc/config/common.seccomp
 	cp $< $@
diff --git a/src/lxc-pve-reboot-trigger b/src/lxc-pve-reboot-trigger
deleted file mode 100755
index 95c3ac8..0000000
--- a/src/lxc-pve-reboot-trigger
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/perl
-
-use strict;
-use warnings;
-
-my $vmid = $ARGV[0] or exit(1);
-exit(0) if $vmid !~ /^\d+$/; # check for a PVE ID
-exit(0) if !-e "/etc/pve/lxc/${vmid}.conf";
-exit(0) if !unlink("/var/lib/lxc/$vmid/reboot");
-exec {'systemctl'} 'systemctl', '--no-block', 'restart', "lxc\@${vmid}.service";
diff --git a/src/pve-reboot.conf b/src/pve-reboot.conf
deleted file mode 100644
index 8a0539c..0000000
--- a/src/pve-reboot.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[Service]
-ExecStopPost=/usr/share/lxc/lxc-pve-reboot-trigger %i
-- 
2.20.1





More information about the pve-devel mailing list