From 0528d545590b10b8f28e79357bb41ecc867b23a4 Mon Sep 17 00:00:00 2001 From: "Dustin C. Hatch" Date: Sat, 12 Mar 2022 16:11:07 -0600 Subject: [PATCH] rootfs: Add custom systemd presets Instead of manually managing symlinks to enable units, we can define a system preset that lists which units we want disabled. Units that have in `Install` section are automatically enabled. --- .../lib/systemd/system-preset/70-jenkinsagent.preset | 10 ++++++++++ rootfs/overlay/usr/lib/systemd/system/htop.service | 3 +++ .../system/multi-user.target.wants/htop.service | 1 - rootfs/post-fakeroot.sh | 7 ------- 4 files changed, 13 insertions(+), 8 deletions(-) create mode 100644 rootfs/overlay/usr/lib/systemd/system-preset/70-jenkinsagent.preset delete mode 120000 rootfs/overlay/usr/lib/systemd/system/multi-user.target.wants/htop.service diff --git a/rootfs/overlay/usr/lib/systemd/system-preset/70-jenkinsagent.preset b/rootfs/overlay/usr/lib/systemd/system-preset/70-jenkinsagent.preset new file mode 100644 index 0000000..18ebfbb --- /dev/null +++ b/rootfs/overlay/usr/lib/systemd/system-preset/70-jenkinsagent.preset @@ -0,0 +1,10 @@ +enable htop.service + +disable cups-lpd.socket +disable cups.service +disable cups.socket +disable cups.path + +disable systemd-networkd.service +disable systemd-resolved.service +disable systemd-timesyncd.service diff --git a/rootfs/overlay/usr/lib/systemd/system/htop.service b/rootfs/overlay/usr/lib/systemd/system/htop.service index ea98c8e..aa2a103 100644 --- a/rootfs/overlay/usr/lib/systemd/system/htop.service +++ b/rootfs/overlay/usr/lib/systemd/system/htop.service @@ -17,3 +17,6 @@ ProtectKernelTunables=true ProtectKernelModules=true CapabilityBoundingSet= NoNewPrivileges=true + +[Install] +WantedBy=multi-user.target diff --git a/rootfs/overlay/usr/lib/systemd/system/multi-user.target.wants/htop.service b/rootfs/overlay/usr/lib/systemd/system/multi-user.target.wants/htop.service deleted file mode 120000 index cc8a321..0000000 --- a/rootfs/overlay/usr/lib/systemd/system/multi-user.target.wants/htop.service +++ /dev/null @@ -1 +0,0 @@ -../htop.service \ No newline at end of file diff --git a/rootfs/post-fakeroot.sh b/rootfs/post-fakeroot.sh index 24dcf25..13f4793 100755 --- a/rootfs/post-fakeroot.sh +++ b/rootfs/post-fakeroot.sh @@ -1,9 +1,2 @@ #!/bin/sh -"${HOST_DIR}"/bin/systemctl --root="${TARGET_DIR}" disable \ - cups-lpd.socket \ - cups.service \ - cups.socket \ - systemd-networkd.service \ - systemd-resolved.service \ - --