From b28cc857d1d156faf36b28264e7bb78f75b97642 Mon Sep 17 00:00:00 2001 From: Vlastimil Holer Date: Fri, 22 Oct 2021 12:39:45 +0200 Subject: [PATCH] B OpenNebula/one#5504: Handle nicely acpid on systemd Closes OpenNebula/one#5504 --- .../systemd/system/acpid.path.d/one-context.conf##deb.systemd | 3 +++ targets.sh | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 src/etc/systemd/system/acpid.path.d/one-context.conf##deb.systemd diff --git a/src/etc/systemd/system/acpid.path.d/one-context.conf##deb.systemd b/src/etc/systemd/system/acpid.path.d/one-context.conf##deb.systemd new file mode 100644 index 0000000..2f6ec5f --- /dev/null +++ b/src/etc/systemd/system/acpid.path.d/one-context.conf##deb.systemd @@ -0,0 +1,3 @@ +[Unit] +# https://github.com/OpenNebula/one/issues/5504 +ConditionVirtualization=!container diff --git a/targets.sh b/targets.sh index 4104941..660c44d 100644 --- a/targets.sh +++ b/targets.sh @@ -114,7 +114,7 @@ case "${TARGET}" in RELSUFFIX=${RELSUFFIX:-} TYPE=${TYPE:-deb} TAGS=${TAGS:-linux deb sysv systemd upstart one} - DEPENDS=${DEPENDS:-util-linux bash curl bind9-host cloud-utils parted ruby ifupdown|ifupdown2 acpid sudo passwd dbus openssh-server open-vm-tools qemu-guest-agent gawk virt-what} + DEPENDS=${DEPENDS:-util-linux bash curl bind9-host cloud-utils parted ruby ifupdown|ifupdown2 acpid|systemd sudo passwd dbus openssh-server open-vm-tools qemu-guest-agent gawk virt-what} PROVIDES=${PROVIDES:-} REPLACES=${REPLACES:-cloud-init} CONFLICTS=${CONFLICTS:-${REPLACES} one-context-ec2}