From 305ab43ff93110e18898e16e0cbba95e74b3cf98 Mon Sep 17 00:00:00 2001 From: Charles Short Date: Thu, 18 Aug 2022 09:12:05 -0400 Subject: [PATCH] debian: Split out system presets into separate pkg Remove the system-presets from the centos-debian-compat package so that the systemd-presets policies can be better managed. This is part of the systemd-traits work that is currently being undertaken. Test Plan Build package Build ISO Install ISO Check for symlink from /lib/lsb/init-functions to /etc/init.d/functions. Story: 2009968 Task: 46406 Depends-On: https://review.opendev.org/c/starlingx/metal/+/854667 Signed-off-by: Charles Short Change-Id: I5d30aca52819a536a78faaab0452f2dc2baed839 --- .../deb_folder/centos-debian-compat.install | 1 - centos-debian-compat/debian/deb_folder/rules | 7 - .../stx/systemd/85-debpkg-issues.preset | 134 ------------------ .../source/stx/systemd/90-default.preset | 26 ---- .../stx/systemd/99-default-disable.preset | 1 - 5 files changed, 169 deletions(-) delete mode 100644 centos-debian-compat/debian/deb_folder/centos-debian-compat.install delete mode 100644 centos-debian-compat/source/stx/systemd/85-debpkg-issues.preset delete mode 100644 centos-debian-compat/source/stx/systemd/90-default.preset delete mode 100644 centos-debian-compat/source/stx/systemd/99-default-disable.preset diff --git a/centos-debian-compat/debian/deb_folder/centos-debian-compat.install b/centos-debian-compat/debian/deb_folder/centos-debian-compat.install deleted file mode 100644 index a4dcd77dc..000000000 --- a/centos-debian-compat/debian/deb_folder/centos-debian-compat.install +++ /dev/null @@ -1 +0,0 @@ -/etc/systemd/system-preset/* diff --git a/centos-debian-compat/debian/deb_folder/rules b/centos-debian-compat/debian/deb_folder/rules index 0023bd023..2d33f6ac8 100644 --- a/centos-debian-compat/debian/deb_folder/rules +++ b/centos-debian-compat/debian/deb_folder/rules @@ -2,10 +2,3 @@ %: dh $@ - -override_dh_auto_install: - install -d debian/tmp/etc/systemd/system-preset - install -m 544 stx/systemd/99-default-disable.preset debian/tmp/etc/systemd/system-preset - install -m 544 stx/systemd/90-default.preset debian/tmp/etc/systemd/system-preset - install -m 544 stx/systemd/85-debpkg-issues.preset debian/tmp/etc/systemd/system-preset - dh_install diff --git a/centos-debian-compat/source/stx/systemd/85-debpkg-issues.preset b/centos-debian-compat/source/stx/systemd/85-debpkg-issues.preset deleted file mode 100644 index bc5a27eac..000000000 --- a/centos-debian-compat/source/stx/systemd/85-debpkg-issues.preset +++ /dev/null @@ -1,134 +0,0 @@ -# StarlingX specs are enabling/disabling services during install. Make sure the -# debian packaging is correctly doing the same, then remove from this file -# -# Note: These service actions were based on personality and setup at package -# install time for that host. We will need a different mechanism to enable a -# subset of these services at runtime as we will have a unified ostree image -# with all packages installed regardless of personality. - -# config-gate.spec -#enable worker-config.service - -# controllerconfig.spec -enable controllerconfig.service - -# storageconfig.spec (Move to rutime enablement. Disable, not needed for AIO) -#enable storageconfig.service - -# sysinv-agent.spec -enable sysinv-agent.service - -# sysinv-fpga-agent.spec -enable sysinv-fpga-agent.service -enable sysinv-conf-watcher.service -enable sysinv-conf-watcher.path - -# workerconfig.spec (Move to rutime enablement. Disable, not needed for AIO) -#enable workerconfig.service - -# filesystem-scripts.spec -enable uexportfs.service - -# haproxy-config.spec -disable haproxy.service - -# initscripts-config.spec -enable mountnfs.service - -# iscsi-initiator-utils-config.spec -disable iscsi-shutdown.service - -# nfs-utils-config.spec -disable rpc-statd.service -disable rpc-statd-notify.service -#disable nfs-lock.service -#disable nfslock.service -#enable nfscommon.service -#enable nfsserver.service - -# nfs debian -enable nfs-blkmap.service -enable nfs-idmapd.service -enable nfs-mountd.service -enable nfs-server.service -enable nfs-client.target - -# fm-rest-api.spec -enable fm-api.service - -# sm-api.spec -enable sm-api.service - -# sm-common.spec -enable sm-eru.service - -# sm.spec -enable sm.service -enable sm-shutdown.service - -# isolcpus-device-plugin.spec -enable isolcpu_plugin.service - -# k8s-pod-recovery.spec -enable k8s-pod-recovery.service - -# lldpd.spec -enable lldpd.service - -# openvswitch.spec -disable openvswitch.service - -# libvirt.spec (Package currently not included) - -# qemu-kvm.spec (Package currently not included) - -# mtce-compute.spec -enable goenabled-worker.service -enable qemu_clean.service - -# mtce-control.spec -enable lighttpd.service -enable qemu_clean.service -enable hbsAgent.service - -# mtce-storage.spec (Move to rutime enablement. Disable, not needed for AIO) -#enable goenabled-storage.service - -# mtce.spec -enable fsmon.service -enable mtcClient.service -enable hbsClient.service -enable mtclog.service -enable iscsid.service -enable rsync.service -enable goenabled.service -enable mtcalarm.service -enable crashDumpMgr.service -enable hostw.service -enable pmon.service -enable lmon.service - -# mtce-guest.spec -enable guestServer.service - -# cgcs-patch.spec -enable sw-patch-controller.service -enable sw-patch-controller-daemon.service -enable sw-patch-agent.service -enable sw-patch.service - -# collect-engtools.spec (Move to rutime enablement. Typically not installed. Disable, not needed for AIO) -#enable collect-engtools.service - -# logmgmt.spec -enable logmgmt.service - -# nfscheck.spec (Move to rutime enablement. Disable, only on non-controllers) -#enable nfscheck.service - -# platform-util.spec (Move to rutime enablement. Disable, only on non-controllers) -#enable opt-platform.service - -# worker-utils.spec -enable affine-platform.sh.service -enable affine-tasks.service diff --git a/centos-debian-compat/source/stx/systemd/90-default.preset b/centos-debian-compat/source/stx/systemd/90-default.preset deleted file mode 100644 index 41f20d093..000000000 --- a/centos-debian-compat/source/stx/systemd/90-default.preset +++ /dev/null @@ -1,26 +0,0 @@ -# System stuff -enable ssh.service -enable atd.* -enable cron.* -enable rpcbind.* -enable avahi-daemon.* -enable apparmor.* -enable set-grub-install-device.* - -# The various syslog implementaitons -enable syslog-ng.* - -# Network facing -enable libvirtd.service - -# Storage -enable multipathd.service -enable libstoragemgmt.service -enable lvm2-lvmpolld.socket -enable lvm2-monitor.* -enable lvm2-lvmetad.* -enable dm-event.* -enable dmraid-activation.service - -# Others -enable virlogd.socket diff --git a/centos-debian-compat/source/stx/systemd/99-default-disable.preset b/centos-debian-compat/source/stx/systemd/99-default-disable.preset deleted file mode 100644 index 1f29b5059..000000000 --- a/centos-debian-compat/source/stx/systemd/99-default-disable.preset +++ /dev/null @@ -1 +0,0 @@ -disable *